Skip to content

Commit 2cef6d9

Browse files
davidcassanydavidcassany
committed
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 <dcassany@suse.com>
1 parent 5a463a7 commit 2cef6d9

File tree

33 files changed

+95
-104
lines changed

33 files changed

+95
-104
lines changed

‎.obs/dockerfile/SL-Micro-baremetal-container/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# SPDX-License-Identifier: Apache-2.0
22
# Define the names/tags of the container
3-
#!BuildName: SL-Micro-container
3+
#!BuildName: SL-Micro-baremetal-container
44
#!BuildTag: suse/sl-micro/%%SLMICRO_VERSION%%/baremetal-os-container:latest
55
#!BuildTag: suse/sl-micro/%%SLMICRO_VERSION%%/baremetal-os-container:%VERSION%
66
#!BuildTag: suse/sl-micro/%%SLMICRO_VERSION%%/baremetal-os-container:%VERSION%-%RELEASE%

‎.obs/dockerfile/build-baremetal-disk-image/Dockerfile ‎.obs/dockerfile/SL-Micro-baremetal-container/Dockerfile.disk

File renamed without changes.

‎.obs/dockerfile/build-baremetal-iso-image/Dockerfile ‎.obs/dockerfile/SL-Micro-baremetal-container/Dockerfile.iso

File renamed without changes.

‎.obs/dockerfile/SL-Micro-baremetal-container/_multibuild

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<multibuild>
2+
<flavor>iso</flavor>
3+
<flavor>disk</flavor>
4+
</multibuild>

‎.obs/dockerfile/SL-Micro-baremetal-container/_service

+20
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,24 @@
1111
<param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
1212
<param name="var">IMG_REPO</param>
1313
</service>
14+
<service name="replace_using_env" mode="buildtime">
15+
<param name="file">Dockerfile.iso</param>
16+
<param name="eval">SLMICRO_VERSION=$(rpm --macros=/root/.rpmmacros -E %slmicro_version)</param>
17+
<param name="var">SLMICRO_VERSION</param>
18+
</service>
19+
<service name="replace_using_env" mode="buildtime">
20+
<param name="file">Dockerfile.iso</param>
21+
<param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
22+
<param name="var">IMG_REPO</param>
23+
</service>
24+
<service name="replace_using_env" mode="buildtime">
25+
<param name="file">Dockerfile.disk</param>
26+
<param name="eval">SLMICRO_VERSION=$(rpm --macros=/root/.rpmmacros -E %slmicro_version)</param>
27+
<param name="var">SLMICRO_VERSION</param>
28+
</service>
29+
<service name="replace_using_env" mode="buildtime">
30+
<param name="file">Dockerfile.disk</param>
31+
<param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
32+
<param name="var">IMG_REPO</param>
33+
</service>
1434
</services>

‎.obs/dockerfile/build-baremetal-iso-image/manifest.yaml ‎.obs/dockerfile/SL-Micro-baremetal-container/manifest.yaml

File renamed without changes.

‎.obs/dockerfile/build-base-iso-image/Dockerfile ‎.obs/dockerfile/SL-Micro-base-container/Dockerfile.iso

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
ARG SLMICRO_VERSION
1111

1212
FROM suse/sl-micro/${SLMICRO_VERSION}/base-os-container:latest AS os
13-
FROM suse/sl-micro/${SLMICRO_VERSION}/baremetal-os-container:latest AS builder
13+
FROM suse/sl-micro/${SLMICRO_VERSION}/base-os-container:latest AS builder
1414

1515
WORKDIR /iso
1616

‎.obs/dockerfile/SL-Micro-base-container/_multibuild

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<multibuild>
2+
<flavor>iso</flavor>
3+
</multibuild>

‎.obs/dockerfile/SL-Micro-base-container/_service

