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

🤖: Update build recipes for SP6
SUSE · Oct 1, 2024 · 735bf75 · 735bf75
2 parents 6f42a81 + 0bf7f72
commit 735bf75
Show file tree

Hide file tree

Showing 14 changed files with 38 additions and 11 deletions.
diff --git a/distribution-image/distribution-image.changes b/distribution-image/distribution-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Oct  1 09:39:30 UTC 2024 - Dirk Mueller <[email protected]>
+
+- build against released containers, remove org.opencontainers.image.base for those which do not build against released containers
+
 -------------------------------------------------------------------
 Thu Sep 26 09:56:33 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/distribution-image/distribution-image.kiwi b/distribution-image/distribution-image.kiwi
@@ -24,7 +24,7 @@ You can contact the BCI team via https://github.com/SUSE/bci/discussions
     <specification>SLE OCI Container Registry (Distribution) Container Image</specification>
   </description>
   <preferences>
-    <type image="docker" derived_from="obsrepositories:/bci/bci-micro#15.6">
+    <type image="docker" derived_from="obs://SUSE:Registry/standard/bci/bci-micro#15.6">
       <containerconfig
           name="suse/registry"
           tag="%%registry_version%%"

diff --git a/git-image/git-image.changes b/git-image/git-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Oct  1 09:39:30 UTC 2024 - Dirk Mueller <[email protected]>
+
+- build against released containers, remove org.opencontainers.image.base for those which do not build against released containers
+
 -------------------------------------------------------------------
 Thu Sep 26 09:56:33 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/git-image/git-image.kiwi b/git-image/git-image.kiwi
@@ -24,7 +24,7 @@ You can contact the BCI team via https://github.com/SUSE/bci/discussions
     <specification>SLE 15 SP6 with Git Container Image</specification>
   </description>
   <preferences>
-    <type image="docker" derived_from="obsrepositories:/bci/bci-micro#15.6">
+    <type image="docker" derived_from="obs://SUSE:Registry/standard/bci/bci-micro#15.6">
       <containerconfig
           name="suse/git"
           tag="%%git_minor_version%%"

diff --git a/helm-image/helm-image.changes b/helm-image/helm-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Oct  1 09:39:30 UTC 2024 - Dirk Mueller <[email protected]>
+
+- build against released containers, remove org.opencontainers.image.base for those which do not build against released containers
+
 -------------------------------------------------------------------
 Thu Sep 26 09:56:33 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/helm-image/helm-image.kiwi b/helm-image/helm-image.kiwi
@@ -24,7 +24,7 @@ You can contact the BCI team via https://github.com/SUSE/bci/discussions
     <specification>SLE Kubernetes Package Manager Container Image</specification>
   </description>
   <preferences>
-    <type image="docker" derived_from="obsrepositories:/bci/bci-micro#15.6">
+    <type image="docker" derived_from="obs://SUSE:Registry/standard/bci/bci-micro#15.6">
       <containerconfig
           name="suse/helm"
           tag="3.13"

diff --git a/minimal-image/minimal-image.changes b/minimal-image/minimal-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Oct  1 09:39:30 UTC 2024 - Dirk Mueller <[email protected]>
+
+- build against released containers, remove org.opencontainers.image.base for those which do not build against released containers
+
 -------------------------------------------------------------------
 Thu Sep 26 09:56:33 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/minimal-image/minimal-image.kiwi b/minimal-image/minimal-image.kiwi
@@ -47,8 +47,6 @@ You can contact the BCI team via https://github.com/SUSE/bci/discussions
             <label name="com.suse.release-stage" value="released"/>
             <label name="com.suse.lifecycle-url" value="https://www.suse.com/lifecycle#suse-linux-enterprise-server-15"/>
           </suse_label_helper:add_prefix>
-          <label name="org.opencontainers.image.base.name" value="%BASE_REFNAME%"/>
-          <label name="org.opencontainers.image.base.digest" value="%BASE_DIGEST%"/>
           <label name="io.artifacthub.package.readme-url" value="%SOURCEURL%/README.md"/>
           <label name="io.artifacthub.package.logo-url" value="https://opensource.suse.com/bci/SLE_BCI_logomark_green.svg"/>
         </labels>

diff --git a/openjdk-21-devel-image/Dockerfile b/openjdk-21-devel-image/Dockerfile
@@ -45,8 +45,6 @@ LABEL com.suse.eula="sle-bci"
 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"
 ENV JAVA_BINDIR="/usr/lib64/jvm/java-21-openjdk-21/bin"
 ENV JAVA_HOME="/usr/lib64/jvm/java-21-openjdk-21"

diff --git a/openjdk-21-devel-image/openjdk-21-devel-image.changes b/openjdk-21-devel-image/openjdk-21-devel-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Oct  1 09:39:30 UTC 2024 - Dirk Mueller <[email protected]>
+
+- build against released containers, remove org.opencontainers.image.base for those which do not build against released containers
+
 -------------------------------------------------------------------
 Thu Sep 26 09:56:33 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/pcp-image/Dockerfile b/pcp-image/Dockerfile
@@ -48,8 +48,6 @@ 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/local/bin/container-entrypoint"]
 CMD ["/usr/lib/systemd/systemd"]

diff --git a/pcp-image/pcp-image.changes b/pcp-image/pcp-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Oct  1 09:39:30 UTC 2024 - Dirk Mueller <[email protected]>
+
+- build against released containers, remove org.opencontainers.image.base for those which do not build against released containers
+
 -------------------------------------------------------------------
 Thu Sep 26 09:56:33 UTC 2024 - Dirk Mueller <[email protected]>
 

diff --git a/sac-postfix-image/Dockerfile b/sac-postfix-image/Dockerfile
@@ -44,8 +44,6 @@ 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 ["/entrypoint/entrypoint.sh"]
 CMD ["postfix", "start-fg"]

diff --git a/sac-postfix-image/sac-postfix-image.changes b/sac-postfix-image/sac-postfix-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Oct  1 09:39:30 UTC 2024 - Dirk Mueller <[email protected]>
+
+- build against released containers, remove org.opencontainers.image.base for those which do not build against released containers
+
 -------------------------------------------------------------------
 Thu Sep 26 09:56:34 UTC 2024 - Dirk Mueller <[email protected]>