-
Notifications
You must be signed in to change notification settings - Fork 39
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.
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
Merge ISO and OS container images #1611
base: main
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
<multibuild> | ||
<flavor>iso</flavor> | ||
<flavor>disk</flavor> | ||
</multibuild> |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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. Choose a reason for hiding this commentThe 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 |
||
|
||
WORKDIR /iso | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
<multibuild> | ||
<flavor>iso</flavor> | ||
</multibuild> |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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"> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nit: we could consider adapting this <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> |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
<multibuild> | ||
<flavor>iso</flavor> | ||
</multibuild> |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
<multibuild> | ||
<flavor>iso</flavor> | ||
</multibuild> |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
<multibuild> | ||
<flavor>iso</flavor> | ||
</multibuild> |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
<multibuild> | ||
<flavor>iso</flavor> | ||
</multibuild> |
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
There was a problem hiding this comment.
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