+10
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,14 @@
1111
<param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
1212
<param name="var">IMG_REPO</param>
1313
</service>
14+
<service name="replace_using_env" mode="buildtime">
15+
<param name="file">Dockerfile.iso</param>
16+
<param name="eval">SLMICRO_VERSION=$(rpm --macros=/root/.rpmmacros -E %slmicro_version)</param>
17+
<param name="var">SLMICRO_VERSION</param>
18+
</service>
19+
<service name="replace_using_env" mode="buildtime">
20+
<param name="file">Dockerfile.iso</param>
21+
<param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
22+
<param name="var">IMG_REPO</param>
23+
</service>
1424
</services>

‎.obs/dockerfile/build-base-iso-image/manifest.yaml ‎.obs/dockerfile/SL-Micro-base-container/manifest.yaml

File renamed without changes.

‎.obs/dockerfile/build-k3s-selinux-iso-image/Dockerfile ‎.obs/dockerfile/SL-Micro-k3s-selinux-container/Dockerfile.iso

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
ARG SLMICRO_VERSION
1111

1212
FROM suse/sl-micro/${SLMICRO_VERSION}/k3s-selinux-os-container:latest AS os
13-
FROM suse/sl-micro/${SLMICRO_VERSION}/baremetal-os-container:latest AS builder
13+
FROM suse/sl-micro/${SLMICRO_VERSION}/k3s-selinux-os-container:latest AS builder
1414

1515
WORKDIR /iso
1616

‎.obs/dockerfile/SL-Micro-k3s-selinux-container/_multibuild

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<multibuild>
2+
<flavor>iso</flavor>
3+
</multibuild>

‎.obs/dockerfile/SL-Micro-k3s-selinux-container/_service

+10
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,14 @@
1111
<param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
1212
<param name="var">IMG_REPO</param>
1313
</service>
14+
<service name="replace_using_env" mode="buildtime">
15+
<param name="file">Dockerfile.iso</param>
16+
<param name="eval">SLMICRO_VERSION=$(rpm --macros=/root/.rpmmacros -E %slmicro_version)</param>
17+
<param name="var">SLMICRO_VERSION</param>
18+
</service>
19+
<service name="replace_using_env" mode="buildtime">
20+
<param name="file">Dockerfile.iso</param>
21+
<param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
22+
<param name="var">IMG_REPO</param>
23+
</service>
1424
</services>

‎.obs/dockerfile/build-k3s-selinux-iso-image/manifest.yaml ‎.obs/dockerfile/SL-Micro-k3s-selinux-container/manifest.yaml

File renamed without changes.

‎.obs/dockerfile/build-kvm-iso-image/Dockerfile ‎.obs/dockerfile/SL-Micro-kvm-container/Dockerfile.iso

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
ARG SLMICRO_VERSION
1111

1212
FROM suse/sl-micro/${SLMICRO_VERSION}/kvm-os-container:latest AS os
13-
FROM suse/sl-micro/${SLMICRO_VERSION}/baremetal-os-container:latest AS builder
13+
FROM suse/sl-micro/${SLMICRO_VERSION}/kvm-os-container:latest AS builder
1414

1515
WORKDIR /iso
1616

‎.obs/dockerfile/SL-Micro-kvm-container/_multibuild

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<multibuild>
2+
<flavor>iso</flavor>
3+
</multibuild>

‎.obs/dockerfile/SL-Micro-kvm-container/_service

+10
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,14 @@
1111
<param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
1212
<param name="var">IMG_REPO</param>
1313
</service>
14+
<service name="replace_using_env" mode="buildtime">
15+
<param name="file">Dockerfile.iso</param>
16+
<param name="eval">SLMICRO_VERSION=$(rpm --macros=/root/.rpmmacros -E %slmicro_version)</param>
17+
<param name="var">SLMICRO_VERSION</param>
18+
</service>
19+
<service name="replace_using_env" mode="buildtime">
20+
<param name="file">Dockerfile.iso</param>
21+
<param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
22+
<param name="var">IMG_REPO</param>
23+
</service>
1424
</services>

‎.obs/dockerfile/build-kvm-iso-image/manifest.yaml ‎.obs/dockerfile/SL-Micro-kvm-container/manifest.yaml

File renamed without changes.

