From de56ce8407d55d376e28218a1c748b78f2061d85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Tue, 14 Mar 2023 07:32:42 +0000 Subject: [PATCH] Test build for #283 --- .obs/workflows.yml | 7 + aspnet-runtime-6.0/Dockerfile | 12 +- aspnet-runtime-7.0/Dockerfile | 12 +- dotnet-6.0/Dockerfile | 24 +- dotnet-7.0/Dockerfile | 24 +- dotnet-runtime-6.0/Dockerfile | 12 +- dotnet-runtime-7.0/Dockerfile | 12 +- postgres-14-image/Dockerfile | 1 - postgres-15-image/Dockerfile | 48 +++ postgres-15-image/LICENSE | 22 ++ postgres-15-image/_constraints | 7 + postgres-15-image/_service | 10 + postgres-15-image/docker-entrypoint.sh | 351 ++++++++++++++++++++ postgres-15-image/postgres-15-image.changes | 4 + 14 files changed, 497 insertions(+), 49 deletions(-) create mode 100644 postgres-15-image/Dockerfile create mode 100644 postgres-15-image/LICENSE create mode 100644 postgres-15-image/_constraints create mode 100644 postgres-15-image/_service create mode 100644 postgres-15-image/docker-entrypoint.sh create mode 100644 postgres-15-image/postgres-15-image.changes diff --git a/.obs/workflows.yml b/.obs/workflows.yml index 87e419f34..17b6a5166 100644 --- a/.obs/workflows.yml +++ b/.obs/workflows.yml @@ -101,6 +101,10 @@ staging_build: source_project: home:defolos:BCI:CR:SLE-15-SP4 source_package: rmt-mariadb-client-image target_project: home:defolos:BCI:CR:SLE-15-SP4:Staging + - branch_package: + source_project: home:defolos:BCI:CR:SLE-15-SP4 + source_package: postgres-15-image + target_project: home:defolos:BCI:CR:SLE-15-SP4:Staging - branch_package: source_project: home:defolos:BCI:CR:SLE-15-SP4 source_package: postgres-14-image @@ -261,6 +265,9 @@ refresh_devel_BCI: - trigger_services: project: devel:BCI:SLE-15-SP4 package: rmt-mariadb-client-image + - trigger_services: + project: devel:BCI:SLE-15-SP4 + package: postgres-15-image - trigger_services: project: devel:BCI:SLE-15-SP4 package: postgres-14-image diff --git a/aspnet-runtime-6.0/Dockerfile b/aspnet-runtime-6.0/Dockerfile index 0d30574ae..7ae70c4e1 100644 --- a/aspnet-runtime-6.0/Dockerfile +++ b/aspnet-runtime-6.0/Dockerfile @@ -35,12 +35,12 @@ COPY microsoft.asc /tmp RUN mkdir -p /tmp/ -#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-host-6.0.14-x64.rpm -COPY dotnet-host-6.0.14-x64.rpm /tmp/ -#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-hostfxr-6.0.14-x64.rpm -COPY dotnet-hostfxr-6.0.14-x64.rpm /tmp/ -#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-runtime-deps-6.0.14-sles.12-x64.rpm -COPY dotnet-runtime-deps-6.0.14-sles.12-x64.rpm /tmp/ +#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-host-6.0.15-x64.rpm +COPY dotnet-host-6.0.15-x64.rpm /tmp/ +#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-hostfxr-6.0.15-x64.rpm +COPY dotnet-hostfxr-6.0.15-x64.rpm /tmp/ +#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-runtime-deps-6.0.15-sles.12-x64.rpm +COPY dotnet-runtime-deps-6.0.15-sles.12-x64.rpm /tmp/ #!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-runtime-6.0.14-x64.rpm COPY dotnet-runtime-6.0.14-x64.rpm /tmp/ #!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/a/aspnetcore-runtime-6.0.14-x64.rpm diff --git a/aspnet-runtime-7.0/Dockerfile b/aspnet-runtime-7.0/Dockerfile index 0a48a5200..e8fb83ce7 100644 --- a/aspnet-runtime-7.0/Dockerfile +++ b/aspnet-runtime-7.0/Dockerfile @@ -36,12 +36,12 @@ COPY microsoft.asc /tmp RUN mkdir -p /tmp/ -#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-host-7.0.3-x64.rpm -COPY dotnet-host-7.0.3-x64.rpm /tmp/ -#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-hostfxr-7.0.3-x64.rpm -COPY dotnet-hostfxr-7.0.3-x64.rpm /tmp/ -#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-runtime-deps-7.0.3-sles.12-x64.rpm -COPY dotnet-runtime-deps-7.0.3-sles.12-x64.rpm /tmp/ +#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-host-7.0.4-x64.rpm +COPY dotnet-host-7.0.4-x64.rpm /tmp/ +#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-hostfxr-7.0.4-x64.rpm +COPY dotnet-hostfxr-7.0.4-x64.rpm /tmp/ +#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-runtime-deps-7.0.4-sles.12-x64.rpm +COPY dotnet-runtime-deps-7.0.4-sles.12-x64.rpm /tmp/ #!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-runtime-7.0.3-x64.rpm COPY dotnet-runtime-7.0.3-x64.rpm /tmp/ #!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/a/aspnetcore-runtime-7.0.3-x64.rpm diff --git a/dotnet-6.0/Dockerfile b/dotnet-6.0/Dockerfile index 1aa03f352..321cd7453 100644 --- a/dotnet-6.0/Dockerfile +++ b/dotnet-6.0/Dockerfile @@ -36,22 +36,22 @@ COPY microsoft.asc /tmp RUN mkdir -p /tmp/ -#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-host-6.0.14-x64.rpm -COPY dotnet-host-6.0.14-x64.rpm /tmp/ +#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-host-6.0.15-x64.rpm +COPY dotnet-host-6.0.15-x64.rpm /tmp/ #!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/n/netstandard-targeting-pack-2.1.0-x64.rpm COPY netstandard-targeting-pack-2.1.0-x64.rpm /tmp/ -#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-targeting-pack-6.0.14-x64.rpm -COPY dotnet-targeting-pack-6.0.14-x64.rpm /tmp/ -#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-hostfxr-6.0.14-x64.rpm -COPY dotnet-hostfxr-6.0.14-x64.rpm /tmp/ -#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-runtime-deps-6.0.14-sles.12-x64.rpm -COPY dotnet-runtime-deps-6.0.14-sles.12-x64.rpm /tmp/ +#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-targeting-pack-6.0.15-x64.rpm +COPY dotnet-targeting-pack-6.0.15-x64.rpm /tmp/ +#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-hostfxr-6.0.15-x64.rpm +COPY dotnet-hostfxr-6.0.15-x64.rpm /tmp/ +#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-runtime-deps-6.0.15-sles.12-x64.rpm +COPY dotnet-runtime-deps-6.0.15-sles.12-x64.rpm /tmp/ #!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-runtime-6.0.14-x64.rpm COPY dotnet-runtime-6.0.14-x64.rpm /tmp/ -#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-apphost-pack-6.0.14-x64.rpm -COPY dotnet-apphost-pack-6.0.14-x64.rpm /tmp/ -#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/a/aspnetcore-targeting-pack-6.0.14-x64.rpm -COPY aspnetcore-targeting-pack-6.0.14-x64.rpm /tmp/ +#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-apphost-pack-6.0.15-x64.rpm +COPY dotnet-apphost-pack-6.0.15-x64.rpm /tmp/ +#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/a/aspnetcore-targeting-pack-6.0.15-x64.rpm +COPY aspnetcore-targeting-pack-6.0.15-x64.rpm /tmp/ #!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/a/aspnetcore-runtime-6.0.14-x64.rpm COPY aspnetcore-runtime-6.0.14-x64.rpm /tmp/ #!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-sdk-6.0.406-x64.rpm diff --git a/dotnet-7.0/Dockerfile b/dotnet-7.0/Dockerfile index 3483c6bc8..dff873539 100644 --- a/dotnet-7.0/Dockerfile +++ b/dotnet-7.0/Dockerfile @@ -37,22 +37,22 @@ COPY microsoft.asc /tmp RUN mkdir -p /tmp/ -#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-host-7.0.3-x64.rpm -COPY dotnet-host-7.0.3-x64.rpm /tmp/ +#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-host-7.0.4-x64.rpm +COPY dotnet-host-7.0.4-x64.rpm /tmp/ #!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/n/netstandard-targeting-pack-2.1.0-x64.rpm COPY netstandard-targeting-pack-2.1.0-x64.rpm /tmp/ -#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-targeting-pack-7.0.3-x64.rpm -COPY dotnet-targeting-pack-7.0.3-x64.rpm /tmp/ -#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-hostfxr-7.0.3-x64.rpm -COPY dotnet-hostfxr-7.0.3-x64.rpm /tmp/ -#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-runtime-deps-7.0.3-sles.12-x64.rpm -COPY dotnet-runtime-deps-7.0.3-sles.12-x64.rpm /tmp/ +#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-targeting-pack-7.0.4-x64.rpm +COPY dotnet-targeting-pack-7.0.4-x64.rpm /tmp/ +#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-hostfxr-7.0.4-x64.rpm +COPY dotnet-hostfxr-7.0.4-x64.rpm /tmp/ +#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-runtime-deps-7.0.4-sles.12-x64.rpm +COPY dotnet-runtime-deps-7.0.4-sles.12-x64.rpm /tmp/ #!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-runtime-7.0.3-x64.rpm COPY dotnet-runtime-7.0.3-x64.rpm /tmp/ -#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-apphost-pack-7.0.3-x64.rpm -COPY dotnet-apphost-pack-7.0.3-x64.rpm /tmp/ -#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/a/aspnetcore-targeting-pack-7.0.3-x64.rpm -COPY aspnetcore-targeting-pack-7.0.3-x64.rpm /tmp/ +#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-apphost-pack-7.0.4-x64.rpm +COPY dotnet-apphost-pack-7.0.4-x64.rpm /tmp/ +#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/a/aspnetcore-targeting-pack-7.0.4-x64.rpm +COPY aspnetcore-targeting-pack-7.0.4-x64.rpm /tmp/ #!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/a/aspnetcore-runtime-7.0.3-x64.rpm COPY aspnetcore-runtime-7.0.3-x64.rpm /tmp/ #!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-sdk-7.0.201-x64.rpm diff --git a/dotnet-runtime-6.0/Dockerfile b/dotnet-runtime-6.0/Dockerfile index b565d345f..5e2376f21 100644 --- a/dotnet-runtime-6.0/Dockerfile +++ b/dotnet-runtime-6.0/Dockerfile @@ -35,12 +35,12 @@ COPY microsoft.asc /tmp RUN mkdir -p /tmp/ -#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-host-6.0.14-x64.rpm -COPY dotnet-host-6.0.14-x64.rpm /tmp/ -#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-hostfxr-6.0.14-x64.rpm -COPY dotnet-hostfxr-6.0.14-x64.rpm /tmp/ -#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-runtime-deps-6.0.14-sles.12-x64.rpm -COPY dotnet-runtime-deps-6.0.14-sles.12-x64.rpm /tmp/ +#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-host-6.0.15-x64.rpm +COPY dotnet-host-6.0.15-x64.rpm /tmp/ +#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-hostfxr-6.0.15-x64.rpm +COPY dotnet-hostfxr-6.0.15-x64.rpm /tmp/ +#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-runtime-deps-6.0.15-sles.12-x64.rpm +COPY dotnet-runtime-deps-6.0.15-sles.12-x64.rpm /tmp/ #!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-runtime-6.0.14-x64.rpm COPY dotnet-runtime-6.0.14-x64.rpm /tmp/ diff --git a/dotnet-runtime-7.0/Dockerfile b/dotnet-runtime-7.0/Dockerfile index 3525420c4..28148fa02 100644 --- a/dotnet-runtime-7.0/Dockerfile +++ b/dotnet-runtime-7.0/Dockerfile @@ -36,12 +36,12 @@ COPY microsoft.asc /tmp RUN mkdir -p /tmp/ -#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-host-7.0.3-x64.rpm -COPY dotnet-host-7.0.3-x64.rpm /tmp/ -#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-hostfxr-7.0.3-x64.rpm -COPY dotnet-hostfxr-7.0.3-x64.rpm /tmp/ -#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-runtime-deps-7.0.3-sles.12-x64.rpm -COPY dotnet-runtime-deps-7.0.3-sles.12-x64.rpm /tmp/ +#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-host-7.0.4-x64.rpm +COPY dotnet-host-7.0.4-x64.rpm /tmp/ +#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-hostfxr-7.0.4-x64.rpm +COPY dotnet-hostfxr-7.0.4-x64.rpm /tmp/ +#!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-runtime-deps-7.0.4-sles.12-x64.rpm +COPY dotnet-runtime-deps-7.0.4-sles.12-x64.rpm /tmp/ #!RemoteAssetUrl: https://packages.microsoft.com/sles/15/prod/Packages/d/dotnet-runtime-7.0.3-x64.rpm COPY dotnet-runtime-7.0.3-x64.rpm /tmp/ diff --git a/postgres-14-image/Dockerfile b/postgres-14-image/Dockerfile index bce46ad0c..16e7d4ea6 100644 --- a/postgres-14-image/Dockerfile +++ b/postgres-14-image/Dockerfile @@ -3,7 +3,6 @@ #!BuildTag: suse/postgres:14-%RELEASE% #!BuildTag: suse/postgres:%%pg_version%% #!BuildTag: suse/postgres:%%pg_version%%-%RELEASE% -#!BuildTag: suse/postgres:latest #!BuildVersion: 15.4.14 FROM suse/sle15:15.4 diff --git a/postgres-15-image/Dockerfile b/postgres-15-image/Dockerfile new file mode 100644 index 000000000..ea08c4711 --- /dev/null +++ b/postgres-15-image/Dockerfile @@ -0,0 +1,48 @@ +# SPDX-License-Identifier: MIT +#!BuildTag: suse/postgres:15 +#!BuildTag: suse/postgres:15-%RELEASE% +#!BuildTag: suse/postgres:%%pg_version%% +#!BuildTag: suse/postgres:%%pg_version%%-%RELEASE% +#!BuildTag: suse/postgres:latest +#!BuildVersion: 15.4.15 +FROM suse/sle15:15.4 + +MAINTAINER SUSE LLC (https://www.suse.com/) + +# Define labels according to https://en.opensuse.org/Building_derived_containers +# labelprefix=com.suse.application.postgres +LABEL org.opencontainers.image.title="SLE PostgreSQL 15 Container Image" +LABEL org.opencontainers.image.description="PostgreSQL 15 based on the SLE Base Container Image." +LABEL org.opencontainers.image.version="15" +LABEL org.opencontainers.image.url="https://www.suse.com/products/server/" +LABEL org.opencontainers.image.created="%BUILDTIME%" +LABEL org.opencontainers.image.vendor="SUSE LLC" +LABEL org.opencontainers.image.source="%SOURCEURL%" +LABEL org.opensuse.reference="registry.suse.com/suse/postgres:15-%RELEASE%" +LABEL org.openbuildservice.disturl="%DISTURL%" +LABEL com.suse.supportlevel="l3" +LABEL com.suse.eula="sle-bci" +LABEL com.suse.lifecycle-url="https://www.suse.com/lifecycle" +LABEL com.suse.image-type="application" +LABEL com.suse.release-stage="released" +# endlabelprefix + +RUN set -euo pipefail; zypper -n in --no-recommends postgresql15-server distribution-release; zypper -n clean; rm -rf /var/log/* +ENV LANG="en_US.utf8" +ENV PG_MAJOR="15" +ENV PG_VERSION="%%pg_version%%" +ENV PGDATA="/var/lib/postgresql/data" + +ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"] +CMD ["postgres"] +VOLUME /var/lib/postgresql/data +EXPOSE 5432 +COPY docker-entrypoint.sh /usr/local/bin/ +RUN set -euo pipefail; chmod +x /usr/local/bin/docker-entrypoint.sh; \ + ln -s su /usr/bin/gosu; \ + mkdir /docker-entrypoint-initdb.d; \ + sed -ri "s|^#?(listen_addresses)\s*=\s*\S+.*|\1 = '*'|" /usr/share/postgresql15/postgresql.conf.sample + +STOPSIGNAL SIGINT +HEALTHCHECK --interval=10s --start-period=10s --timeout=5s \ + CMD pg_isready -U ${POSTGRES_USER:-postgres} -h localhost -p 5432 diff --git a/postgres-15-image/LICENSE b/postgres-15-image/LICENSE new file mode 100644 index 000000000..f86b1322e --- /dev/null +++ b/postgres-15-image/LICENSE @@ -0,0 +1,22 @@ +Copyright (c) 2014, Docker PostgreSQL Authors (See AUTHORS) + +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. diff --git a/postgres-15-image/_constraints b/postgres-15-image/_constraints new file mode 100644 index 000000000..6213041ce --- /dev/null +++ b/postgres-15-image/_constraints @@ -0,0 +1,7 @@ + + + + 8 + + + diff --git a/postgres-15-image/_service b/postgres-15-image/_service new file mode 100644 index 000000000..7eddd0d29 --- /dev/null +++ b/postgres-15-image/_service @@ -0,0 +1,10 @@ + + + + + Dockerfile + %%pg_version%% + postgresql15-server + minor + + \ No newline at end of file diff --git a/postgres-15-image/docker-entrypoint.sh b/postgres-15-image/docker-entrypoint.sh new file mode 100644 index 000000000..749445d21 --- /dev/null +++ b/postgres-15-image/docker-entrypoint.sh @@ -0,0 +1,351 @@ +#!/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 700 "$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 775 /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 postgres -exec chown postgres '{}' + + fi + chmod 700 "$POSTGRES_INITDB_WALDIR" + fi + + # allow the container to be started with `--user` + if [ "$user" = '0' ]; then + find "$PGDATA" \! -user postgres -exec chown postgres '{}' + + find /var/run/postgresql \! -user postgres -exec chown postgres '{}' + + fi +} + +# initialize empty PGDATA directory with new database via 'initdb' +# arguments to `initdb` can be passed via POSTGRES_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 `POSTGRES_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="$POSTGRES_USER" --pwfile=<(printf "%s\n" "$POSTGRES_PASSWORD") '"$POSTGRES_INITDB_ARGS"' "$@"' + + # 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 POSTGRES_PASSWORD is long +# error if both POSTGRES_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() { + # check password first so we can output the warning before postgres + # messes it up + if [ "${#POSTGRES_PASSWORD}" -ge 100 ]; then + cat >&2 <<-'EOWARN' + + WARNING: The supplied POSTGRES_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 + if [ -z "$POSTGRES_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 POSTGRES_PASSWORD to a non-empty value for the + superuser. For example, "-e POSTGRES_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 POSTGRES_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 POSTGRES_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:-5432}" + + PGUSER="${PGUSER:-$POSTGRES_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:-postgres}" \ + 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 postgres user + exec gosu 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 + + 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/postgres-15-image/postgres-15-image.changes b/postgres-15-image/postgres-15-image.changes new file mode 100644 index 000000000..d1017fc21 --- /dev/null +++ b/postgres-15-image/postgres-15-image.changes @@ -0,0 +1,4 @@ +------------------------------------------------------------------- +Tue Mar 14 07:32:38 UTC 2023 - SUSE Update Bot + +- First version of the PostgreSQL 15 BCI