Skip to content

Commit 2719265

Browse files
committed
Adapt labels to pass OBS container checks
Signed-off-by: David Cassany <dcassany@suse.com>
1 parent 26837bf commit 2719265

4 files changed

Lines changed: 2 additions & 14 deletions

File tree

.obs/dockerfile/operator-image/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ COPY --from=BASE /installroot /
1919

2020
RUN /usr/sbin/update-ca-certificates
2121

22-
ARG BUILD_REPO=%%IMG_REPO%%
23-
ARG IMAGE_REPO=$BUILD_REPO/rancher/elemental-operator:latest
22+
ARG IMAGE_REPO=registry.suse.com/rancher/elemental-operator:%VERSION%-%RELEASE%
2423

2524
# Define labels according to https://en.opensuse.org/Building_derived_containers
2625
# labelprefix=com.suse.elemental
Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
<services>
22
<service mode="buildtime" name="kiwi_metainfo_helper"/>
33
<service mode="buildtime" name="docker_label_helper"/>
4-
<service name="replace_using_env" mode="buildtime">
5-
<param name="file">Dockerfile</param>
6-
<param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
7-
<param name="var">IMG_REPO</param>
8-
</service>
94
</services>

.obs/dockerfile/seedimage-builder/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ COPY --from=BASE /installroot /
1919

2020
RUN /usr/sbin/update-ca-certificates
2121

22-
ARG BUILD_REPO=%%IMG_REPO%%
23-
ARG IMAGE_REPO=$BUILD_REPO/rancher/elemental-seedimage-builder-image:latest
22+
ARG IMAGE_REPO=registry.suse.com/rancher/elemental-seedimage-builder-image:%VERSION%-%RELEASE%
2423

2524
# Define labels according to https://en.opensuse.org/Building_derived_containers
2625
# labelprefix=com.suse.elemental
Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
<services>
22
<service mode="buildtime" name="kiwi_metainfo_helper"/>
33
<service mode="buildtime" name="docker_label_helper"/>
4-
<service name="replace_using_env" mode="buildtime">
5-
<param name="file">Dockerfile</param>
6-
<param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
7-
<param name="var">IMG_REPO</param>
8-
</service>
94
</services>

0 commit comments

Comments
 (0)