‎.obs/dockerfile/build-rke2-selinux-iso-image/Dockerfile ‎.obs/dockerfile/SL-Micro-rke2-selinux-container/Dockerfile.iso

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
ARG SLMICRO_VERSION
1111

1212
FROM suse/sl-micro/${SLMICRO_VERSION}/rke2-selinux-os-container:latest AS os
13-
FROM suse/sl-micro/${SLMICRO_VERSION}/baremetal-os-container:latest AS builder
13+
FROM suse/sl-micro/${SLMICRO_VERSION}/rke2-selinux-os-container:latest AS builder
1414

1515
WORKDIR /iso
1616

‎.obs/dockerfile/SL-Micro-rke2-selinux-container/_multibuild

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<multibuild>
2+
<flavor>iso</flavor>
3+
</multibuild>

‎.obs/dockerfile/SL-Micro-rke2-selinux-container/_service

+10
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,14 @@
1111
<param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
1212
<param name="var">IMG_REPO</param>
1313
</service>
14+
<service name="replace_using_env" mode="buildtime">
15+
<param name="file">Dockerfile.iso</param>
16+
<param name="eval">SLMICRO_VERSION=$(rpm --macros=/root/.rpmmacros -E %slmicro_version)</param>
17+
<param name="var">SLMICRO_VERSION</param>
18+
</service>
19+
<service name="replace_using_env" mode="buildtime">
20+
<param name="file">Dockerfile.iso</param>
21+
<param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
22+
<param name="var">IMG_REPO</param>
23+
</service>
1424
</services>

‎.obs/dockerfile/build-rke2-selinux-iso-image/manifest.yaml ‎.obs/dockerfile/SL-Micro-rke2-selinux-container/manifest.yaml

File renamed without changes.

‎.obs/dockerfile/build-rt-iso-image/Dockerfile ‎.obs/dockerfile/SL-Micro-rt-container/Dockerfile.iso

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
ARG SLMICRO_VERSION
1212

1313
FROM suse/sl-micro/${SLMICRO_VERSION}/rt-os-container:latest AS os
14-
FROM suse/sl-micro/${SLMICRO_VERSION}/baremetal-os-container:latest AS builder
14+
FROM suse/sl-micro/${SLMICRO_VERSION}/rt-os-container:latest AS builder
1515

1616
WORKDIR /iso
1717

‎.obs/dockerfile/SL-Micro-rt-container/_multibuild

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<multibuild>
2+
<flavor>iso</flavor>
3+
</multibuild>

‎.obs/dockerfile/SL-Micro-rt-container/_service

+10
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,14 @@
1111
<param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
1212
<param name="var">IMG_REPO</param>
1313
</service>
14+
<service name="replace_using_env" mode="buildtime">
15+
<param name="file">Dockerfile.iso</param>
16+
<param name="eval">SLMICRO_VERSION=$(rpm --macros=/root/.rpmmacros -E %slmicro_version)</param>
17+
<param name="var">SLMICRO_VERSION</param>
18+
</service>
19+
<service name="replace_using_env" mode="buildtime">
20+
<param name="file">Dockerfile.iso</param>
21+
<param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
22+
<param name="var">IMG_REPO</param>
23+
</service>
1424
</services>

‎.obs/dockerfile/build-rt-iso-image/manifest.yaml ‎.obs/dockerfile/SL-Micro-rt-container/manifest.yaml

File renamed without changes.

‎.obs/dockerfile/build-baremetal-disk-image/_service

-14
This file was deleted.

‎.obs/dockerfile/build-baremetal-iso-image/_service

-14
This file was deleted.

‎.obs/dockerfile/build-base-iso-image/_service

-14
This file was deleted.

‎.obs/dockerfile/build-k3s-selinux-iso-image/_service

-14
This file was deleted.

‎.obs/dockerfile/build-kvm-iso-image/_service

-14
This file was deleted.

‎.obs/dockerfile/build-rke2-selinux-iso-image/_service

-14
This file was deleted.

‎.obs/dockerfile/build-rt-iso-image/_service

-14
This file was deleted.

0 commit comments

Comments
 (0)