Merge ISO and OS container images

This commit unifies OS container and ISO container images at OBS level. This way the two are stick together and we need to handle less submissions. Also, as a consequence, both release numbers are likely to be aligned with this setup. Signed-off-by: David Cassany <[email protected]>
rancher · Nov 5, 2024 · 2cef6d9 · 2cef6d9
1 parent 5a463a7
commit 2cef6d9
Show file tree

Hide file tree

Showing 33 changed files with 95 additions and 104 deletions.
diff --git a/.obs/dockerfile/SL-Micro-baremetal-container/Dockerfile b/.obs/dockerfile/SL-Micro-baremetal-container/Dockerfile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 # Define the names/tags of the container
-#!BuildName: SL-Micro-container
+#!BuildName: SL-Micro-baremetal-container
 #!BuildTag: suse/sl-micro/%%SLMICRO_VERSION%%/baremetal-os-container:latest
 #!BuildTag: suse/sl-micro/%%SLMICRO_VERSION%%/baremetal-os-container:%VERSION%
 #!BuildTag: suse/sl-micro/%%SLMICRO_VERSION%%/baremetal-os-container:%VERSION%-%RELEASE%

diff --git a/...ile/build-baremetal-disk-image/Dockerfile → ...Micro-baremetal-container/Dockerfile.disk b/...ile/build-baremetal-disk-image/Dockerfile → ...Micro-baremetal-container/Dockerfile.disk
diff --git a/...file/build-baremetal-iso-image/Dockerfile → ...-Micro-baremetal-container/Dockerfile.iso b/...file/build-baremetal-iso-image/Dockerfile → ...-Micro-baremetal-container/Dockerfile.iso
diff --git a/.obs/dockerfile/SL-Micro-baremetal-container/_multibuild b/.obs/dockerfile/SL-Micro-baremetal-container/_multibuild
@@ -0,0 +1,4 @@
+<multibuild>
+  <flavor>iso</flavor>
+  <flavor>disk</flavor>
+</multibuild>
diff --git a/.obs/dockerfile/SL-Micro-baremetal-container/_service b/.obs/dockerfile/SL-Micro-baremetal-container/_service
@@ -11,4 +11,24 @@
     <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
     <param name="var">IMG_REPO</param>
   </service>
+  <service name="replace_using_env" mode="buildtime">
+    <param name="file">Dockerfile.iso</param>
+    <param name="eval">SLMICRO_VERSION=$(rpm --macros=/root/.rpmmacros -E %slmicro_version)</param>
+    <param name="var">SLMICRO_VERSION</param>
+  </service>
+  <service name="replace_using_env" mode="buildtime">
+    <param name="file">Dockerfile.iso</param>
+    <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
+    <param name="var">IMG_REPO</param>
+  </service>
+    <service name="replace_using_env" mode="buildtime">
+    <param name="file">Dockerfile.disk</param>
+    <param name="eval">SLMICRO_VERSION=$(rpm --macros=/root/.rpmmacros -E %slmicro_version)</param>
+    <param name="var">SLMICRO_VERSION</param>
+  </service>
+  <service name="replace_using_env" mode="buildtime">
+    <param name="file">Dockerfile.disk</param>
+    <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
+    <param name="var">IMG_REPO</param>
+  </service>
 </services>
diff --git a/...e/build-baremetal-iso-image/manifest.yaml → ...L-Micro-baremetal-container/manifest.yaml b/...e/build-baremetal-iso-image/manifest.yaml → ...L-Micro-baremetal-container/manifest.yaml
diff --git a/...ockerfile/build-base-iso-image/Dockerfile → ...le/SL-Micro-base-container/Dockerfile.iso b/...ockerfile/build-base-iso-image/Dockerfile → ...le/SL-Micro-base-container/Dockerfile.iso
@@ -10,7 +10,7 @@
 ARG SLMICRO_VERSION
 
 FROM suse/sl-micro/${SLMICRO_VERSION}/base-os-container:latest AS os
-FROM suse/sl-micro/${SLMICRO_VERSION}/baremetal-os-container:latest AS builder
+FROM suse/sl-micro/${SLMICRO_VERSION}/base-os-container:latest AS builder
 
 WORKDIR /iso
 

diff --git a/.obs/dockerfile/SL-Micro-base-container/_multibuild b/.obs/dockerfile/SL-Micro-base-container/_multibuild
@@ -0,0 +1,3 @@
+<multibuild>
+  <flavor>iso</flavor>
+</multibuild>
diff --git a/.obs/dockerfile/SL-Micro-base-container/_service b/.obs/dockerfile/SL-Micro-base-container/_service
@@ -11,4 +11,14 @@
     <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
     <param name="var">IMG_REPO</param>
   </service>
