Merge pull request #2130 from SUSE/for-deploy-6

🤖: Update build recipes for SP6

Author: dirkmueller

helm-image/Dockerfile

@@ -0,0 +1,62 @@
+# SPDX-License-Identifier: Apache-2.0
+
+#     Copyright (c) 2024 SUSE LLC
+
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon.
+
+# The content of THIS FILE IS AUTOGENERATED and should not be manually modified.
+# It is maintained by the BCI team and generated by
+# https://github.com/SUSE/BCI-dockerfile-generator
+
+# 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: suse/helm:%%helm_version%%-%RELEASE%
+#!BuildTag: suse/helm:%%helm_version%%
+#!BuildTag: suse/helm:3.16
+#!BuildTag: suse/helm:3
+#!BuildTag: suse/helm:latest
+#!BuildName: suse-helm-3.16
+#!BuildVersion: 15.6.3.16
+#!BuildRelease: 35
+FROM registry.suse.com/bci/bci-micro:15.6 AS target
+FROM suse/sle15:15.6 AS builder
+COPY --from=target / /target
+
+RUN set -euo pipefail; \
+    zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends ca-certificates-mozilla helm; \
+    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 helm that we expect
+RUN set -euo pipefail; \
+    [ "$(rpm --root /target -q --qf '%{version}' helm | \
+    cut -d '.' -f -2)" = "3.16" ]
+FROM registry.suse.com/bci/bci-micro:15.6
+COPY --from=builder /target /
+# Define labels according to https://en.opensuse.org/Building_derived_containers
+# labelprefix=com.suse.application.helm
+LABEL org.opencontainers.image.authors="https://github.com/SUSE/bci/discussions"
+LABEL org.opencontainers.image.title="SLE Kubernetes Package Manager"
+LABEL org.opencontainers.image.description="Kubernetes Package Manager container based on the SLE Base Container Image."
+LABEL org.opencontainers.image.version="%%helm_version%%"
+LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container-images/"
+LABEL org.opencontainers.image.created="%BUILDTIME%"
+LABEL org.opencontainers.image.vendor="SUSE LLC"
+LABEL org.opencontainers.image.source="%SOURCEURL%"
+LABEL org.opencontainers.image.ref.name="%%helm_version%%-%RELEASE%"
+LABEL org.opensuse.reference="registry.suse.com/suse/helm:%%helm_version%%-%RELEASE%"
+LABEL org.openbuildservice.disturl="%DISTURL%"
+LABEL com.suse.supportlevel="l3"
+LABEL com.suse.eula="sle-eula"
+LABEL com.suse.lifecycle-url="https://www.suse.com/lifecycle#suse-linux-enterprise-server-15"
+LABEL com.suse.release-stage="released"
+# endlabelprefix
+LABEL org.opencontainers.image.base.name="%BASE_REFNAME%"
+LABEL org.opencontainers.image.base.digest="%BASE_DIGEST%"
+LABEL io.artifacthub.package.readme-url="%SOURCEURL%/README.md"
+ENTRYPOINT ["/usr/bin/helm"]
+CMD ["help"]

helm-image/_service

@@ -1,4 +1,10 @@
 <services>
-  <service mode="buildtime" name="kiwi_label_helper"/>
+  <service mode="buildtime" name="docker_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
+  <service mode="buildtime" name="replace_using_package_version">
+    <param name="file">Dockerfile</param>
+    <param name="regex">%%helm_version%%</param>
+    <param name="package">helm</param>
+    <param name="parse-version">patch</param>
+  </service>
 </services>

helm-image/config.sh

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Dec  9 20:59:07 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- switch to multibuild and add a version check at build time to avoid releasing incorrectly tagged containers
+
 -------------------------------------------------------------------
 Mon Dec  9 12:05:35 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>