From 36b56dd066d28ce78623ba56e86352be729e8d70 Mon Sep 17 00:00:00 2001 From: Chris-godz <97298936+Chris-godz@users.noreply.github.com> Date: Tue, 3 Sep 2024 16:55:45 +0800 Subject: [PATCH] Support multi arch (#13) * Add support for multi-architecture in Dockerfile * Add support for multi-architecture in Dockerfile * Clean workspace * repush * modify generate-stackbrew-library.sh * modify generate-stackbrew-library.sh * modify generate-stackbrew-library.sh * modify generate-stackbrew-library.sh * modify generate-stackbrew-library.sh * modify generate-stackbrew-library.sh * modify generate-stackbrew-library.sh * modify generate-stackbrew-library.sh * modify generate-stackbrew-library.sh * Add support for multi-architecture in Dockerfile * Add support for multi-architecture in Dockerfile * fix version.json * Add support for multi-architecture in Dockerfile * Add support for multi-architecture in Dockerfile * Add support for multi-architecture in Dockerfile * Add support for multi-architecture in Dockerfile * Add support for multi-architecture in Dockerfile * Add support for multi-architecture in Dockerfile * Add support for multi-architecture in Dockerfile * Add support for multi-architecture in Dockerfile * Add support for multi-architecture in Dockerfile * Add support for multi-architecture in Dockerfile * Add support for multi-architecture in Dockerfile * Add support for multi-architecture in Dockerfile * Add support for multi-architecture in Dockerfile * Add support for multi-architecture in Dockerfile * Add support for multi-architecture in Dockerfile * Add support for multi-architecture in Dockerfile * Add support for multi-architecture in Dockerfile * Add support for multi-architecture in Dockerfile * Add support for multi-architecture in Dockerfile * Add support for multi-architecture in Dockerfile * Add support for multi-architecture in Dockerfile * Add support for multi-architecture in Dockerfile * Add support for multi-architecture in Dockerfile * Add support for multi-architecture in Dockerfile * Add support for multi-architecture in Dockerfile * Add support for multi-architecture in Dockerfile * Add support for multi-architecture in Dockerfile * Add support for multi-architecture in Dockerfile * Add support for multi-architecture in Dockerfile * Add support for multi-architecture in Dockerfile * Add support for multi-architecture in Dockerfile * Update ci.yml * Update generate-stackbrew-library.sh * Update generate-stackbrew-library.sh * Update generate-stackbrew-library.sh * Update generate-stackbrew-library.sh * Update generate-stackbrew-library.sh * Update Dockerfile * Update generate-stackbrew-library.sh * Update munge.sh * Update Dockerfile * Update generate-stackbrew-library.sh * Support multi-arch * add bookworm feature * add bookworm feature * Create ubi8 * add bookworm feature * add bookworm feature * add bookworm feature * Update verify-templating.yml * add bookworm feature * add bookworm feature * Update verify-templating.yml * Ensure entrypoint is executable. * Update verify-templating.yml * Update verify-templating.yml * Update Dockerfile-redhat.template * support multi atch * Update verify-templating.yml --- 3/bookworm/Dockerfile | 168 ++++++++++++++ 3/bookworm/docker-ensure-initdb.sh | 71 ++++++ 3/bookworm/docker-entrypoint.sh | 357 +++++++++++++++++++++++++++++ 3/ubi8/Dockerfile | 2 +- Dockerfile-debian.template | 162 +++++++++++++ Dockerfile-redhat.template | 2 +- apply-templates.sh | 5 +- generate-stackbrew-library.sh | 14 +- versions.json | 11 +- 9 files changed, 786 insertions(+), 6 deletions(-) create mode 100644 3/bookworm/Dockerfile create mode 100755 3/bookworm/docker-ensure-initdb.sh create mode 100755 3/bookworm/docker-entrypoint.sh create mode 100644 Dockerfile-debian.template diff --git a/3/bookworm/Dockerfile b/3/bookworm/Dockerfile new file mode 100644 index 0000000..33606ff --- /dev/null +++ b/3/bookworm/Dockerfile @@ -0,0 +1,168 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +# Use Debian as the base image +FROM debian:bookworm-slim as builder + +# explicitly set user/group IDs +RUN groupadd -g 1000 ivorysql; \ + useradd -u 1000 -g ivorysql -d /var/local/ivorysql -s /bin/sh ivorysql; \ + mkdir -p /var/local/ivorysql; \ + mkdir -p /usr/src/ivorysql; \ + mkdir -p /var/lib/ivorysql; \ + chown -R ivorysql:ivorysql /var/local/ivorysql; \ + chown -R ivorysql:ivorysql /usr/src/ivorysql; \ + chown -R ivorysql:ivorysql /var/lib/ivorysql + +RUN mkdir /docker-entrypoint-initdb.d + +# Set environment variables for IvorySQL +ENV IVORY_MAJOR 3 +ENV IVORY_VERSION 3.3 +ARG USE_CHINA_MIRROR=false + +# Use China mirror if specified +RUN if [ "$USE_CHINA_MIRROR" = "true" ]; then \ + sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list.d/debian.sources ;\ + fi + +# Update package list and install necessary dependencies +RUN apt-get update +RUN apt-get install -y make \ + libreadline-dev \ + zlib1g-dev \ + libssl-dev \ + flex \ + wget \ + dpkg \ + build-essential \ + llvm \ + llvm-dev \ + liblz4-dev \ + clang \ + libkrb5-dev \ + libselinux1-dev \ + libxml2-dev \ + libsasl2-dev \ + libicu-dev \ + e2fslibs-dev \ + libsepol-dev \ + libsystemd-dev \ + libxslt1-dev \ + libldap2-dev \ + libssl-dev \ + libpam0g-dev \ + uuid-dev \ + python3-dev \ + libreadline-dev \ + tcl-dev \ + zlib1g-dev \ + perl \ + libperl-dev \ + perl \ + perl-base \ + perl-modules \ + perl-doc \ + m4 \ + libc6 \ + libbison-dev\ + libossp-uuid-dev\ + curl + +RUN wget https://mirrors.ustc.edu.cn/gnu/bison/bison-3.0.4.tar.gz; \ + tar -xzvf bison-3.0.4.tar.gz; \ + cd bison-3.0.4 ; \ + sed -i 's/IO_ftrylockfile/IO_EOF_SEEN/' lib/*.c ;\ + echo "#define _IO_IN_BACKUP 0x100" >> lib/stdio-impl.h ;\ + mkdir build && cd build ;\ + ../configure ;\ + make && make install ; + +RUN wget -O ivorysql.tar.gz "https://github.com/IvorySQL/IvorySQL/archive/refs/tags/IvorySQL_$IVORY_VERSION.tar.gz"; \ + tar \ + --extract \ + --file ivorysql.tar.gz \ + --directory /usr/src/ivorysql \ + --strip-components 1 \ + ; \ + rm ivorysql.tar.gz; \ + cd /usr/src/ivorysql; \ + ./configure \ + --prefix=/var/local/ivorysql/ivorysql-$IVORY_MAJOR \ + --enable-cassert --enable-debug --enable-rpath --with-tcl \ + --with-python --with-gssapi --with-pam --with-ldap \ + --with-openssl --with-libedit-preferred --with-uuid=e2fs \ + --with-ossp-uuid --with-libxml --with-libxslt --with-perl \ + --without-icu \ + ;\ + make && make install; + +RUN rm -rf \ + /usr/src/ivorysql \ + /usr/local/share/doc \ + /usr/local/share/man + +RUN chown -R ivorysql:ivorysql /var/local/ivorysql/ivorysql-$IVORY_MAJOR +RUN dpkgArch="$(dpkg --print-architecture)"; # amd64 | arm64v8 +RUN curl -o /usr/local/bin/gosu -SL "https://github.com/tianon/gosu/releases/download/1.11/gosu-$dpkgArch" + +RUN chmod +x /usr/local/bin/gosu + +FROM debian:bookworm-slim + +COPY --from=builder /var/local/ivorysql /var/local/ivorysql/ +COPY --from=builder /usr/local/bin/gosu /usr/local/bin/gosu + +ENV IVORY_MAJOR 3 +ENV IVORY_VERSION 3.3 +ARG USE_CHINA_MIRROR=false +RUN mkdir /docker-entrypoint-initdb.d + +RUN useradd -u 1000 ivorysql + +# Use China mirror if specified +RUN if [ "$USE_CHINA_MIRROR" = "true" ]; then \ + sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list.d/debian.sources ;\ + fi + +RUN apt-get update && \ + apt-get install -y \ + liblz4-1 \ + liblz4-dev \ + libkrb5-dev \ + libxslt1-dev \ + libldap-common \ + libldap-2.5-0 \ + libldap2-dev \ + libreadline-dev \ + libicu-dev && \ + apt-get clean + + +RUN chown -R ivorysql:ivorysql /var/local/ivorysql +RUN chown -R ivorysql:ivorysql /usr/local/bin + +ENV PGDATA /var/local/ivorysql/ivorysql-$IVORY_MAJOR/data + +# this 1777 will be replaced by 0700 at runtime (allows semi-arbitrary "--user" values) +RUN mkdir -p "$PGDATA" && chown -R ivorysql:ivorysql "$PGDATA" && chmod 1777 "$PGDATA" +RUN mkdir -p /var/run/postgresql && chown -R ivorysql:ivorysql /var/run/postgresql && chmod 3777 /var/run/postgresql + +VOLUME ["/var/local/ivorysql/ivorysql-$IVORY_MAJOR/data","/var/local/ivorysql/data"] + +ENV PATH $PATH:/var/local/ivorysql/ivorysql-$IVORY_MAJOR/bin + +COPY docker-entrypoint.sh docker-ensure-initdb.sh /usr/local/bin/ +RUN ln -sT docker-ensure-initdb.sh /usr/local/bin/docker-enforce-initdb.sh +RUN chmod +x /usr/local/bin/docker-entrypoint.sh + +ENTRYPOINT ["docker-entrypoint.sh"] + +STOPSIGNAL SIGINT + +EXPOSE 5432 5866 1521 + +CMD ["postgres"] diff --git a/3/bookworm/docker-ensure-initdb.sh b/3/bookworm/docker-ensure-initdb.sh new file mode 100755 index 0000000..2a97586 --- /dev/null +++ b/3/bookworm/docker-ensure-initdb.sh @@ -0,0 +1,71 @@ +#!/usr/bin/env bash +set -Eeuo pipefail + +# +# This script is intended for three main use cases: +# +# 1. (most importantly) as an example of how to use "docker-entrypoint.sh" to extend/reuse the initialization behavior +# +# 2. ("docker-ensure-initdb.sh") as a Kubernetes "init container" to ensure the provided database directory is initialized; see also "startup probes" for an alternative solution +# (no-op if database is already initialized) +# +# 3. ("docker-enforce-initdb.sh") as part of CI to ensure the database is fully initialized before use +# (error if database is already initialized) +# + +source /usr/local/bin/docker-entrypoint.sh + +# arguments to this script are assumed to be arguments to the "postgres" server (same as "docker-entrypoint.sh"), and most "docker-entrypoint.sh" functions assume "postgres" is the first argument (see "_main" over there) +if [ "$#" -eq 0 ] || [ "$1" != 'postgres' ]; then + set -- postgres "$@" +fi + +# see also "_main" in "docker-entrypoint.sh" + +docker_setup_env +# setup data directories and permissions (when run as root) +docker_create_db_directories +if [ "$(id -u)" = '0' ]; then + # then restart script as postgres user + exec su-exec postgres "$BASH_SOURCE" "$@" +fi + +# only run initialization on an empty data directory +if [ -z "$DATABASE_ALREADY_EXISTS" ]; then + docker_verify_minimum_env + + # check dir permissions to reduce likelihood of half-initialized database + ls /docker-entrypoint-initdb.d/ > /dev/null + + docker_init_database_dir + pg_setup_hba_conf "$@" + + # PGPASSWORD is required for psql when authentication is required for 'local' connections via pg_hba.conf and is otherwise harmless + # e.g. when '--auth=md5' or '--auth-local=md5' is used in POSTGRES_INITDB_ARGS + export PGPASSWORD="${PGPASSWORD:-$POSTGRES_PASSWORD}" + docker_temp_server_start "$@" + + docker_setup_db + docker_process_init_files /docker-entrypoint-initdb.d/* + + docker_temp_server_stop + unset PGPASSWORD +else + self="$(basename "$0")" + case "$self" in + docker-ensure-initdb.sh) + echo >&2 "$self: note: database already initialized in '$PGDATA'!" + exit 0 + ;; + + docker-enforce-initdb.sh) + echo >&2 "$self: error: (unexpected) database found in '$PGDATA'!" + exit 1 + ;; + + *) + echo >&2 "$self: error: unknown file name: $self" + exit 99 + ;; + esac +fi diff --git a/3/bookworm/docker-entrypoint.sh b/3/bookworm/docker-entrypoint.sh new file mode 100755 index 0000000..e0f6c63 --- /dev/null +++ b/3/bookworm/docker-entrypoint.sh @@ -0,0 +1,357 @@ +#!/usr/bin/env bash +set -Eeo pipefail +# TODO swap to -Eeuo pipefail above (after handling all potentially-unset variables) + +# usage: file_env VAR [DEFAULT] +# ie: file_env 'XYZ_DB_PASSWORD' 'example' +# (will allow for "$XYZ_DB_PASSWORD_FILE" to fill in the value of +# "$XYZ_DB_PASSWORD" from a file, especially for Docker's secrets feature) +file_env() { + local var="$1" + local fileVar="${var}_FILE" + local def="${2:-}" + if [ "${!var:-}" ] && [ "${!fileVar:-}" ]; then + printf >&2 'error: both %s and %s are set (but are exclusive)\n' "$var" "$fileVar" + exit 1 + fi + local val="$def" + if [ "${!var:-}" ]; then + val="${!var}" + elif [ "${!fileVar:-}" ]; then + val="$(< "${!fileVar}")" + fi + export "$var"="$val" + unset "$fileVar" +} + +# check to see if this file is being run or sourced from another script +_is_sourced() { + # https://unix.stackexchange.com/a/215279 + [ "${#FUNCNAME[@]}" -ge 2 ] \ + && [ "${FUNCNAME[0]}" = '_is_sourced' ] \ + && [ "${FUNCNAME[1]}" = 'source' ] +} + +# used to create initial postgres directories and if run as root, ensure ownership to the "postgres" user +docker_create_db_directories() { + local user; user="$(id -u)" + + mkdir -p "$PGDATA" + # ignore failure since there are cases where we can't chmod (and PostgreSQL might fail later anyhow - it's picky about permissions of this directory) + chmod 00700 "$PGDATA" || : + + # ignore failure since it will be fine when using the image provided directory; see also https://github.com/docker-library/postgres/pull/289 + mkdir -p /var/run/postgresql || : + chmod 03775 /var/run/postgresql || : + + # Create the transaction log directory before initdb is run so the directory is owned by the correct user + if [ -n "${POSTGRES_INITDB_WALDIR:-}" ]; then + mkdir -p "$POSTGRES_INITDB_WALDIR" + if [ "$user" = '0' ]; then + find "$POSTGRES_INITDB_WALDIR" \! -user ivorysql -exec chown ivorysql '{}' + + fi + chmod 700 "$POSTGRES_INITDB_WALDIR" + fi + + # allow the container to be started with `--user` + if [ "$user" = '0' ]; then + find "$PGDATA" \! -user ivorysql -exec chown ivorysql '{}' + + find /var/run/postgresql \! -user ivorysql -exec chown ivorysql '{}' + + fi +} + +# initialize empty PGDATA directory with new database via 'initdb' +# arguments to `initdb` can be passed via IVORYSQL_INITDB_ARGS or as arguments to this function +# `initdb` automatically creates the "postgres", "template0", and "template1" dbnames +# this is also where the database user is created, specified by `IVORYSQL_USER` env +docker_init_database_dir() { + # "initdb" is particular about the current user existing in "/etc/passwd", so we use "nss_wrapper" to fake that if necessary + # see https://github.com/docker-library/postgres/pull/253, https://github.com/docker-library/postgres/issues/359, https://cwrap.org/nss_wrapper.html + local uid; uid="$(id -u)" + if ! getent passwd "$uid" &> /dev/null; then + # see if we can find a suitable "libnss_wrapper.so" (https://salsa.debian.org/sssd-team/nss-wrapper/-/commit/b9925a653a54e24d09d9b498a2d913729f7abb15) + local wrapper + for wrapper in {/usr,}/lib{/*,}/libnss_wrapper.so; do + if [ -s "$wrapper" ]; then + NSS_WRAPPER_PASSWD="$(mktemp)" + NSS_WRAPPER_GROUP="$(mktemp)" + export LD_PRELOAD="$wrapper" NSS_WRAPPER_PASSWD NSS_WRAPPER_GROUP + local gid; gid="$(id -g)" + printf 'postgres:x:%s:%s:PostgreSQL:%s:/bin/false\n' "$uid" "$gid" "$PGDATA" > "$NSS_WRAPPER_PASSWD" + printf 'postgres:x:%s:\n' "$gid" > "$NSS_WRAPPER_GROUP" + break + fi + done + fi + + if [ -n "${POSTGRES_INITDB_WALDIR:-}" ]; then + set -- --waldir "$POSTGRES_INITDB_WALDIR" "$@" + fi + + # --pwfile refuses to handle a properly-empty file (hence the "\n"): https://github.com/docker-library/postgres/issues/1025 + eval 'initdb --username="$IVORYSQL_USER" --pwfile=<(printf "%s\n" "$IVORYSQL_PASSWORD") '"$IVORYSQL_INITDB_ARGS"' "$@"' + sed -ri "s!^#?(listen_addresses)\s*=\s*\S+.*!\1 = '*'!" $PGDATA/postgresql.conf + sed -ri "s!^#?(ivorysql.listen_addresses)\s*=\s*\S+.*!\1 = '*'!" $PGDATA/ivorysql.conf + # unset/cleanup "nss_wrapper" bits + if [[ "${LD_PRELOAD:-}" == */libnss_wrapper.so ]]; then + rm -f "$NSS_WRAPPER_PASSWD" "$NSS_WRAPPER_GROUP" + unset LD_PRELOAD NSS_WRAPPER_PASSWD NSS_WRAPPER_GROUP + fi +} + +# print large warning if IVORYSQL_PASSWORD is long +# error if both IVORYSQL_PASSWORD is empty and POSTGRES_HOST_AUTH_METHOD is not 'trust' +# print large warning if POSTGRES_HOST_AUTH_METHOD is set to 'trust' +# assumes database is not set up, ie: [ -z "$DATABASE_ALREADY_EXISTS" ] +docker_verify_minimum_env() { + case "${IVORY_MAJOR:-}" in + 12 | 13) # https://github.com/postgres/postgres/commit/67a472d71c98c3d2fa322a1b4013080b20720b98 + # check password first so we can output the warning before postgres + # messes it up + if [ "${#IVORYSQL_PASSWORD}" -ge 100 ]; then + cat >&2 <<-'EOWARN' + + WARNING: The supplied IVORYSQL_PASSWORD is 100+ characters. + + This will not work if used via PGPASSWORD with "psql". + + https://www.postgresql.org/message-id/flat/E1Rqxp2-0004Qt-PL%40wrigleys.postgresql.org (BUG #6412) + https://github.com/docker-library/postgres/issues/507 + + EOWARN + fi + ;; + esac + if [ -z "$IVORYSQL_PASSWORD" ] && [ 'trust' != "$POSTGRES_HOST_AUTH_METHOD" ]; then + # The - option suppresses leading tabs but *not* spaces. :) + cat >&2 <<-'EOE' + Error: Database is uninitialized and superuser password is not specified. + You must specify IVORYSQL_PASSWORD to a non-empty value for the + superuser. For example, "-e IVORYSQL_PASSWORD=password" on "docker run". + + You may also use "POSTGRES_HOST_AUTH_METHOD=trust" to allow all + connections without a password. This is *not* recommended. + + See PostgreSQL documentation about "trust": + https://www.postgresql.org/docs/current/auth-trust.html + EOE + exit 1 + fi + if [ 'trust' = "$POSTGRES_HOST_AUTH_METHOD" ]; then + cat >&2 <<-'EOWARN' + ******************************************************************************** + WARNING: POSTGRES_HOST_AUTH_METHOD has been set to "trust". This will allow + anyone with access to the Postgres port to access your database without + a password, even if IVORYSQL_PASSWORD is set. See PostgreSQL + documentation about "trust": + https://www.postgresql.org/docs/current/auth-trust.html + In Docker's default configuration, this is effectively any other + container on the same system. + + It is not recommended to use POSTGRES_HOST_AUTH_METHOD=trust. Replace + it with "-e IVORYSQL_PASSWORD=password" instead to set a password in + "docker run". + ******************************************************************************** + EOWARN + fi +} + +# usage: docker_process_init_files [file [file [...]]] +# ie: docker_process_init_files /always-initdb.d/* +# process initializer files, based on file extensions and permissions +docker_process_init_files() { + # psql here for backwards compatibility "${psql[@]}" + psql=( docker_process_sql ) + + printf '\n' + local f + for f; do + case "$f" in + *.sh) + # https://github.com/docker-library/postgres/issues/450#issuecomment-393167936 + # https://github.com/docker-library/postgres/pull/452 + if [ -x "$f" ]; then + printf '%s: running %s\n' "$0" "$f" + "$f" + else + printf '%s: sourcing %s\n' "$0" "$f" + . "$f" + fi + ;; + *.sql) printf '%s: running %s\n' "$0" "$f"; docker_process_sql -f "$f"; printf '\n' ;; + *.sql.gz) printf '%s: running %s\n' "$0" "$f"; gunzip -c "$f" | docker_process_sql; printf '\n' ;; + *.sql.xz) printf '%s: running %s\n' "$0" "$f"; xzcat "$f" | docker_process_sql; printf '\n' ;; + *.sql.zst) printf '%s: running %s\n' "$0" "$f"; zstd -dc "$f" | docker_process_sql; printf '\n' ;; + *) printf '%s: ignoring %s\n' "$0" "$f" ;; + esac + printf '\n' + done +} + +# Execute sql script, passed via stdin (or -f flag of pqsl) +# usage: docker_process_sql [psql-cli-args] +# ie: docker_process_sql --dbname=mydb <<<'INSERT ...' +# ie: docker_process_sql -f my-file.sql +# ie: docker_process_sql > "$PGDATA/pg_hba.conf" +} + +# start socket-only postgresql server for setting up or running scripts +# all arguments will be passed along as arguments to `postgres` (via pg_ctl) +docker_temp_server_start() { + if [ "$1" = 'postgres' ]; then + shift + fi + + # internal start of server in order to allow setup using psql client + # does not listen on external TCP/IP and waits until start finishes + set -- "$@" -c listen_addresses='' -p "${PGPORT:-5866}" + + PGUSER="${PGUSER:-$IVORYSQL_USER}" \ + pg_ctl -D "$PGDATA" \ + -o "$(printf '%q ' "$@")" \ + -w start +} + +# stop postgresql server after done setting up user and running scripts +docker_temp_server_stop() { + PGUSER="${PGUSER:-$IVORYSQL_USER}" \ + pg_ctl -D "$PGDATA" -m fast -w stop +} + +# check arguments for an option that would cause postgres to stop +# return true if there is one +_pg_want_help() { + local arg + for arg; do + case "$arg" in + # postgres --help | grep 'then exit' + # leaving out -C on purpose since it always fails and is unhelpful: + # postgres: could not access the server configuration file "/var/lib/postgresql/data/postgresql.conf": No such file or directory + -'?'|--help|--describe-config|-V|--version) + return 0 + ;; + esac + done + return 1 +} + +_main() { + # if first arg looks like a flag, assume we want to run postgres server + if [ "${1:0:1}" = '-' ]; then + set -- postgres "$@" + fi + + if [ "$1" = 'postgres' ] && ! _pg_want_help "$@"; then + docker_setup_env + # setup data directories and permissions (when run as root) + docker_create_db_directories + if [ "$(id -u)" = '0' ]; then + # then restart script as ivorysql user + exec gosu ivorysql "$BASH_SOURCE" "$@" + fi + + # only run initialization on an empty data directory + if [ -z "$DATABASE_ALREADY_EXISTS" ]; then + docker_verify_minimum_env + + # check dir permissions to reduce likelihood of half-initialized database + ls /docker-entrypoint-initdb.d/ > /dev/null + + docker_init_database_dir + pg_setup_hba_conf "$@" + + # PGPASSWORD is required for psql when authentication is required for 'local' connections via pg_hba.conf and is otherwise harmless + # e.g. when '--auth=md5' or '--auth-local=md5' is used in IVORYSQL_INITDB_ARGS + export PGPASSWORD="${PGPASSWORD:-$IVORYSQL_PASSWORD}" + docker_temp_server_start "$@" + + docker_setup_db + docker_process_init_files /docker-entrypoint-initdb.d/* + + docker_temp_server_stop + unset PGPASSWORD + + cat <<-'EOM' + + PostgreSQL init process complete; ready for start up. + + EOM + else + cat <<-'EOM' + + PostgreSQL Database directory appears to contain a database; Skipping initialization + + EOM + fi + fi + + exec "$@" +} + +if ! _is_sourced; then + _main "$@" +fi diff --git a/3/ubi8/Dockerfile b/3/ubi8/Dockerfile index 0d680bc..e2f1b83 100644 --- a/3/ubi8/Dockerfile +++ b/3/ubi8/Dockerfile @@ -104,7 +104,7 @@ ENV PATH $PATH:/var/local/ivorysql/ivorysql-$IVORY_MAJOR/bin COPY docker-entrypoint.sh docker-ensure-initdb.sh /usr/local/bin/ RUN ln -sT docker-ensure-initdb.sh /usr/local/bin/docker-enforce-initdb.sh - +RUN chmod +x /usr/local/bin/docker-entrypoint.sh ENTRYPOINT ["docker-entrypoint.sh"] STOPSIGNAL SIGINT diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template new file mode 100644 index 0000000..cf40492 --- /dev/null +++ b/Dockerfile-debian.template @@ -0,0 +1,162 @@ +# Use Debian as the base image +FROM debian:{{ env.variant }}-slim as builder + +# explicitly set user/group IDs +RUN groupadd -g 1000 ivorysql; \ + useradd -u 1000 -g ivorysql -d /var/local/ivorysql -s /bin/sh ivorysql; \ + mkdir -p /var/local/ivorysql; \ + mkdir -p /usr/src/ivorysql; \ + mkdir -p /var/lib/ivorysql; \ + chown -R ivorysql:ivorysql /var/local/ivorysql; \ + chown -R ivorysql:ivorysql /usr/src/ivorysql; \ + chown -R ivorysql:ivorysql /var/lib/ivorysql + +RUN mkdir /docker-entrypoint-initdb.d + +# Set environment variables for IvorySQL +ENV IVORY_MAJOR {{ env.version }} +ENV IVORY_VERSION {{ .[env.variant].version }} +ARG USE_CHINA_MIRROR=false + +# Use China mirror if specified +RUN if [ "$USE_CHINA_MIRROR" = "true" ]; then \ + sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list.d/debian.sources ;\ + fi + +# Update package list and install necessary dependencies +RUN apt-get update +RUN apt-get install -y make \ + libreadline-dev \ + zlib1g-dev \ + libssl-dev \ + flex \ + wget \ + dpkg \ + build-essential \ + llvm \ + llvm-dev \ + liblz4-dev \ + clang \ + libkrb5-dev \ + libselinux1-dev \ + libxml2-dev \ + libsasl2-dev \ + libicu-dev \ + e2fslibs-dev \ + libsepol-dev \ + libsystemd-dev \ + libxslt1-dev \ + libldap2-dev \ + libssl-dev \ + libpam0g-dev \ + uuid-dev \ + python3-dev \ + libreadline-dev \ + tcl-dev \ + zlib1g-dev \ + perl \ + libperl-dev \ + perl \ + perl-base \ + perl-modules \ + perl-doc \ + m4 \ + libc6 \ + libbison-dev\ + libossp-uuid-dev\ + curl + +RUN wget https://mirrors.ustc.edu.cn/gnu/bison/bison-3.0.4.tar.gz; \ + tar -xzvf bison-3.0.4.tar.gz; \ + cd bison-3.0.4 ; \ + sed -i 's/IO_ftrylockfile/IO_EOF_SEEN/' lib/*.c ;\ + echo "#define _IO_IN_BACKUP 0x100" >> lib/stdio-impl.h ;\ + mkdir build && cd build ;\ + ../configure ;\ + make && make install ; + +RUN wget -O ivorysql.tar.gz "https://github.com/IvorySQL/IvorySQL/archive/refs/tags/IvorySQL_$IVORY_VERSION.tar.gz"; \ + tar \ + --extract \ + --file ivorysql.tar.gz \ + --directory /usr/src/ivorysql \ + --strip-components 1 \ + ; \ + rm ivorysql.tar.gz; \ + cd /usr/src/ivorysql; \ + ./configure \ + --prefix=/var/local/ivorysql/ivorysql-$IVORY_MAJOR \ + --enable-cassert --enable-debug --enable-rpath --with-tcl \ + --with-python --with-gssapi --with-pam --with-ldap \ + --with-openssl --with-libedit-preferred --with-uuid=e2fs \ + --with-ossp-uuid --with-libxml --with-libxslt --with-perl \ + --without-icu \ + ;\ + make && make install; + +RUN rm -rf \ + /usr/src/ivorysql \ + /usr/local/share/doc \ + /usr/local/share/man + +RUN chown -R ivorysql:ivorysql /var/local/ivorysql/ivorysql-$IVORY_MAJOR +RUN dpkgArch="$(dpkg --print-architecture)"; # amd64 | arm64v8 +RUN curl -o /usr/local/bin/gosu -SL "https://github.com/tianon/gosu/releases/download/1.11/gosu-$dpkgArch" + +RUN chmod +x /usr/local/bin/gosu + +FROM debian:{{ env.variant }}-slim + +COPY --from=builder /var/local/ivorysql /var/local/ivorysql/ +COPY --from=builder /usr/local/bin/gosu /usr/local/bin/gosu + +ENV IVORY_MAJOR {{ env.version }} +ENV IVORY_VERSION {{ .[env.variant].version }} +ARG USE_CHINA_MIRROR=false +RUN mkdir /docker-entrypoint-initdb.d + +RUN useradd -u 1000 ivorysql + +# Use China mirror if specified +RUN if [ "$USE_CHINA_MIRROR" = "true" ]; then \ + sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list.d/debian.sources ;\ + fi + +RUN apt-get update && \ + apt-get install -y \ + liblz4-1 \ + liblz4-dev \ + libkrb5-dev \ + libxslt1-dev \ + libldap-common \ + libldap-2.5-0 \ + libldap2-dev \ + libreadline-dev \ + libicu-dev && \ + apt-get clean + + +RUN chown -R ivorysql:ivorysql /var/local/ivorysql +RUN chown -R ivorysql:ivorysql /usr/local/bin + +ENV PGDATA /var/local/ivorysql/ivorysql-$IVORY_MAJOR/data + +# this 1777 will be replaced by 0700 at runtime (allows semi-arbitrary "--user" values) +RUN mkdir -p "$PGDATA" && chown -R ivorysql:ivorysql "$PGDATA" && chmod 1777 "$PGDATA" +RUN mkdir -p /var/run/postgresql && chown -R ivorysql:ivorysql /var/run/postgresql && chmod 3777 /var/run/postgresql + +VOLUME ["/var/local/ivorysql/ivorysql-$IVORY_MAJOR/data","/var/local/ivorysql/data"] + +ENV PATH $PATH:/var/local/ivorysql/ivorysql-$IVORY_MAJOR/bin + +COPY docker-entrypoint.sh docker-ensure-initdb.sh /usr/local/bin/ +RUN ln -sT docker-ensure-initdb.sh /usr/local/bin/docker-enforce-initdb.sh +RUN chmod +x /usr/local/bin/docker-entrypoint.sh + +ENTRYPOINT ["docker-entrypoint.sh"] + +STOPSIGNAL SIGINT + +EXPOSE 5432 5866 1521 + +CMD ["postgres"] \ No newline at end of file diff --git a/Dockerfile-redhat.template b/Dockerfile-redhat.template index 56f7f10..fa4dad4 100644 --- a/Dockerfile-redhat.template +++ b/Dockerfile-redhat.template @@ -98,7 +98,7 @@ ENV PATH $PATH:/var/local/ivorysql/ivorysql-$IVORY_MAJOR/bin COPY docker-entrypoint.sh docker-ensure-initdb.sh /usr/local/bin/ RUN ln -sT docker-ensure-initdb.sh /usr/local/bin/docker-enforce-initdb.sh - +RUN chmod +x /usr/local/bin/docker-entrypoint.sh ENTRYPOINT ["docker-entrypoint.sh"] STOPSIGNAL SIGINT diff --git a/apply-templates.sh b/apply-templates.sh index dc6587c..5b94123 100755 --- a/apply-templates.sh +++ b/apply-templates.sh @@ -50,8 +50,11 @@ for version; do cp -a docker-entrypoint.sh docker-ensure-initdb.sh "$dir/" case "$variant" in + ubi8*) + template='Dockerfile-redhat.template' + ;; *) - template='Dockerfile-redhat.template' + template='Dockerfile-debian.template' ;; esac diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 9378ac7..2a1027f 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -103,8 +103,18 @@ for version; do dir="$version/$variant" commit="$(dirCommit "$dir")" - parent="$(awk 'toupper($1) == "FROM" { print $2 }' "$dir/Dockerfile")" - arches="amd64" + # parent="$(awk 'toupper($1) == "FROM" { print $2 } as builder' "$dir/Dockerfile")" + # arches="${parentRepoToArches[$parent]}" + + case "$variant" in + ubi8*) + arches="amd64" + ;; + *) + arches="amd64,arm64v8" + ;; + esac + variantAliases=( "${versionAliases[@]/%/-$variant}" ) variantAliases=( "${variantAliases[@]//latest-/}" ) diff --git a/versions.json b/versions.json index 9e88b29..7719e14 100644 --- a/versions.json +++ b/versions.json @@ -7,9 +7,18 @@ "version": "3.3" }, "redhat": "ubi8", + "debian": "bookworm", + "bookworm": { + "arches": [ + "amd64", + "arm64v8" + ], + "version": "3.3" + }, "major": 3, "variants": [ - "ubi8" + "ubi8", + "bookworm" ], "version": "3.3" }