+  <service name="replace_using_env" mode="buildtime">
+    <param name="file">Dockerfile.iso</param>
+    <param name="eval">SLMICRO_VERSION=$(rpm --macros=/root/.rpmmacros -E %slmicro_version)</param>
+    <param name="var">SLMICRO_VERSION</param>
+  </service>
+  <service name="replace_using_env" mode="buildtime">
+    <param name="file">Dockerfile.iso</param>
+    <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
+    <param name="var">IMG_REPO</param>
+  </service>
 </services>
diff --git a/...erfile/build-base-iso-image/manifest.yaml → ...ile/SL-Micro-base-container/manifest.yaml b/...erfile/build-base-iso-image/manifest.yaml → ...ile/SL-Micro-base-container/manifest.yaml
diff --git a/...le/build-k3s-selinux-iso-image/Dockerfile → ...icro-k3s-selinux-container/Dockerfile.iso b/...le/build-k3s-selinux-iso-image/Dockerfile → ...icro-k3s-selinux-container/Dockerfile.iso
@@ -10,7 +10,7 @@
 ARG SLMICRO_VERSION
 
 FROM suse/sl-micro/${SLMICRO_VERSION}/k3s-selinux-os-container:latest AS os
-FROM suse/sl-micro/${SLMICRO_VERSION}/baremetal-os-container:latest AS builder
+FROM suse/sl-micro/${SLMICRO_VERSION}/k3s-selinux-os-container:latest AS builder
 
 WORKDIR /iso
 

diff --git a/.obs/dockerfile/SL-Micro-k3s-selinux-container/_multibuild b/.obs/dockerfile/SL-Micro-k3s-selinux-container/_multibuild
@@ -0,0 +1,3 @@
+<multibuild>
+  <flavor>iso</flavor>
+</multibuild>
diff --git a/.obs/dockerfile/SL-Micro-k3s-selinux-container/_service b/.obs/dockerfile/SL-Micro-k3s-selinux-container/_service
@@ -11,4 +11,14 @@
     <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
     <param name="var">IMG_REPO</param>
   </service>
+    <service name="replace_using_env" mode="buildtime">
+    <param name="file">Dockerfile.iso</param>
+    <param name="eval">SLMICRO_VERSION=$(rpm --macros=/root/.rpmmacros -E %slmicro_version)</param>
+    <param name="var">SLMICRO_VERSION</param>
+  </service>
+  <service name="replace_using_env" mode="buildtime">
+    <param name="file">Dockerfile.iso</param>
+    <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
+    <param name="var">IMG_REPO</param>
+  </service>
 </services>
diff --git a/...build-k3s-selinux-iso-image/manifest.yaml → ...Micro-k3s-selinux-container/manifest.yaml b/...build-k3s-selinux-iso-image/manifest.yaml → ...Micro-k3s-selinux-container/manifest.yaml
diff --git a/...dockerfile/build-kvm-iso-image/Dockerfile → ...ile/SL-Micro-kvm-container/Dockerfile.iso b/...dockerfile/build-kvm-iso-image/Dockerfile → ...ile/SL-Micro-kvm-container/Dockerfile.iso
@@ -10,7 +10,7 @@
 ARG SLMICRO_VERSION
 
 FROM suse/sl-micro/${SLMICRO_VERSION}/kvm-os-container:latest AS os
-FROM suse/sl-micro/${SLMICRO_VERSION}/baremetal-os-container:latest AS builder
+FROM suse/sl-micro/${SLMICRO_VERSION}/kvm-os-container:latest AS builder
 
 WORKDIR /iso
 

diff --git a/.obs/dockerfile/SL-Micro-kvm-container/_multibuild b/.obs/dockerfile/SL-Micro-kvm-container/_multibuild
@@ -0,0 +1,3 @@
+<multibuild>
+  <flavor>iso</flavor>
+</multibuild>
diff --git a/.obs/dockerfile/SL-Micro-kvm-container/_service b/.obs/dockerfile/SL-Micro-kvm-container/_service
@@ -11,4 +11,14 @@
     <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
     <param name="var">IMG_REPO</param>
   </service>
+    <service name="replace_using_env" mode="buildtime">
+    <param name="file">Dockerfile.iso</param>
+    <param name="eval">SLMICRO_VERSION=$(rpm --macros=/root/.rpmmacros -E %slmicro_version)</param>
+    <param name="var">SLMICRO_VERSION</param>
+  </service>
+  <service name="replace_using_env" mode="buildtime">
+    <param name="file">Dockerfile.iso</param>
+    <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
+    <param name="var">IMG_REPO</param>
+  </service>
 </services>
diff --git a/...kerfile/build-kvm-iso-image/manifest.yaml → ...file/SL-Micro-kvm-container/manifest.yaml b/...kerfile/build-kvm-iso-image/manifest.yaml → ...file/SL-Micro-kvm-container/manifest.yaml
diff --git a/...e/build-rke2-selinux-iso-image/Dockerfile → ...cro-rke2-selinux-container/Dockerfile.iso b/...e/build-rke2-selinux-iso-image/Dockerfile → ...cro-rke2-selinux-container/Dockerfile.iso
@@ -10,7 +10,7 @@
 ARG SLMICRO_VERSION
 
 FROM suse/sl-micro/${SLMICRO_VERSION}/rke2-selinux-os-container:latest AS os
