From c80cbc9bf6b96429b133a131b83aca99c5f6929e Mon Sep 17 00:00:00 2001 From: SUSE Update Bot Date: Mon, 9 Sep 2024 06:16:14 +0000 Subject: [PATCH 1/4] =?UTF-8?q?=F0=9F=A4=96:=20Update=20build=20recipes=20?= =?UTF-8?q?from=20templates?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kiwi-image/Dockerfile | 6 +++--- mariadb-client-image/Dockerfile | 12 ++++++------ mariadb-client-image/README.md | 4 ++-- mariadb-image/Dockerfile | 12 ++++++------ mariadb-image/README.md | 6 +++--- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/kiwi-image/Dockerfile b/kiwi-image/Dockerfile index 2d75465b7..36333992c 100644 --- a/kiwi-image/Dockerfile +++ b/kiwi-image/Dockerfile @@ -18,8 +18,8 @@ #!BuildTag: opensuse/bci/kiwi:10-%RELEASE% #!BuildTag: opensuse/bci/kiwi:10.1 #!BuildTag: opensuse/bci/kiwi:10.1-%RELEASE% -#!BuildTag: opensuse/bci/kiwi:10.1.4 -#!BuildTag: opensuse/bci/kiwi:10.1.4-%RELEASE% +#!BuildTag: opensuse/bci/kiwi:10.1.6 +#!BuildTag: opensuse/bci/kiwi:10.1.6-%RELEASE% #!BuildTag: opensuse/bci/kiwi:latest FROM opensuse/tumbleweed:latest @@ -31,7 +31,7 @@ RUN set -euo pipefail; zypper -n in --no-recommends checkmedia dracut-kiwi-oem-r LABEL org.opencontainers.image.authors="openSUSE (https://www.opensuse.org/)" LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI KIWI Appliance Builder (kiwi)" LABEL org.opencontainers.image.description="KIWI Appliance Builder (kiwi) container based on the openSUSE Tumbleweed Base Container Image. This container is only supported in privileged mode." -LABEL org.opencontainers.image.version="10.1.4" +LABEL org.opencontainers.image.version="10.1.6" LABEL org.opencontainers.image.url="https://www.opensuse.org" LABEL org.opencontainers.image.created="%BUILDTIME%" LABEL org.opencontainers.image.vendor="openSUSE Project" diff --git a/mariadb-client-image/Dockerfile b/mariadb-client-image/Dockerfile index ae7e42ba5..8d266f9a6 100644 --- a/mariadb-client-image/Dockerfile +++ b/mariadb-client-image/Dockerfile @@ -14,8 +14,8 @@ # You can contact the BCI team via https://github.com/SUSE/bci/discussions -#!BuildTag: opensuse/mariadb-client:11.4 -#!BuildTag: opensuse/mariadb-client:11.4-%RELEASE% +#!BuildTag: opensuse/mariadb-client:11.5 +#!BuildTag: opensuse/mariadb-client:11.5-%RELEASE% #!BuildTag: opensuse/mariadb-client:latest FROM opensuse/tumbleweed:latest @@ -27,13 +27,13 @@ RUN set -euo pipefail; zypper -n in --no-recommends mariadb-client; zypper -n cl LABEL org.opencontainers.image.authors="openSUSE (https://www.opensuse.org/)" LABEL org.opencontainers.image.title="openSUSE Tumbleweed MariaDB Client" LABEL org.opencontainers.image.description="MariaDB Client container based on the openSUSE Tumbleweed Base Container Image." -LABEL org.opencontainers.image.version="11.4" +LABEL org.opencontainers.image.version="11.5" LABEL org.opencontainers.image.url="https://www.opensuse.org" LABEL org.opencontainers.image.created="%BUILDTIME%" LABEL org.opencontainers.image.vendor="openSUSE Project" LABEL org.opencontainers.image.source="%SOURCEURL%" -LABEL org.opencontainers.image.ref.name="11.4-%RELEASE%" -LABEL org.opensuse.reference="registry.opensuse.org/opensuse/mariadb-client:11.4-%RELEASE%" +LABEL org.opencontainers.image.ref.name="11.5-%RELEASE%" +LABEL org.opensuse.reference="registry.opensuse.org/opensuse/mariadb-client:11.5-%RELEASE%" LABEL org.openbuildservice.disturl="%DISTURL%" LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime#openSUSE_BCI" LABEL org.opensuse.release-stage="released" @@ -41,4 +41,4 @@ LABEL org.opensuse.release-stage="released" LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/mariadb-client-image/README.md" CMD ["mariadb"] # sanity check that the version from the tag is equal to the version of mariadb-client that we expect -RUN set -euo pipefail; [ "$(rpm -q --qf '%{version}' mariadb-client | cut -d '.' -f -2)" = "11.4" ] +RUN set -euo pipefail; [ "$(rpm -q --qf '%{version}' mariadb-client | cut -d '.' -f -2)" = "11.5" ] diff --git a/mariadb-client-image/README.md b/mariadb-client-image/README.md index 6f49c2898..4c9f83a88 100644 --- a/mariadb-client-image/README.md +++ b/mariadb-client-image/README.md @@ -13,13 +13,13 @@ This image contains the [MariaDB client](https://mariadb.com/kb/en/mariadb-comma To connect to a MariaDB instance, run the following command: ```ShellSession -$ podman run -it --rm registry.opensuse.org/opensuse/mariadb-client:11.4 mariadb -h $HOST_IP -u root -p +$ podman run -it --rm registry.opensuse.org/opensuse/mariadb-client:11.5 mariadb -h $HOST_IP -u root -p ``` Use the command below to dump all databases: ```ShellSession -$ podman run -it --rm registry.opensuse.org/opensuse/mariadb-client:11.4 mariadb-dump $HOST_IP -p --all-databases > my-dump.sql +$ podman run -it --rm registry.opensuse.org/opensuse/mariadb-client:11.5 mariadb-dump $HOST_IP -p --all-databases > my-dump.sql ``` ## Utilities diff --git a/mariadb-image/Dockerfile b/mariadb-image/Dockerfile index 527bc48ea..db606a75b 100644 --- a/mariadb-image/Dockerfile +++ b/mariadb-image/Dockerfile @@ -14,8 +14,8 @@ # You can contact the BCI team via https://github.com/SUSE/bci/discussions -#!BuildTag: opensuse/mariadb:11.4 -#!BuildTag: opensuse/mariadb:11.4-%RELEASE% +#!BuildTag: opensuse/mariadb:11.5 +#!BuildTag: opensuse/mariadb:11.5-%RELEASE% #!BuildTag: opensuse/mariadb:latest FROM opensuse/tumbleweed:latest @@ -27,13 +27,13 @@ RUN set -euo pipefail; zypper -n in --no-recommends mariadb mariadb-tools gawk t LABEL org.opencontainers.image.authors="openSUSE (https://www.opensuse.org/)" LABEL org.opencontainers.image.title="openSUSE Tumbleweed MariaDB Server" LABEL org.opencontainers.image.description="MariaDB Server container based on the openSUSE Tumbleweed Base Container Image." -LABEL org.opencontainers.image.version="11.4" +LABEL org.opencontainers.image.version="11.5" LABEL org.opencontainers.image.url="https://www.opensuse.org" LABEL org.opencontainers.image.created="%BUILDTIME%" LABEL org.opencontainers.image.vendor="openSUSE Project" LABEL org.opencontainers.image.source="%SOURCEURL%" -LABEL org.opencontainers.image.ref.name="11.4-%RELEASE%" -LABEL org.opensuse.reference="registry.opensuse.org/opensuse/mariadb:11.4-%RELEASE%" +LABEL org.opencontainers.image.ref.name="11.5-%RELEASE%" +LABEL org.opensuse.reference="registry.opensuse.org/opensuse/mariadb:11.5-%RELEASE%" LABEL org.openbuildservice.disturl="%DISTURL%" LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime#openSUSE_BCI" LABEL org.opensuse.release-stage="released" @@ -43,7 +43,7 @@ ENTRYPOINT ["docker-entrypoint.sh"] CMD ["mariadbd"] EXPOSE 3306 # sanity check that the version from the tag is equal to the version of mariadb-client that we expect -RUN set -euo pipefail; [ "$(rpm -q --qf '%{version}' mariadb-client | cut -d '.' -f -2)" = "11.4" ] +RUN set -euo pipefail; [ "$(rpm -q --qf '%{version}' mariadb-client | cut -d '.' -f -2)" = "11.5" ] RUN set -euo pipefail; mkdir /docker-entrypoint-initdb.d diff --git a/mariadb-image/README.md b/mariadb-image/README.md index 8c67e57fc..27c95e2aa 100644 --- a/mariadb-image/README.md +++ b/mariadb-image/README.md @@ -12,13 +12,13 @@ By default, the image launches MariaDB with the same configuration that comes wi The only environment variable required to start the container is the MariaDB root password. ```ShellSession -$ podman run -it --rm -p 3306:3306 -e MARIADB_ROOT_PASSWORD=my-password registry.opensuse.org/opensuse/mariadb:11.4 +$ podman run -it --rm -p 3306:3306 -e MARIADB_ROOT_PASSWORD=my-password registry.opensuse.org/opensuse/mariadb:11.5 ``` or: ```ShellSession -$ podman run -it --rm -p 3306:3306 -e MARIADB_ALLOW_EMPTY_ROOT_PASSWORD=1 registry.opensuse.org/opensuse/mariadb:11.4 +$ podman run -it --rm -p 3306:3306 -e MARIADB_ALLOW_EMPTY_ROOT_PASSWORD=1 registry.opensuse.org/opensuse/mariadb:11.5 ``` ### Volumes @@ -33,7 +33,7 @@ When using the MariaDB image, we recommend one of the following options: To mount a host directory as a volume for your data run the following command: ```ShellSession -$ podman run -it --rm -v /my/own/datadir:/var/lib/mysql:Z -p 3306:3306 -e MARIADB_ROOT_PASSWORD=my-password registry.opensuse.org/opensuse/mariadb:11.4 +$ podman run -it --rm -v /my/own/datadir:/var/lib/mysql:Z -p 3306:3306 -e MARIADB_ROOT_PASSWORD=my-password registry.opensuse.org/opensuse/mariadb:11.5 ``` The `-v /my/own/datadir:/var/lib/mysql:Z` part of the command mounts the `/my/own/datadir` directory from the underlying host system as `/var/lib/mysql` inside the container, where MariaDB will by default write its data files. From a10cee7d3dd59be891cb1a9b4ebacc68e5875ed8 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 9 Sep 2024 06:51:05 +0000 Subject: [PATCH 2/4] Update changelogs for kiwi-image, mariadb-client-image, mariadb-image --- kiwi-image/kiwi-image.changes | 5 +++++ mariadb-client-image/mariadb-client-image.changes | 5 +++++ mariadb-image/mariadb-image.changes | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/kiwi-image/kiwi-image.changes b/kiwi-image/kiwi-image.changes index 065c94b2d..66e344526 100644 --- a/kiwi-image/kiwi-image.changes +++ b/kiwi-image/kiwi-image.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Sep 9 06:51:05 UTC 2024 - Dirk Mueller + +- Bump main package version + ------------------------------------------------------------------- Thu Sep 5 06:33:31 UTC 2024 - Dan Čermák diff --git a/mariadb-client-image/mariadb-client-image.changes b/mariadb-client-image/mariadb-client-image.changes index 00a139876..22752ccca 100644 --- a/mariadb-client-image/mariadb-client-image.changes +++ b/mariadb-client-image/mariadb-client-image.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Sep 9 06:51:05 UTC 2024 - Dirk Mueller + +- Bump main package version + ------------------------------------------------------------------- Wed Aug 14 12:30:32 UTC 2024 - Dirk Mueller diff --git a/mariadb-image/mariadb-image.changes b/mariadb-image/mariadb-image.changes index 5b0d157ec..3df9108ce 100644 --- a/mariadb-image/mariadb-image.changes +++ b/mariadb-image/mariadb-image.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Sep 9 06:51:05 UTC 2024 - Dirk Mueller + +- Bump main package version + ------------------------------------------------------------------- Wed Sep 4 11:25:11 UTC 2024 - Dan Čermák From c519c99ffa2783c1590c1391ec3af2d3bd79a327 Mon Sep 17 00:00:00 2001 From: SUSE Update Bot Date: Mon, 9 Sep 2024 07:09:37 +0000 Subject: [PATCH 3/4] =?UTF-8?q?=F0=9F=A4=96:=20Update=20build=20recipes=20?= =?UTF-8?q?from=20templates?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- postgres-12-image/Dockerfile | 10 ++++++---- postgres-12-image/_service | 7 ++++++- postgres-13-image/Dockerfile | 10 ++++++---- postgres-13-image/_service | 7 ++++++- postgres-14-image/Dockerfile | 10 ++++++---- postgres-14-image/_service | 7 ++++++- postgres-15-image/Dockerfile | 10 ++++++---- postgres-15-image/_service | 7 ++++++- postgres-16-image/Dockerfile | 10 ++++++---- postgres-16-image/_service | 7 ++++++- 10 files changed, 60 insertions(+), 25 deletions(-) diff --git a/postgres-12-image/Dockerfile b/postgres-12-image/Dockerfile index f0f0369a8..cb2320d41 100644 --- a/postgres-12-image/Dockerfile +++ b/postgres-12-image/Dockerfile @@ -16,8 +16,10 @@ #!BuildTag: opensuse/postgres:12 #!BuildTag: opensuse/postgres:12-%RELEASE% -#!BuildTag: opensuse/postgres:%%pg_version%% -#!BuildTag: opensuse/postgres:%%pg_version%%-%RELEASE% +#!BuildTag: opensuse/postgres:%%pg_minor_version%% +#!BuildTag: opensuse/postgres:%%pg_minor_version%%-%RELEASE% +#!BuildTag: opensuse/postgres:%%pg_patch_version%% +#!BuildTag: opensuse/postgres:%%pg_patch_version%%-%RELEASE% FROM opensuse/tumbleweed:latest @@ -28,7 +30,7 @@ RUN set -euo pipefail; zypper -n in --no-recommends postgresql12-server findutil LABEL org.opencontainers.image.authors="openSUSE (https://www.opensuse.org/)" LABEL org.opencontainers.image.title="openSUSE Tumbleweed PostgreSQL 12" LABEL org.opencontainers.image.description="PostgreSQL 12 container based on the openSUSE Tumbleweed Base Container Image." -LABEL org.opencontainers.image.version="12" +LABEL org.opencontainers.image.version="%%pg_patch_version%%" LABEL org.opencontainers.image.url="https://www.opensuse.org" LABEL org.opencontainers.image.created="%BUILDTIME%" LABEL org.opencontainers.image.vendor="openSUSE Project" @@ -42,7 +44,7 @@ LABEL org.opensuse.release-stage="released" LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/postgres-12-image/README.md" ENV LANG="en_US.utf8" ENV PG_MAJOR="12" -ENV PG_VERSION="%%pg_version%%" +ENV PG_VERSION="%%pg_minor_version%%" ENV PGDATA="/var/lib/pgsql/data" ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"] diff --git a/postgres-12-image/_service b/postgres-12-image/_service index d79fee1cf..a6fd1cc1e 100644 --- a/postgres-12-image/_service +++ b/postgres-12-image/_service @@ -3,8 +3,13 @@ Dockerfile - %%pg_version%% + %%pg_minor_version%% postgresql12-server minor + + Dockerfile + %%pg_patch_version%% + postgresql12-server + \ No newline at end of file diff --git a/postgres-13-image/Dockerfile b/postgres-13-image/Dockerfile index 2baa4320a..013b52c8c 100644 --- a/postgres-13-image/Dockerfile +++ b/postgres-13-image/Dockerfile @@ -16,8 +16,10 @@ #!BuildTag: opensuse/postgres:13 #!BuildTag: opensuse/postgres:13-%RELEASE% -#!BuildTag: opensuse/postgres:%%pg_version%% -#!BuildTag: opensuse/postgres:%%pg_version%%-%RELEASE% +#!BuildTag: opensuse/postgres:%%pg_minor_version%% +#!BuildTag: opensuse/postgres:%%pg_minor_version%%-%RELEASE% +#!BuildTag: opensuse/postgres:%%pg_patch_version%% +#!BuildTag: opensuse/postgres:%%pg_patch_version%%-%RELEASE% FROM opensuse/tumbleweed:latest @@ -28,7 +30,7 @@ RUN set -euo pipefail; zypper -n in --no-recommends postgresql13-server findutil LABEL org.opencontainers.image.authors="openSUSE (https://www.opensuse.org/)" LABEL org.opencontainers.image.title="openSUSE Tumbleweed PostgreSQL 13" LABEL org.opencontainers.image.description="PostgreSQL 13 container based on the openSUSE Tumbleweed Base Container Image." -LABEL org.opencontainers.image.version="13" +LABEL org.opencontainers.image.version="%%pg_patch_version%%" LABEL org.opencontainers.image.url="https://www.opensuse.org" LABEL org.opencontainers.image.created="%BUILDTIME%" LABEL org.opencontainers.image.vendor="openSUSE Project" @@ -42,7 +44,7 @@ LABEL org.opensuse.release-stage="released" LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/postgres-13-image/README.md" ENV LANG="en_US.utf8" ENV PG_MAJOR="13" -ENV PG_VERSION="%%pg_version%%" +ENV PG_VERSION="%%pg_minor_version%%" ENV PGDATA="/var/lib/pgsql/data" ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"] diff --git a/postgres-13-image/_service b/postgres-13-image/_service index abd1cdd3b..a8eea07fa 100644 --- a/postgres-13-image/_service +++ b/postgres-13-image/_service @@ -3,8 +3,13 @@ Dockerfile - %%pg_version%% + %%pg_minor_version%% postgresql13-server minor + + Dockerfile + %%pg_patch_version%% + postgresql13-server + \ No newline at end of file diff --git a/postgres-14-image/Dockerfile b/postgres-14-image/Dockerfile index c170350a3..8a70a3d64 100644 --- a/postgres-14-image/Dockerfile +++ b/postgres-14-image/Dockerfile @@ -16,8 +16,10 @@ #!BuildTag: opensuse/postgres:14 #!BuildTag: opensuse/postgres:14-%RELEASE% -#!BuildTag: opensuse/postgres:%%pg_version%% -#!BuildTag: opensuse/postgres:%%pg_version%%-%RELEASE% +#!BuildTag: opensuse/postgres:%%pg_minor_version%% +#!BuildTag: opensuse/postgres:%%pg_minor_version%%-%RELEASE% +#!BuildTag: opensuse/postgres:%%pg_patch_version%% +#!BuildTag: opensuse/postgres:%%pg_patch_version%%-%RELEASE% FROM opensuse/tumbleweed:latest @@ -28,7 +30,7 @@ RUN set -euo pipefail; zypper -n in --no-recommends postgresql14-server findutil LABEL org.opencontainers.image.authors="openSUSE (https://www.opensuse.org/)" LABEL org.opencontainers.image.title="openSUSE Tumbleweed PostgreSQL 14" LABEL org.opencontainers.image.description="PostgreSQL 14 container based on the openSUSE Tumbleweed Base Container Image." -LABEL org.opencontainers.image.version="14" +LABEL org.opencontainers.image.version="%%pg_patch_version%%" LABEL org.opencontainers.image.url="https://www.opensuse.org" LABEL org.opencontainers.image.created="%BUILDTIME%" LABEL org.opencontainers.image.vendor="openSUSE Project" @@ -42,7 +44,7 @@ LABEL org.opensuse.release-stage="released" LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/postgres-14-image/README.md" ENV LANG="en_US.utf8" ENV PG_MAJOR="14" -ENV PG_VERSION="%%pg_version%%" +ENV PG_VERSION="%%pg_minor_version%%" ENV PGDATA="/var/lib/pgsql/data" ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"] diff --git a/postgres-14-image/_service b/postgres-14-image/_service index 9f09fe948..260a2471c 100644 --- a/postgres-14-image/_service +++ b/postgres-14-image/_service @@ -3,8 +3,13 @@ Dockerfile - %%pg_version%% + %%pg_minor_version%% postgresql14-server minor + + Dockerfile + %%pg_patch_version%% + postgresql14-server + \ No newline at end of file diff --git a/postgres-15-image/Dockerfile b/postgres-15-image/Dockerfile index 24f0dbb1c..3ad691162 100644 --- a/postgres-15-image/Dockerfile +++ b/postgres-15-image/Dockerfile @@ -16,8 +16,10 @@ #!BuildTag: opensuse/postgres:15 #!BuildTag: opensuse/postgres:15-%RELEASE% -#!BuildTag: opensuse/postgres:%%pg_version%% -#!BuildTag: opensuse/postgres:%%pg_version%%-%RELEASE% +#!BuildTag: opensuse/postgres:%%pg_minor_version%% +#!BuildTag: opensuse/postgres:%%pg_minor_version%%-%RELEASE% +#!BuildTag: opensuse/postgres:%%pg_patch_version%% +#!BuildTag: opensuse/postgres:%%pg_patch_version%%-%RELEASE% FROM opensuse/tumbleweed:latest @@ -28,7 +30,7 @@ RUN set -euo pipefail; zypper -n in --no-recommends postgresql15-server findutil LABEL org.opencontainers.image.authors="openSUSE (https://www.opensuse.org/)" LABEL org.opencontainers.image.title="openSUSE Tumbleweed PostgreSQL 15" LABEL org.opencontainers.image.description="PostgreSQL 15 container based on the openSUSE Tumbleweed Base Container Image." -LABEL org.opencontainers.image.version="15" +LABEL org.opencontainers.image.version="%%pg_patch_version%%" LABEL org.opencontainers.image.url="https://www.opensuse.org" LABEL org.opencontainers.image.created="%BUILDTIME%" LABEL org.opencontainers.image.vendor="openSUSE Project" @@ -42,7 +44,7 @@ LABEL org.opensuse.release-stage="released" LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/postgres-15-image/README.md" ENV LANG="en_US.utf8" ENV PG_MAJOR="15" -ENV PG_VERSION="%%pg_version%%" +ENV PG_VERSION="%%pg_minor_version%%" ENV PGDATA="/var/lib/pgsql/data" ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"] diff --git a/postgres-15-image/_service b/postgres-15-image/_service index 7eddd0d29..25fbb8c5c 100644 --- a/postgres-15-image/_service +++ b/postgres-15-image/_service @@ -3,8 +3,13 @@ Dockerfile - %%pg_version%% + %%pg_minor_version%% postgresql15-server minor + + Dockerfile + %%pg_patch_version%% + postgresql15-server + \ No newline at end of file diff --git a/postgres-16-image/Dockerfile b/postgres-16-image/Dockerfile index 87b02ac17..4ef57512a 100644 --- a/postgres-16-image/Dockerfile +++ b/postgres-16-image/Dockerfile @@ -16,8 +16,10 @@ #!BuildTag: opensuse/postgres:16 #!BuildTag: opensuse/postgres:16-%RELEASE% -#!BuildTag: opensuse/postgres:%%pg_version%% -#!BuildTag: opensuse/postgres:%%pg_version%%-%RELEASE% +#!BuildTag: opensuse/postgres:%%pg_minor_version%% +#!BuildTag: opensuse/postgres:%%pg_minor_version%%-%RELEASE% +#!BuildTag: opensuse/postgres:%%pg_patch_version%% +#!BuildTag: opensuse/postgres:%%pg_patch_version%%-%RELEASE% #!BuildTag: opensuse/postgres:latest FROM opensuse/tumbleweed:latest @@ -29,7 +31,7 @@ RUN set -euo pipefail; zypper -n in --no-recommends postgresql16-server findutil LABEL org.opencontainers.image.authors="openSUSE (https://www.opensuse.org/)" LABEL org.opencontainers.image.title="openSUSE Tumbleweed PostgreSQL 16" LABEL org.opencontainers.image.description="PostgreSQL 16 container based on the openSUSE Tumbleweed Base Container Image." -LABEL org.opencontainers.image.version="16" +LABEL org.opencontainers.image.version="%%pg_patch_version%%" LABEL org.opencontainers.image.url="https://www.opensuse.org" LABEL org.opencontainers.image.created="%BUILDTIME%" LABEL org.opencontainers.image.vendor="openSUSE Project" @@ -43,7 +45,7 @@ LABEL org.opensuse.release-stage="released" LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/postgres-16-image/README.md" ENV LANG="en_US.utf8" ENV PG_MAJOR="16" -ENV PG_VERSION="%%pg_version%%" +ENV PG_VERSION="%%pg_minor_version%%" ENV PGDATA="/var/lib/pgsql/data" ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"] diff --git a/postgres-16-image/_service b/postgres-16-image/_service index 0764f511b..9d3f00d92 100644 --- a/postgres-16-image/_service +++ b/postgres-16-image/_service @@ -3,8 +3,13 @@ Dockerfile - %%pg_version%% + %%pg_minor_version%% postgresql16-server minor + + Dockerfile + %%pg_patch_version%% + postgresql16-server + \ No newline at end of file From 474569aaaca22f650841d3c14e25e6b89872a370 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 9 Sep 2024 07:25:11 +0000 Subject: [PATCH 4/4] Update changelogs for postgres-15-image, postgres-13-image, postgres-16-image, postgres-14-image, postgres-12-image --- postgres-12-image/postgres-12-image.changes | 5 +++++ postgres-13-image/postgres-13-image.changes | 5 +++++ postgres-14-image/postgres-14-image.changes | 5 +++++ postgres-15-image/postgres-15-image.changes | 5 +++++ postgres-16-image/postgres-16-image.changes | 5 +++++ 5 files changed, 25 insertions(+) diff --git a/postgres-12-image/postgres-12-image.changes b/postgres-12-image/postgres-12-image.changes index a58617430..75203d2e0 100644 --- a/postgres-12-image/postgres-12-image.changes +++ b/postgres-12-image/postgres-12-image.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Sep 9 07:25:11 UTC 2024 - Dirk Mueller + +- set full version on labels and tags + ------------------------------------------------------------------- Fri Aug 16 07:07:46 UTC 2024 - Dirk Mueller diff --git a/postgres-13-image/postgres-13-image.changes b/postgres-13-image/postgres-13-image.changes index aa7f0b13b..c5a22bdbf 100644 --- a/postgres-13-image/postgres-13-image.changes +++ b/postgres-13-image/postgres-13-image.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Sep 9 07:25:11 UTC 2024 - Dirk Mueller + +- set full version on labels and tags + ------------------------------------------------------------------- Fri Aug 16 07:07:46 UTC 2024 - Dirk Mueller diff --git a/postgres-14-image/postgres-14-image.changes b/postgres-14-image/postgres-14-image.changes index 645689ab1..c32d2961c 100644 --- a/postgres-14-image/postgres-14-image.changes +++ b/postgres-14-image/postgres-14-image.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Sep 9 07:25:11 UTC 2024 - Dirk Mueller + +- set full version on labels and tags + ------------------------------------------------------------------- Fri Aug 16 07:07:46 UTC 2024 - Dirk Mueller diff --git a/postgres-15-image/postgres-15-image.changes b/postgres-15-image/postgres-15-image.changes index 3df42ade0..9839a1b6d 100644 --- a/postgres-15-image/postgres-15-image.changes +++ b/postgres-15-image/postgres-15-image.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Sep 9 07:25:11 UTC 2024 - Dirk Mueller + +- set full version on labels and tags + ------------------------------------------------------------------- Fri Aug 16 07:07:46 UTC 2024 - Dirk Mueller diff --git a/postgres-16-image/postgres-16-image.changes b/postgres-16-image/postgres-16-image.changes index e9442c56a..b0f43da4e 100644 --- a/postgres-16-image/postgres-16-image.changes +++ b/postgres-16-image/postgres-16-image.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Sep 9 07:25:11 UTC 2024 - Dirk Mueller + +- set full version on labels and tags + ------------------------------------------------------------------- Fri Aug 16 07:07:46 UTC 2024 - Dirk Mueller