Dockerfile

@@ -13,34 +13,28 @@
 # Please submit bugfixes or comments via https://bugs.opensuse.org/
 # You can contact the BCI team via https://github.com/SUSE/bci/discussions
 
-#!UseOBSRepositories
 
-#!BuildTag: opensuse/postgres:%%pg_patch_version%%-%RELEASE%
-#!BuildTag: opensuse/postgres:%%pg_patch_version%%
 #!BuildTag: opensuse/postgres:12
-#!BuildTag: opensuse/postgres:%%pg_minor_version%%
+#!BuildTag: opensuse/postgres:12-%RELEASE%
+#!BuildTag: opensuse/postgres:%%pg_version%%
+#!BuildTag: opensuse/postgres:%%pg_version%%-%RELEASE%
 
-FROM opensuse/bci/bci-micro:latest AS target
+FROM opensuse/tumbleweed:latest
-FROM opensuse/tumbleweed:latest AS builder
+
-COPY --from=target / /target
+RUN set -euo pipefail; zypper -n in --no-recommends postgresql12-server findutils; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
 
-RUN set -euo pipefail; \
-    zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends libpq5 postgresql12-server findutils coreutils sed util-linux; \
-    zypper -n clean; \
-    rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2}
-FROM opensuse/bci/bci-micro:latest
-COPY --from=builder /target /
 # Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=org.opensuse.application.postgres
+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="%%pg_patch_version%%"
+LABEL org.opencontainers.image.version="12"
 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="%%pg_patch_version%%-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="12-%RELEASE%"
-LABEL org.opensuse.reference="registry.opensuse.org/opensuse/postgres:%%pg_patch_version%%-%RELEASE%"
+LABEL org.opensuse.reference="registry.opensuse.org/opensuse/postgres:12-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime#openSUSE_BCI"
 LABEL org.opensuse.release-stage="released"
@@ -48,12 +42,12 @@ 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_minor_version%%"
+ENV PG_VERSION="%%pg_version%%"
 ENV PGDATA="/var/lib/pgsql/data"
 
 ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
 CMD ["postgres"]
-EXPOSE 5432/tcp
+EXPOSE 5432
 COPY docker-entrypoint.sh /usr/local/bin/
 RUN set -euo pipefail; chmod +x /usr/local/bin/docker-entrypoint.sh; \
     sed -i -e 's/exec gosu postgres "/exec setpriv --reuid=postgres --regid=postgres --clear-groups -- "/g' /usr/local/bin/docker-entrypoint.sh; \

_service

@@ -1,16 +1,10 @@
 <services>
   <service mode="buildtime" name="docker_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service mode="buildtime" name="replace_using_package_version">
+  <service name="replace_using_package_version" mode="buildtime">
     <param name="file">Dockerfile</param>
-    <param name="regex">%%pg_minor_version%%</param>
+    <param name="regex">%%pg_version%%</param>
     <param name="package">postgresql12-server</param>
     <param name="parse-version">minor</param>
   </service>
-  <service mode="buildtime" name="replace_using_package_version">
-    <param name="file">Dockerfile</param>
-    <param name="regex">%%pg_patch_version%%</param>
-    <param name="package">postgresql12-server</param>
-    <param name="parse-version">patch</param>
-  </service>
 </services>

postgres-12-image.changes

@@ -1,68 +1,3 @@
--------------------------------------------------------------------
-Tue Dec  3 13:26:37 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
-
-- Change attribute order in _service
-
--------------------------------------------------------------------
-Thu Nov 14 17:06:30 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
-
-- switch to multistage build
-
--------------------------------------------------------------------
-Wed Oct 30 18:28:27 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
-
-- be explicit in protocol for expose statement
-
--------------------------------------------------------------------
-Wed Oct 30 15:34:45 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
-
-- remove nonsensical org.opencontainers.image.authors - duplication of .vendor
-
--------------------------------------------------------------------
-Tue Oct 29 15:23:20 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
-
-- drop tag_version-%RELEASE%
-
--------------------------------------------------------------------
-Mon Oct 14 11:26:26 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
-
-- make the version-%release tag the first one listed; remove duplicates where they existed; update image.ref/reference to point to the version-%release(-) tag
-
--------------------------------------------------------------------
-Fri Oct 11 15:12:52 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
-
-- make the tag with -%RELEASE% the first tag listed
-
--------------------------------------------------------------------
-Wed Sep 25 17:36:16 UTC 2024 - Dirk Mueller <dmueller@suse.com>
-
-- rerender installation step in multiple lines, allow uninstalling optional packages
-
--------------------------------------------------------------------
-Wed Sep 25 17:12:11 UTC 2024 - Dirk Mueller <dmueller@suse.com>
-
-- improved log cleaning
-
--------------------------------------------------------------------
-Wed Sep 25 10:02:07 UTC 2024 - Dirk Mueller <dmueller@suse.com>
-
-- install libpq5 to avoid have-choice errors
-
--------------------------------------------------------------------
-Tue Sep 24 20:00:32 UTC 2024 - Dirk Mueller <dmueller@suse.com>
-
-- remove release tags for additional_versions
-
--------------------------------------------------------------------
-Thu Sep 12 10:37:22 UTC 2024 - Dirk Mueller <dmueller@suse.com>
-
-- set useobsrepositories explicitly
-
--------------------------------------------------------------------
-Mon Sep  9 07:25:11 UTC 2024 - Dirk Mueller <dmueller@suse.com>
-
-- set full version on labels and tags
-
 -------------------------------------------------------------------
 Fri Aug 16 07:07:46 UTC 2024 - Dirk Mueller <dmueller@suse.com>