suse-edge/Factory
SHA256
11
0
Fork 5
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kiwi-builder-image: Align with OBS latest version #40

Merged
steven.hardy merged 1 commits from steven.hardy/Factory:kiwi_updates into main 2024-12-04 12:54:44 +01:00
Conversation 0 Commits 1 Files Changed 3 +47 -40
3 changed files with 47 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
kiwi-builder-image/Dockerfile
View File

@ -1,5 +1,6 @@
#!BuildTag: kiwi-builder:10.1
FROM registry.suse.com/bci/kiwi:10.1.10
#!BuildTag: %%IMG_PREFIX%%kiwi-builder:10.1.16.0
steven.hardy marked this conversation as resolved Outdated
nbelouin commented 2024-12-02 10:32:28 +01:00
Outdated
Review
Copy Link

I don't think we want to publish a "latest" tag

I don't think we want to publish a "latest" tag
steven.hardy commented 2024-12-02 19:17:08 +01:00
Outdated
Review
Copy Link

Removed, I guess we may have to also update the README to specify the tag though

Removed, I guess we may have to also update the README to specify the tag though
#!BuildTag: %%IMG_PREFIX%%kiwi-builder:10.1.16.0-%RELEASE%
FROM registry.suse.com/bci/kiwi:10.1.16
steven.hardy marked this conversation as resolved Outdated
nbelouin commented 2024-12-02 10:29:00 +01:00
Outdated
Review
Copy Link

Missing the img prefix here.

Missing the img prefix here.
steven.hardy commented 2024-12-02 19:17:20 +01:00
Outdated
Review
Copy Link

Fixed, thanks!

