Skip to content

Commit

Permalink
Readd SLE Micro version within image repository
Browse files Browse the repository at this point in the history
Add again SLEMicro version within the repository to be sure we can still
make use of the 'latest' tag for each base distro version. Now it will
be dynamically computed from project configuration at the expense of
increasing _service file complexity in OBS.

Signed-off-by: David Cassany <dcassany@suse.com>
  • Loading branch information
davidcassany committed Jul 31, 2023
1 parent 0253d3a commit 393f8a7
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 10 deletions.
15 changes: 9 additions & 6 deletions .obs/dockerfile/teal-iso/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
# SPDX-License-Identifier: Apache-2.0
#!BuildTag: rancher/elemental-teal-iso:%VERSION%
#!BuildTag: rancher/elemental-teal-iso:%VERSION%-%RELEASE%
#!BuildTag: rancher/elemental-teal-iso/%%SLEMICRO_VERSION%%:latest
#!BuildTag: rancher/elemental-teal-iso/%%SLEMICRO_VERSION%%:%VERSION%
#!BuildTag: rancher/elemental-teal-iso/%%SLEMICRO_VERSION%%:%VERSION%-%RELEASE%
#!BuildConstraint: hardware:disk:size unit=G 10
#!BuildConstraint: hardware:memory:size unit=G 16

ARG SLE_VERSION
ARG SLEMICRO_VERSION

FROM rancher/elemental-teal:latest AS os
FROM rancher/elemental-builder-image:latest AS builder
FROM rancher/elemental-teal/$SLEMICRO_VERSION:latest AS os
FROM rancher/elemental-builder-image/$SLEMICRO_VERSION:latest AS builder

WORKDIR /iso

Expand All @@ -22,8 +24,9 @@ RUN elemental --debug --config-dir . build-iso -o /output -n "elemental-teal.$(u
FROM bci/bci-busybox:$SLE_VERSION
COPY --from=builder /output /elemental-iso

ARG BUILD_REPO=registry.suse.com
ARG IMAGE_REPO=$BUILD_REPO/rancher/elemental-teal
ARG SLEMICRO_VERSION
ARG BUILD_REPO=%%IMG_REPO%%
ARG IMAGE_REPO=$BUILD_REPO/rancher/elemental-teal-iso/$SLEMICRO_VERSION

# Define labels according to https://en.opensuse.org/Building_derived_containers
# labelprefix=com.rancher.elemental
Expand Down
10 changes: 6 additions & 4 deletions .obs/dockerfile/teal-os/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# SPDX-License-Identifier: Apache-2.0
# Define the names/tags of the container
#!BuildTag: rancher/elemental-teal:%VERSION%
#!BuildTag: rancher/elemental-teal:%VERSION%-%RELEASE%
#!BuildTag: rancher/elemental-teal/%%SLEMICRO_VERSION%%:latest
#!BuildTag: rancher/elemental-teal/%%SLEMICRO_VERSION%%:%VERSION%
#!BuildTag: rancher/elemental-teal/%%SLEMICRO_VERSION%%:%VERSION%-%RELEASE%
#!BuildConstraint: hardware:disk:size unit=G 8

ARG SLEMICRO_VERSION
Expand All @@ -21,8 +22,9 @@ RUN zypper in -y -- \
# Install extra useful utilities
RUN zypper in -y k9s

ARG BUILD_REPO=registry.suse.com
ARG IMAGE_REPO=$BUILD_REPO/rancher/elemental-teal
ARG SLEMICRO_VERSION
ARG BUILD_REPO=%%IMG_REPO%%
ARG IMAGE_REPO=$BUILD_REPO/rancher/elemental-teal/$SLEMICRO_VERSION
ARG IMAGE_TAG=%VERSION%-%RELEASE%

# IMPORTANT: Setup elemental-release used for versioning/upgrade. The
Expand Down

0 comments on commit 393f8a7

Please sign in to comment.