Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge ISO and OS container images #1611

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Merge ISO and OS container images #1611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .obs/dockerfile/SL-Micro-baremetal-container/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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%
Expand Down
0 ...ile/build-baremetal-disk-image/Dockerfile → ...Micro-baremetal-container/Dockerfile.disk
View file
Open in desktop
File renamed without changes.
0 ...file/build-baremetal-iso-image/Dockerfile → ...-Micro-baremetal-container/Dockerfile.iso
View file
Open in desktop
File renamed without changes.
4 changes: 4 additions & 0 deletions .obs/dockerfile/SL-Micro-baremetal-container/_multibuild
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<multibuild>
<flavor>iso</flavor>
<flavor>disk</flavor>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note this same approach is also valid for disks

</multibuild>
20 changes: 20 additions & 0 deletions .obs/dockerfile/SL-Micro-baremetal-container/_service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
0 ...e/build-baremetal-iso-image/manifest.yaml → ...L-Micro-baremetal-container/manifest.yaml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ockerfile/build-base-iso-image/Dockerfile → ...le/SL-Micro-base-container/Dockerfile.iso
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.


WORKDIR /iso

Expand Down
3 changes: 3 additions & 0 deletions .obs/dockerfile/SL-Micro-base-container/_multibuild
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<multibuild>
<flavor>iso</flavor>
</multibuild>
10 changes: 10 additions & 0 deletions .obs/dockerfile/SL-Micro-base-container/_service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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>

<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>
0 ...erfile/build-base-iso-image/manifest.yaml → ...ile/SL-Micro-base-container/manifest.yaml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...le/build-k3s-selinux-iso-image/Dockerfile → ...icro-k3s-selinux-container/Dockerfile.iso
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 3 additions & 0 deletions .obs/dockerfile/SL-Micro-k3s-selinux-container/_multibuild
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<multibuild>
<flavor>iso</flavor>
</multibuild>
10 changes: 10 additions & 0 deletions .obs/dockerfile/SL-Micro-k3s-selinux-container/_service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
0 ...build-k3s-selinux-iso-image/manifest.yaml → ...Micro-k3s-selinux-container/manifest.yaml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...dockerfile/build-kvm-iso-image/Dockerfile → ...ile/SL-Micro-kvm-container/Dockerfile.iso
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 3 additions & 0 deletions .obs/dockerfile/SL-Micro-kvm-container/_multibuild
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<multibuild>
<flavor>iso</flavor>
</multibuild>
10 changes: 10 additions & 0 deletions .obs/dockerfile/SL-Micro-kvm-container/_service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
0 ...kerfile/build-kvm-iso-image/manifest.yaml → ...file/SL-Micro-kvm-container/manifest.yaml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...e/build-rke2-selinux-iso-image/Dockerfile → ...cro-rke2-selinux-container/Dockerfile.iso
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 3 additions & 0 deletions .obs/dockerfile/SL-Micro-rke2-selinux-container/_multibuild
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<multibuild>
<flavor>iso</flavor>
</multibuild>
10 changes: 10 additions & 0 deletions .obs/dockerfile/SL-Micro-rke2-selinux-container/_service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
0 ...uild-rke2-selinux-iso-image/manifest.yaml → ...icro-rke2-selinux-container/manifest.yaml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion .../dockerfile/build-rt-iso-image/Dockerfile → ...file/SL-Micro-rt-container/Dockerfile.iso
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 3 additions & 0 deletions .obs/dockerfile/SL-Micro-rt-container/_multibuild
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<multibuild>
<flavor>iso</flavor>
</multibuild>
10 changes: 10 additions & 0 deletions .obs/dockerfile/SL-Micro-rt-container/_service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
0 ...ckerfile/build-rt-iso-image/manifest.yaml → ...rfile/SL-Micro-rt-container/manifest.yaml
View file
Open in desktop
File renamed without changes.
14 changes: 0 additions & 14 deletions .obs/dockerfile/build-baremetal-disk-image/_service
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions .obs/dockerfile/build-baremetal-iso-image/_service
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions .obs/dockerfile/build-base-iso-image/_service
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions .obs/dockerfile/build-k3s-selinux-iso-image/_service
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions .obs/dockerfile/build-kvm-iso-image/_service
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions .obs/dockerfile/build-rke2-selinux-iso-image/_service
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions .obs/dockerfile/build-rt-iso-image/_service
View file
Open in desktop

This file was deleted.

Loading