From a07128c3a1b9d7adf7ec4b36a5eba8185c7ac94f Mon Sep 17 00:00:00 2001 From: mbussolotto Date: Wed, 6 Sep 2023 15:08:52 +0200 Subject: [PATCH] set BuildTag for Dockerfile and Chart.yaml using push-packages-to-obs.sh (#7504) --- containers/hub-xmlrpc-api-image/Dockerfile | 2 +- containers/proxy-helm/Chart.yaml | 2 +- containers/proxy-httpd-image/Dockerfile | 2 +- containers/proxy-salt-broker-image/Dockerfile | 2 +- containers/proxy-squid-image/Dockerfile | 2 +- containers/proxy-ssh-image/Dockerfile | 2 +- containers/proxy-tftpd-image/Dockerfile | 2 +- containers/server-helm/Chart.yaml | 2 -- containers/server-image/Dockerfile | 2 +- 9 files changed, 8 insertions(+), 10 deletions(-) diff --git a/containers/hub-xmlrpc-api-image/Dockerfile b/containers/hub-xmlrpc-api-image/Dockerfile index 7f5103edf688..17bb3e4f4ca0 100644 --- a/containers/hub-xmlrpc-api-image/Dockerfile +++ b/containers/hub-xmlrpc-api-image/Dockerfile @@ -1,5 +1,5 @@ # SPDX-License-Identifier: MIT -#!BuildTag: uyuni/hub-xmlrpc-api:latest uyuni/hub-xmlrpc-api:4.4.0 uyuni/hub-xmlrpc-api:4.4.0.%RELEASE% +#!BuildTag: uyuni/hub-xmlrpc-api:latest ARG INIT_BASE=registry.opensuse.org/bci/bci-micro FROM $INIT_BASE diff --git a/containers/proxy-helm/Chart.yaml b/containers/proxy-helm/Chart.yaml index 305ebaeec8e8..1bd810050add 100644 --- a/containers/proxy-helm/Chart.yaml +++ b/containers/proxy-helm/Chart.yaml @@ -1,5 +1,5 @@ # SPDX-License-Identifier: MIT -#!BuildTag: uyuni/proxy-helm:latest uyuni/proxy-helm:4.4.0 uyuni/proxy-helm:4.4.0-build%RELEASE% +#!BuildTag: uyuni/proxy-helm:latest apiVersion: v2 name: proxy-helm description: Uyuni proxy containers. diff --git a/containers/proxy-httpd-image/Dockerfile b/containers/proxy-httpd-image/Dockerfile index 412146b850ae..5894b8abc17f 100644 --- a/containers/proxy-httpd-image/Dockerfile +++ b/containers/proxy-httpd-image/Dockerfile @@ -1,5 +1,5 @@ # SPDX-License-Identifier: MIT -#!BuildTag: uyuni/proxy-httpd:latest uyuni/proxy-httpd:4.4.0 uyuni/proxy-httpd:4.4.0.%RELEASE% +#!BuildTag: uyuni/proxy-httpd:latest ARG BASE=registry.suse.com/bci/bci-base:15.4 FROM $BASE AS base diff --git a/containers/proxy-salt-broker-image/Dockerfile b/containers/proxy-salt-broker-image/Dockerfile index 342e70dcfbde..2bfcb4308185 100644 --- a/containers/proxy-salt-broker-image/Dockerfile +++ b/containers/proxy-salt-broker-image/Dockerfile @@ -1,5 +1,5 @@ # SPDX-License-Identifier: MIT -#!BuildTag: uyuni/proxy-salt-broker:latest uyuni/proxy-salt-broker:4.4.0 uyuni/proxy-salt-broker:4.4.0.%RELEASE% +#!BuildTag: uyuni/proxy-salt-broker:latest ARG BASE=registry.suse.com/bci/bci-base:15.4 FROM $BASE AS fat diff --git a/containers/proxy-squid-image/Dockerfile b/containers/proxy-squid-image/Dockerfile index 6f52c8f67d2c..cfad11fce119 100644 --- a/containers/proxy-squid-image/Dockerfile +++ b/containers/proxy-squid-image/Dockerfile @@ -1,5 +1,5 @@ # SPDX-License-Identifier: MIT -#!BuildTag: uyuni/proxy-squid:latest uyuni/proxy-squid:4.4.0 uyuni/proxy-squid:4.4.0.%RELEASE% +#!BuildTag: uyuni/proxy-squid:latest ARG BASE=registry.suse.com/bci/bci-base:15.4 FROM $BASE AS base diff --git a/containers/proxy-ssh-image/Dockerfile b/containers/proxy-ssh-image/Dockerfile index 9e993c96efa8..6441e577a440 100644 --- a/containers/proxy-ssh-image/Dockerfile +++ b/containers/proxy-ssh-image/Dockerfile @@ -1,5 +1,5 @@ # SPDX-License-Identifier: MIT -#!BuildTag: uyuni/proxy-ssh:latest uyuni/proxy-ssh:4.4.0 uyuni/proxy-ssh:4.4.0.%RELEASE% +#!BuildTag: uyuni/proxy-ssh:latest ARG BASE=registry.suse.com/bci/bci-base:15.4 FROM $BASE AS base diff --git a/containers/proxy-tftpd-image/Dockerfile b/containers/proxy-tftpd-image/Dockerfile index cd12f5b7f7c7..6f368c070d0f 100644 --- a/containers/proxy-tftpd-image/Dockerfile +++ b/containers/proxy-tftpd-image/Dockerfile @@ -1,5 +1,5 @@ # SPDX-License-Identifier: MIT -#!BuildTag: uyuni/proxy-tftpd:latest uyuni/proxy-tftpd:4.4.0 uyuni/proxy-tftpd:4.4.0.%RELEASE% +#!BuildTag: uyuni/proxy-tftpd:latest ARG BASE=registry.suse.com/bci/bci-base:15.4 FROM $BASE AS base diff --git a/containers/server-helm/Chart.yaml b/containers/server-helm/Chart.yaml index 84bebb20b9db..6d5111b4fbf8 100644 --- a/containers/server-helm/Chart.yaml +++ b/containers/server-helm/Chart.yaml @@ -1,7 +1,5 @@ # SPDX-License-Identifier: MIT #!BuildTag: uyuni/server:latest -#!BuildTag: uyuni/server:4.4.0 -#!BuildTag: uyuni/server:4.4.0-build%RELEASE% apiVersion: v2 name: server description: Uyuni server containers. diff --git a/containers/server-image/Dockerfile b/containers/server-image/Dockerfile index e689747b43ff..15dbb1946cef 100644 --- a/containers/server-image/Dockerfile +++ b/containers/server-image/Dockerfile @@ -1,5 +1,5 @@ # SPDX-License-Identifier: MIT -#!BuildTag: uyuni/server:latest uyuni/server:%PKG_VERSION% uyuni/server:%PKG_VERSION%.%RELEASE% +#!BuildTag: uyuni/server:latest ARG INIT_BASE=registry.suse.com/bci/bci-base:15.4 FROM $INIT_BASE