Merge pull request #2051 from SUSE/for-deploy-7

🤖: Update build recipes for SP7
SUSE · Nov 25, 2024 · 86e3141 · 86e3141
2 parents e223e7a + 870912c
commit 86e3141
Show file tree

Hide file tree

Showing 12 changed files with 63 additions and 14 deletions.
diff --git a/cosign-image/Dockerfile b/cosign-image/Dockerfile
@@ -29,6 +29,10 @@ RUN set -euo pipefail; \
     zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends cosign suse-build-key; \
     zypper -n clean; \
     rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2}
+# sanity check that the version from the tag is equal to the version of cosign that we expect
+RUN set -euo pipefail; \
+    [ "$(rpm --root /target -q --qf '%{version}' cosign | \
+    cut -d '.' -f -2)" = "2.4" ]
 FROM bci/bci-micro:15.7
 COPY --from=builder /target /
 # Define labels according to https://en.opensuse.org/Building_derived_containers

diff --git a/cosign-image/cosign-image.changes b/cosign-image/cosign-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Nov 25 11:54:33 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- Add line breaks into package version check
+
 -------------------------------------------------------------------
 Sun Nov 24 08:01:22 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
 

diff --git a/kiwi-image/Dockerfile b/kiwi-image/Dockerfile
@@ -49,4 +49,6 @@ LABEL com.suse.release-stage="beta"
 LABEL io.artifacthub.package.readme-url="%SOURCEURL%/README.md"
 LABEL usage="This container requires an openSUSE/SUSE host kernel for full functionality."
 # sanity check that the version from the tag is equal to the version of python3-kiwi that we expect
-RUN set -euo pipefail; [ "$(rpm -q --qf '%{version}' python3-kiwi | cut -d '.' -f -2)" = "9.24" ]
+RUN set -euo pipefail; \
+    [ "$(rpm -q --qf '%{version}' python3-kiwi | \
+    cut -d '.' -f -2)" = "9.24" ]
diff --git a/kiwi-image/kiwi-image.changes b/kiwi-image/kiwi-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Nov 25 11:54:33 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- Add line breaks into package version check
+
 -------------------------------------------------------------------
 Wed Oct 30 15:35:27 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
 

diff --git a/nginx-image/Dockerfile b/nginx-image/Dockerfile
@@ -49,7 +49,9 @@ ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
 CMD ["nginx", "-g", "daemon off;"]
 EXPOSE 80/tcp
 # sanity check that the version from the tag is equal to the version of nginx that we expect
-RUN set -euo pipefail; [ "$(rpm -q --qf '%{version}' nginx | cut -d '.' -f -2)" = "1.21" ]
+RUN set -euo pipefail; \
+    [ "$(rpm -q --qf '%{version}' nginx | \
+    cut -d '.' -f -2)" = "1.21" ]
 RUN set -euo pipefail; mkdir /docker-entrypoint.d
 COPY [1-3]0-*.sh /docker-entrypoint.d/
 COPY docker-entrypoint.sh /usr/local/bin

diff --git a/nginx-image/nginx-image.changes b/nginx-image/nginx-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Nov 25 11:54:33 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- Add line breaks into package version check
+
 -------------------------------------------------------------------
 Thu Oct 31 16:12:00 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
 

diff --git a/rmt-mariadb-client-image/Dockerfile b/rmt-mariadb-client-image/Dockerfile
@@ -23,13 +23,20 @@
 #!BuildTag: suse/mariadb-client:10.11
 #!BuildName: suse-rmt-mariadb-client-10.11
 #!BuildVersion: 15.7.10.11
-FROM suse/sle15:15.7
+FROM bci/bci-micro:15.7 AS target
+FROM suse/sle15:15.7 AS builder
+COPY --from=target / /target
 
 RUN set -euo pipefail; \
-    zypper -n install --no-recommends mariadb-client; \
+    zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends mariadb-client; \
     zypper -n clean; \
     rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2}
