Merge ISO and OS container images #1611
Conversation
There was a problem hiding this comment.
This PR removes the following OBS packages:
- build-base-iso-image
- build-baremetal-iso-image
- build-baremetal-disk-image
- build-kvm-iso-image
- build-rt-iso-image
- build-k3s-selinux-iso-image
- build-rke2-selinuc-iso-image
And they are embedded in their SL-Micro-* counterpart.
| @@ -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 | |||
There was a problem hiding this comment.
Using the OS image as the builder itself simplifies the image cross dependencies, so the ISO only requires the OS container to build, so base ISO only requires base OS.
| <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"> |
There was a problem hiding this comment.
nit: we could consider adapting this replace_using_env OBS service to actually support globbing, so instead of requiring a new service call per file and per variable we could do something like the following (the * on the file name):
<service name="replace_using_env" mode="buildtime">
<param name="file">Dockerfile*</param>
<param name="eval">SLMICRO_VERSION=$(rpm --macros=/root/.rpmmacros -E %slmicro_version)</param>
<param name="var">SLMICRO_VERSION</param>
</service>| @@ -0,0 +1,4 @@ | |||
| <multibuild> | |||
| <flavor>iso</flavor> | |||
| <flavor>disk</flavor> | |||
There was a problem hiding this comment.
Note this same approach is also valid for disks
|
See test build in https://build.opensuse.org/project/show/home:dcassany:Devlinkstest |
|
I'm not sure about using the OS images |
I agree this is arguable, but with the current setup installing |
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]>
davidcassany
force-pushed
the
unify_iso_and_os_images
branch
from
9d3cc65
to
18305ff
Compare
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.