Fixed, thanks!
MAINTAINER SUSE LLC (https://www.suse.com/)
steven.hardy commented 2024-12-02 09:58:52 +01:00
Outdated
Review
Copy Link

@nbelouin @dprodanov please confirm if you're happy with the tag here - I took the base 10.1.16 tag and appended .0 so we have flexibility to bump the version if/when changes are needed that do not require a base image update

I also added latest which for chart consumed images I'm trying to avoid, but in this case since the image is consumed interactively it may simplify the docs somewhat

@nbelouin @dprodanov please confirm if you're happy with the tag here - I took the base `10.1.16` tag and appended `.0` so we have flexibility to bump the version if/when changes are needed that do not require a base image update I also added `latest` which for chart consumed images I'm trying to avoid, but in this case since the image is consumed interactively it may simplify the docs somewhat
nbelouin commented 2024-12-02 10:31:20 +01:00
Outdated
Review
Copy Link

Wondering if -0 (rpm revision style) would be better.

Wondering if `-0` (rpm revision style) would be better.
steven.hardy commented 2024-12-02 19:16:21 +01:00
Outdated
Review
Copy Link

After discussion on slack I left it as 10.1.16.0-%RELEASE% to be consistent with other images (which are mostly N.N.N-%RELEASE% and in a couple of cases N.N.N.N-%RELEASE% but I removed the latest tag

After discussion on slack I left it as `10.1.16.0-%RELEASE%` to be consistent with other images (which are mostly `N.N.N-%RELEASE%` and in a couple of cases `N.N.N.N-%RELEASE%` but I removed the latest tag
# Define labels according to https://en.opensuse.org/Building_derived_containers
@ -11,7 +12,7 @@ LABEL org.opencontainers.image.version="%PACKAGE_VERSION%"
LABEL org.opencontainers.image.url="https://www.suse.com/solutions/edge-computing/"
LABEL org.opencontainers.image.created="%BUILDTIME%"
LABEL org.opencontainers.image.vendor="SUSE LLC"
LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%kiwi-builder:10.1"
LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%kiwi-builder:10.1.16.0"
LABEL org.openbuildservice.disturl="%DISTURL%"
LABEL com.suse.supportlevel="%%SUPPORT_LEVEL%%"
LABEL com.suse.eula="SUSE Combined EULA February 2024"
@ -20,10 +21,6 @@ LABEL com.suse.image-type="application"
LABEL com.suse.release-stage="released"
# endlabelprefix
# Install required packages for Kiwi to function as expected
# Should be provided via https://github.com/SUSE/BCI-dockerfile-generator/pull/1770
# RUN zypper in -y gawk && zypper clean -a
# Configure Kiwi to use kpartx
RUN echo -e "mapper:\n - part_mapper: kpartx" > /etc/kiwi.yml

22
kiwi-builder-image/README
View File

@ -8,32 +8,40 @@ Please ensure that you're running this on a registered SLE Micro 6.0 system, and
Next, download the podman image:
# podman pull %%IMG_REPO%%/%%IMG_PREFIXkiwi-builder:10
# podman pull %%IMG_REPO%%/%%IMG_PREFIXkiwi-builder:10.1.16.0
Make a local output directory (where the images will reside):
# mkdir output
Then, to build a standard "Base" image, run the following in podman:
# podman run --privileged -v /etc/zypp/repos.d:/micro-sdk/repos/ -v ./output:/tmp/output -it %%IMG_REPO%%/%%IMG_PREFIXkiwi-builder:10.1.16.0 build-image
To build a "Base" SelfInstall ISO, you can add additional flags, for example:
# podman run --privileged -v /etc/zypp/repos.d:/micro-sdk/repos/ -v ./output:/tmp/output -it %%IMG_REPO%%/%%IMG_PREFIXkiwi-builder:10.1.16.0 build-image -p Base-SelfInstall
Then, to build a standard "Default" image, run the following in podman:
# podman run --privileged -v /etc/zypp/repos.d:/micro-sdk/repos/ -v ./output:/tmp/output -it %%IMG_REPO%%/%%IMG_PREFIXkiwi-builder:10 build-image
# podman run --privileged -v /etc/zypp/repos.d:/micro-sdk/repos/ -v ./output:/tmp/output -it %%IMG_REPO%%/%%IMG_PREFIXkiwi-builder:10.1.16.0 build-image -p Default
To build a SelfInstall ISO, you can add additional flags, for example:
To build a "Default" SelfInstall ISO, you can add additional flags, for example:
# podman run --privileged -v /etc/zypp/repos.d:/micro-sdk/repos/ -v ./output:/tmp/output -it %%IMG_REPO%%/%%IMG_PREFIXkiwi-builder:10 build-image -p Default-SelfInstall
# podman run --privileged -v /etc/zypp/repos.d:/micro-sdk/repos/ -v ./output:/tmp/output -it %%IMG_REPO%%/%%IMG_PREFIXkiwi-builder:10.1.16.0 build-image -p Default-SelfInstall
To build an image with a RealTime kernel, e.g. a RAW disk image ("Default"), use the following:
# podman run --privileged -v /etc/zypp/repos.d:/micro-sdk/repos/ -v ./output:/tmp/output -it %%IMG_REPO%%/%%IMG_PREFIXkiwi-builder:10 build-image -p Base-RT
# podman run --privileged -v /etc/zypp/repos.d:/micro-sdk/repos/ -v ./output:/tmp/output -it %%IMG_REPO%%/%%IMG_PREFIXkiwi-builder:10.1.16.0 build-image -p Base-RT
To build an image that supports a large block/sectorsize (4096), use the "-b" flag, for example:
# podman run --privileged -v /etc/zypp/repos.d:/micro-sdk/repos/ -v ./output:/tmp/output -it %%IMG_REPO%%/%%IMG_PREFIXkiwi-builder:10 build-image -p Default-SelfInstall -b
# podman run --privileged -v /etc/zypp/repos.d:/micro-sdk/repos/ -v ./output:/tmp/output -it %%IMG_REPO%%/%%IMG_PREFIXkiwi-builder:10.1.16.0 build-image -p Default-SelfInstall -b
# mkdir mydefs/
# cp /path/to/SL-Micro.kiwi mydefs/
# cp /path/to/config.sh mydefs/
# podman run --privileged -v /etc/zypp/repos.d:/micro-sdk/repos/ -v ./output:/tmp/output -v ./mydefs/:/micro-sdk/defs/ -it %%IMG_REPO%%/%%IMG_PREFIXkiwi-builder:10 build-image
# podman run --privileged -v /etc/zypp/repos.d:/micro-sdk/repos/ -v ./output:/tmp/output -v ./mydefs/:/micro-sdk/defs/ -it %%IMG_REPO%%/%%IMG_PREFIXkiwi-builder:10.1.16.0 build-image
All output will be in the local $(pwd)/output directory, for example:

10
kiwi-builder-image/build-image.sh
View File

@ -21,7 +21,7 @@
#
# Set image build defaults, blocksize is an empty string
PROFILE="Default"
PROFILE="Base"
LARGEBLOCK=false
# Print usage
@ -34,14 +34,16 @@ usage(){
Usage: ${0} [-p <profile>] [-b]
Profile Options (-p):
* Default: RAW Disk Image with kernel-default
* Default-SelfInstall: SelfInstall ISO with kernel-default
* Base: RAW Disk Image with podman
* Base-SelfInstall: SelfInstall ISO with podman
* Default: RAW Disk Image with podman and kvm
* Default-SelfInstall: SelfInstall ISO with podman and kvm
* Base-RT: RAW Disk Image with kernel-rt
* Base-RT-SelfInstall: SelfInstall ISO with kernel-rt
4096 Blocksize (-b): If specified, use a 4096 blocksize (rather than 512) when generating the image.
NOTE: If both options are omitted, the "Default" profile with a standard "512" blocksize is used.
NOTE: If both options are omitted, the "Base" profile with a standard "512" blocksize is used.
EOF
}