-
+# sanity check that the version from the tag is equal to the version of mariadb-client that we expect
+RUN set -euo pipefail; \
+    [ "$(rpm --root /target -q --qf '%{version}' mariadb-client | \
+    cut -d '.' -f -2)" = "10.11" ]
+FROM bci/bci-micro:15.7
+COPY --from=builder /target /
 # Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=com.suse.application.rmt-mariadb-client
 LABEL org.opencontainers.image.authors="https://github.com/SUSE/bci/discussions"
@@ -50,5 +57,3 @@ LABEL com.suse.release-stage="beta"
 # endlabelprefix
 LABEL io.artifacthub.package.readme-url="%SOURCEURL%/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)" = "10.11" ]
diff --git a/rmt-mariadb-client-image/rmt-mariadb-client-image.changes b/rmt-mariadb-client-image/rmt-mariadb-client-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Nov 25 11:54:57 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- Switch to a multistage build and base the final image on micro
+
 -------------------------------------------------------------------
 Wed Oct 30 15:35:27 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
 

diff --git a/rmt-mariadb-image/Dockerfile b/rmt-mariadb-image/Dockerfile
@@ -23,13 +23,20 @@
 #!BuildTag: suse/mariadb:10.11
 #!BuildName: suse-rmt-mariadb-10.11
 #!BuildVersion: 15.7.10.11
-FROM suse/sle15:15.7
+FROM bci/bci-micro:15.7 AS target
+FROM suse/sle15:15.7 AS builder
+COPY --from=target / /target
 
 RUN set -euo pipefail; \
-    zypper -n install --no-recommends mariadb mariadb-tools gawk timezone util-linux findutils zstd; \
+    zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends coreutils findutils gawk mariadb mariadb-tools openssl sed timezone util-linux zstd; \
     zypper -n clean; \
     rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2}
-
+# sanity check that the version from the tag is equal to the version of mariadb that we expect
+RUN set -euo pipefail; \
+    [ "$(rpm --root /target -q --qf '%{version}' mariadb | \
+    cut -d '.' -f -2)" = "10.11" ]
+FROM bci/bci-micro:15.7
+COPY --from=builder /target /
 # Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=com.suse.application.rmt-mariadb
 LABEL org.opencontainers.image.authors="https://github.com/SUSE/bci/discussions"
@@ -52,9 +59,6 @@ LABEL io.artifacthub.package.readme-url="%SOURCEURL%/README.md"
 ENTRYPOINT ["docker-entrypoint.sh"]
 CMD ["mariadbd"]
 EXPOSE 3306/tcp
-# 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)" = "10.11" ]
-
 RUN set -euo pipefail; mkdir /docker-entrypoint-initdb.d
 
 # docker-entrypoint from https://github.com/MariaDB/mariadb-docker.git

diff --git a/rmt-mariadb-image/rmt-mariadb-image.changes b/rmt-mariadb-image/rmt-mariadb-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Nov 25 11:54:57 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- Switch to a multistage build and base the final image on micro
+
 -------------------------------------------------------------------
 Tue Nov 12 15:32:53 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
 

diff --git a/spack-image/Dockerfile b/spack-image/Dockerfile
@@ -68,7 +68,9 @@ RUN set -euo pipefail; mkdir -p /root/.spack \
     && rm -rf /root/*.* /run/nologin
 
 # sanity check that the version from the tag is equal to the version of spack that we expect
-RUN set -euo pipefail; [ "$(rpm -q --qf '%{version}' spack | cut -d '.' -f -3)" = "0.21.3" ]
+RUN set -euo pipefail; \
+    [ "$(rpm -q --qf '%{version}' spack | \
+    cut -d '.' -f -3)" = "0.21.3" ]
 
 WORKDIR /root
 SHELL ["docker-shell"]
diff --git a/spack-image/spack-image.changes b/spack-image/spack-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Nov 25 11:54:33 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- Add line breaks into package version check
+
 -------------------------------------------------------------------
 Mon Nov 11 11:50:47 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>