-FROM suse/sl-micro/${SLMICRO_VERSION}/baremetal-os-container:latest AS builder
+FROM suse/sl-micro/${SLMICRO_VERSION}/rke2-selinux-os-container:latest AS builder
 
 WORKDIR /iso
 

diff --git a/.obs/dockerfile/SL-Micro-rke2-selinux-container/_multibuild b/.obs/dockerfile/SL-Micro-rke2-selinux-container/_multibuild
@@ -0,0 +1,3 @@
+<multibuild>
+  <flavor>iso</flavor>
+</multibuild>
diff --git a/.obs/dockerfile/SL-Micro-rke2-selinux-container/_service b/.obs/dockerfile/SL-Micro-rke2-selinux-container/_service
@@ -11,4 +11,14 @@
     <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
     <param name="var">IMG_REPO</param>
   </service>
+  <service name="replace_using_env" mode="buildtime">
+    <param name="file">Dockerfile.iso</param>
+    <param name="eval">SLMICRO_VERSION=$(rpm --macros=/root/.rpmmacros -E %slmicro_version)</param>
+    <param name="var">SLMICRO_VERSION</param>
+  </service>
+  <service name="replace_using_env" mode="buildtime">
+    <param name="file">Dockerfile.iso</param>
+    <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
+    <param name="var">IMG_REPO</param>
+  </service>
 </services>
diff --git a/...uild-rke2-selinux-iso-image/manifest.yaml → ...icro-rke2-selinux-container/manifest.yaml b/...uild-rke2-selinux-iso-image/manifest.yaml → ...icro-rke2-selinux-container/manifest.yaml
diff --git a/.../dockerfile/build-rt-iso-image/Dockerfile → ...file/SL-Micro-rt-container/Dockerfile.iso b/.../dockerfile/build-rt-iso-image/Dockerfile → ...file/SL-Micro-rt-container/Dockerfile.iso
@@ -11,7 +11,7 @@
 ARG SLMICRO_VERSION
 
 FROM suse/sl-micro/${SLMICRO_VERSION}/rt-os-container:latest AS os
-FROM suse/sl-micro/${SLMICRO_VERSION}/baremetal-os-container:latest AS builder
+FROM suse/sl-micro/${SLMICRO_VERSION}/rt-os-container:latest AS builder
 
 WORKDIR /iso
 

diff --git a/.obs/dockerfile/SL-Micro-rt-container/_multibuild b/.obs/dockerfile/SL-Micro-rt-container/_multibuild
@@ -0,0 +1,3 @@
+<multibuild>
+  <flavor>iso</flavor>
+</multibuild>
diff --git a/.obs/dockerfile/SL-Micro-rt-container/_service b/.obs/dockerfile/SL-Micro-rt-container/_service
@@ -11,4 +11,14 @@
     <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
     <param name="var">IMG_REPO</param>
   </service>
+  <service name="replace_using_env" mode="buildtime">
+    <param name="file">Dockerfile.iso</param>
+    <param name="eval">SLMICRO_VERSION=$(rpm --macros=/root/.rpmmacros -E %slmicro_version)</param>
+    <param name="var">SLMICRO_VERSION</param>
+  </service>
+  <service name="replace_using_env" mode="buildtime">
+    <param name="file">Dockerfile.iso</param>
+    <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
+    <param name="var">IMG_REPO</param>
+  </service>
 </services>
diff --git a/...ckerfile/build-rt-iso-image/manifest.yaml → ...rfile/SL-Micro-rt-container/manifest.yaml b/...ckerfile/build-rt-iso-image/manifest.yaml → ...rfile/SL-Micro-rt-container/manifest.yaml
diff --git a/.obs/dockerfile/build-baremetal-disk-image/_service b/.obs/dockerfile/build-baremetal-disk-image/_service
diff --git a/.obs/dockerfile/build-baremetal-iso-image/_service b/.obs/dockerfile/build-baremetal-iso-image/_service
diff --git a/.obs/dockerfile/build-base-iso-image/_service b/.obs/dockerfile/build-base-iso-image/_service
diff --git a/.obs/dockerfile/build-k3s-selinux-iso-image/_service b/.obs/dockerfile/build-k3s-selinux-iso-image/_service
diff --git a/.obs/dockerfile/build-kvm-iso-image/_service b/.obs/dockerfile/build-kvm-iso-image/_service
diff --git a/.obs/dockerfile/build-rke2-selinux-iso-image/_service b/.obs/dockerfile/build-rke2-selinux-iso-image/_service
diff --git a/.obs/dockerfile/build-rt-iso-image/_service b/.obs/dockerfile/build-rt-iso-image/_service