Introduce container_registry for image prefix
Change-Id: I80067f53aa2b63286b654fff782f0f7b65a2d050
diff --git a/images/barbican/Dockerfile b/images/barbican/Dockerfile
index 6d6e07b..f6c0f13 100644
--- a/images/barbican/Dockerfile
+++ b/images/barbican/Dockerfile
@@ -1,9 +1,10 @@
# SPDX-License-Identifier: Apache-2.0
# Atmosphere-Rebuild-Time: 2024-06-25T22:49:25Z
+ARG REGISTRY
ARG RELEASE
-FROM harbor.atmosphere.dev/library/openstack-venv-builder:${RELEASE} AS build
+FROM ${REGISTRY}/openstack-venv-builder:${RELEASE} AS build
ARG BARBICAN_GIT_REF=ca57ef5436e20e90cf6cd6853efe3c89a9afd986
ADD --keep-git-dir=true https://opendev.org/openstack/barbican.git#${BARBICAN_GIT_REF} /src/barbican
RUN git -C /src/barbican fetch --unshallow
@@ -14,5 +15,5 @@
pykmip
EOF
-FROM harbor.atmosphere.dev/library/openstack-python-runtime:${RELEASE}
+FROM ${REGISTRY}/openstack-python-runtime:${RELEASE}
COPY --from=build --link /var/lib/openstack /var/lib/openstack
diff --git a/images/cinder/Dockerfile b/images/cinder/Dockerfile
index 7d307b7..1cbd002 100644
--- a/images/cinder/Dockerfile
+++ b/images/cinder/Dockerfile
@@ -1,9 +1,10 @@
# SPDX-License-Identifier: Apache-2.0
# Atmosphere-Rebuild-Time: 2024-06-25T22:49:25Z
+ARG REGISTRY
ARG RELEASE
-FROM harbor.atmosphere.dev/library/openstack-venv-builder:${RELEASE} AS build
+FROM ${REGISTRY}/openstack-venv-builder:${RELEASE} AS build
ARG CINDER_GIT_REF=b0f0b9015b9dfa228dff98eeee5116d8eca1c3cc
ADD --keep-git-dir=true https://opendev.org/openstack/cinder.git#${CINDER_GIT_REF} /src/cinder
RUN git -C /src/cinder fetch --unshallow
@@ -25,7 +26,7 @@
https://github.com/storpool/storpool-openstack-integration/raw/master/drivers/os_brick/openstack/bobcat/storpool.py \
/var/lib/openstack/lib/python3.10/site-packages/os_brick/initiator/connectors/storpool.py
-FROM harbor.atmosphere.dev/library/openstack-python-runtime:${RELEASE}
+FROM ${REGISTRY}/openstack-python-runtime:${RELEASE}
RUN <<EOF bash -xe
apt-get update -qq
apt-get install -qq -y --no-install-recommends \
diff --git a/images/designate/Dockerfile b/images/designate/Dockerfile
index ea25a88..e31e43e 100644
--- a/images/designate/Dockerfile
+++ b/images/designate/Dockerfile
@@ -1,9 +1,10 @@
# SPDX-License-Identifier: Apache-2.0
# Atmosphere-Rebuild-Time: 2024-06-25T22:49:25Z
+ARG REGISTRY
ARG RELEASE
-FROM harbor.atmosphere.dev/library/openstack-venv-builder:${RELEASE} AS build
+FROM ${REGISTRY}/openstack-venv-builder:${RELEASE} AS build
ARG DESIGNATE_GIT_REF=097ffc6df181290eba1bcd7c492b1b505bc15434
ADD --keep-git-dir=true https://opendev.org/openstack/designate.git#${DESIGNATE_GIT_REF} /src/designate
RUN git -C /src/designate fetch --unshallow
@@ -15,7 +16,7 @@
/src/designate
EOF
-FROM harbor.atmosphere.dev/library/openstack-python-runtime:${RELEASE}
+FROM ${REGISTRY}/openstack-python-runtime:${RELEASE}
RUN <<EOF bash -xe
apt-get update -qq
apt-get install -qq -y --no-install-recommends \
diff --git a/images/glance/Dockerfile b/images/glance/Dockerfile
index 6a253e4..6690bc2 100644
--- a/images/glance/Dockerfile
+++ b/images/glance/Dockerfile
@@ -1,9 +1,10 @@
# SPDX-License-Identifier: Apache-2.0
# Atmosphere-Rebuild-Time: 2024-06-25T22:49:25Z
+ARG REGISTRY
ARG RELEASE
-FROM harbor.atmosphere.dev/library/openstack-venv-builder:${RELEASE} AS build
+FROM ${REGISTRY}/openstack-venv-builder:${RELEASE} AS build
ARG GLANCE_GIT_REF=0bcd6cd71c09917c6734421374fd598d73e8d0cc
ADD --keep-git-dir=true https://opendev.org/openstack/glance.git#${GLANCE_GIT_REF} /src/glance
RUN git -C /src/glance fetch --unshallow
@@ -21,7 +22,7 @@
https://github.com/storpool/storpool-openstack-integration/raw/master/drivers/os_brick/openstack/bobcat/storpool.py \
/var/lib/openstack/lib/python3.10/site-packages/os_brick/initiator/connectors/storpool.py
-FROM harbor.atmosphere.dev/library/openstack-python-runtime:${RELEASE}
+FROM ${REGISTRY}/openstack-python-runtime:${RELEASE}
RUN <<EOF bash -xe
apt-get update -qq
apt-get install -qq -y --no-install-recommends \
diff --git a/images/heat/Dockerfile b/images/heat/Dockerfile
index 94b5e2b..6d37b52 100644
--- a/images/heat/Dockerfile
+++ b/images/heat/Dockerfile
@@ -1,9 +1,10 @@
# SPDX-License-Identifier: Apache-2.0
# Atmosphere-Rebuild-Time: 2024-06-25T22:49:25Z
+ARG REGISTRY
ARG RELEASE
-FROM harbor.atmosphere.dev/library/openstack-venv-builder:${RELEASE} AS build
+FROM ${REGISTRY}/openstack-venv-builder:${RELEASE} AS build
ARG HEAT_GIT_REF=80eea85194825773d1b60ecc4386b2d5ba52a066
ADD --keep-git-dir=true https://opendev.org/openstack/heat.git#${HEAT_GIT_REF} /src/heat
RUN git -C /src/heat fetch --unshallow
@@ -13,7 +14,7 @@
/src/heat
EOF
-FROM harbor.atmosphere.dev/library/openstack-python-runtime:${RELEASE}
+FROM ${REGISTRY}/openstack-python-runtime:${RELEASE}
RUN <<EOF bash -xe
apt-get update -qq
apt-get install -qq -y --no-install-recommends \
diff --git a/images/horizon/Dockerfile b/images/horizon/Dockerfile
index f9e6bbb..c51a3f7 100644
--- a/images/horizon/Dockerfile
+++ b/images/horizon/Dockerfile
@@ -1,9 +1,10 @@
# SPDX-License-Identifier: Apache-2.0
# Atmosphere-Rebuild-Time: 2024-06-25T22:49:25Z
+ARG REGISTRY
ARG RELEASE
-FROM harbor.atmosphere.dev/library/openstack-venv-builder:${RELEASE} AS build
+FROM ${REGISTRY}/openstack-venv-builder:${RELEASE} AS build
ARG HORIZON_GIT_REF=14212342cf8f7eb987e50de112958af31063e02e
ADD --keep-git-dir=true https://opendev.org/openstack/horizon.git#${HORIZON_GIT_REF} /src/horizon
RUN git -C /src/horizon fetch --unshallow
@@ -40,7 +41,7 @@
pymemcache
EOF
-FROM harbor.atmosphere.dev/library/openstack-python-runtime:${RELEASE}
+FROM ${REGISTRY}/openstack-python-runtime:${RELEASE}
RUN <<EOF bash -xe
apt-get update -qq
apt-get install -qq -y --no-install-recommends \
diff --git a/images/ironic/Dockerfile b/images/ironic/Dockerfile
index 3e334e8..2f93674 100644
--- a/images/ironic/Dockerfile
+++ b/images/ironic/Dockerfile
@@ -1,9 +1,10 @@
# SPDX-License-Identifier: Apache-2.0
# Atmosphere-Rebuild-Time: 2024-06-25T22:49:25Z
+ARG REGISTRY
ARG RELEASE
-FROM harbor.atmosphere.dev/library/openstack-venv-builder:${RELEASE} AS build
+FROM ${REGISTRY}/openstack-venv-builder:${RELEASE} AS build
ARG IRONIC_GIT_REF=22aa29b864eecd00bfb7c67cc2075030da1eb1d0
ADD --keep-git-dir=true https://opendev.org/openstack/ironic.git#${IRONIC_GIT_REF} /src/ironic
RUN git -C /src/ironic fetch --unshallow
@@ -15,7 +16,7 @@
sushy
EOF
-FROM harbor.atmosphere.dev/library/openstack-python-runtime:${RELEASE}
+FROM ${REGISTRY}/openstack-python-runtime:${RELEASE}
RUN <<EOF bash -xe
apt-get update -qq
apt-get install -qq -y --no-install-recommends \
diff --git a/images/keepalived/Dockerfile b/images/keepalived/Dockerfile
index 6f96d7a..4ccd572 100644
--- a/images/keepalived/Dockerfile
+++ b/images/keepalived/Dockerfile
@@ -1,9 +1,10 @@
# SPDX-License-Identifier: Apache-2.0
# Atmosphere-Rebuild-Time: 2024-06-25T22:49:25Z
+ARG REGISTRY
ARG RELEASE
-FROM harbor.atmosphere.dev/library/ubuntu:${RELEASE}
+FROM ${REGISTRY}/ubuntu:${RELEASE}
RUN <<EOF bash -xe
apt-get update -qq
apt-get install -qq -y --no-install-recommends \
diff --git a/images/keystone/Dockerfile b/images/keystone/Dockerfile
index 4aa2cff..12df545 100644
--- a/images/keystone/Dockerfile
+++ b/images/keystone/Dockerfile
@@ -1,9 +1,10 @@
# SPDX-License-Identifier: Apache-2.0
# Atmosphere-Rebuild-Time: 2024-06-25T22:49:25Z
+ARG REGISTRY
ARG RELEASE
-FROM harbor.atmosphere.dev/library/openstack-venv-builder:${RELEASE} AS build
+FROM ${REGISTRY}/openstack-venv-builder:${RELEASE} AS build
ARG KEYSTONE_GIT_REF=8ca73f758bb613a57815fbe4ae78e3d2afa4af49
ADD --keep-git-dir=true https://opendev.org/openstack/keystone.git#${KEYSTONE_GIT_REF} /src/keystone
RUN git -C /src/keystone fetch --unshallow
@@ -14,7 +15,7 @@
keystone-keycloak-backend==0.1.8
EOF
-FROM harbor.atmosphere.dev/library/openstack-python-runtime:${RELEASE}
+FROM ${REGISTRY}/openstack-python-runtime:${RELEASE}
RUN <<EOF bash -xe
apt-get update -qq
apt-get install -qq -y --no-install-recommends \
diff --git a/images/libvirtd/Dockerfile b/images/libvirtd/Dockerfile
index 164d601..a025102 100644
--- a/images/libvirtd/Dockerfile
+++ b/images/libvirtd/Dockerfile
@@ -1,9 +1,10 @@
# SPDX-License-Identifier: Apache-2.0
# Atmosphere-Rebuild-Time: 2025-01-15T02:05:46Z
+ARG REGISTRY
ARG RELEASE
-FROM harbor.atmosphere.dev/library/openstack-runtime:${RELEASE}
+FROM ${REGISTRY}/openstack-runtime:${RELEASE}
ADD --chmod=644 https://download.ceph.com/keys/release.gpg /etc/apt/trusted.gpg.d/ceph.gpg
COPY <<EOF /etc/apt/sources.list.d/ceph.list
deb http://download.ceph.com/debian-reef/ jammy main
diff --git a/images/magnum/Dockerfile b/images/magnum/Dockerfile
index a21306c..bee9388 100644
--- a/images/magnum/Dockerfile
+++ b/images/magnum/Dockerfile
@@ -1,9 +1,10 @@
# SPDX-License-Identifier: Apache-2.0
# Atmosphere-Rebuild-Time: 2024-06-25T22:49:25Z
+ARG REGISTRY
ARG RELEASE
-FROM harbor.atmosphere.dev/library/ubuntu:${RELEASE} AS helm
+FROM ${REGISTRY}/ubuntu:${RELEASE} AS helm
ARG TARGETOS
ARG TARGETARCH
ARG HELM_VERSION=3.14.0
@@ -11,7 +12,7 @@
RUN tar -xzf /helm.tar.gz
RUN mv /${TARGETOS}-${TARGETARCH}/helm /usr/bin/helm
-FROM harbor.atmosphere.dev/library/openstack-venv-builder:${RELEASE} AS build
+FROM ${REGISTRY}/openstack-venv-builder:${RELEASE} AS build
ARG MAGNUM_GIT_REF=c613ea4e419edc0086116da07e93cf19206746e1
ADD --keep-git-dir=true https://opendev.org/openstack/magnum.git#${MAGNUM_GIT_REF} /src/magnum
RUN git -C /src/magnum fetch --unshallow
@@ -25,7 +26,7 @@
magnum-cluster-api==0.24.2
EOF
-FROM harbor.atmosphere.dev/library/openstack-python-runtime:${RELEASE}
+FROM ${REGISTRY}/openstack-python-runtime:${RELEASE}
RUN <<EOF bash -xe
apt-get update -qq
apt-get install -qq -y --no-install-recommends \
diff --git a/images/manila/Dockerfile b/images/manila/Dockerfile
index 93d9055..698659b 100644
--- a/images/manila/Dockerfile
+++ b/images/manila/Dockerfile
@@ -1,9 +1,10 @@
# SPDX-License-Identifier: Apache-2.0
# Atmosphere-Rebuild-Time: 2024-06-25T22:49:25Z
+ARG REGISTRY
ARG RELEASE
-FROM harbor.atmosphere.dev/library/openstack-venv-builder:${RELEASE} AS build
+FROM ${REGISTRY}/openstack-venv-builder:${RELEASE} AS build
ARG MANILA_GIT_REF=d8987589ae88ae9b2769fbe6f26d5b6994098038
ADD --keep-git-dir=true https://opendev.org/openstack/manila.git#${MANILA_GIT_REF} /src/manila
RUN git -C /src/manila fetch --unshallow
@@ -13,7 +14,7 @@
/src/manila
EOF
-FROM harbor.atmosphere.dev/library/openstack-python-runtime:${RELEASE}
+FROM ${REGISTRY}/openstack-python-runtime:${RELEASE}
RUN <<EOF bash -xe
apt-get update -qq
apt-get install -qq -y --no-install-recommends \
diff --git a/images/netoffload/Dockerfile b/images/netoffload/Dockerfile
index c7f7355..b39553b 100644
--- a/images/netoffload/Dockerfile
+++ b/images/netoffload/Dockerfile
@@ -1,6 +1,7 @@
# SPDX-License-Identifier: Apache-2.0
# Atmosphere-Rebuild-Time: 2024-06-25T22:49:25Z
+ARG REGISTRY
ARG RELEASE
FROM harbor.atmosphere.dev/docker.io/library/golang:1.20 AS build
@@ -9,7 +10,7 @@
WORKDIR /src
RUN go build -v -o offloadctl ./cmd/offloadctl/main.go
-FROM harbor.atmosphere.dev/library/ubuntu:${RELEASE}
+FROM ${REGISTRY}/ubuntu:${RELEASE}
RUN <<EOF bash -xe
apt-get update -qq
apt-get install -qq -y --no-install-recommends \
diff --git a/images/neutron/Dockerfile b/images/neutron/Dockerfile
index ff844cb..4d2a0cf 100644
--- a/images/neutron/Dockerfile
+++ b/images/neutron/Dockerfile
@@ -1,9 +1,10 @@
# SPDX-License-Identifier: Apache-2.0
# Atmosphere-Rebuild-Time: 2024-06-25T22:49:25Z
+ARG REGISTRY
ARG RELEASE
-FROM harbor.atmosphere.dev/library/openstack-venv-builder:${RELEASE} AS build
+FROM ${REGISTRY}/openstack-venv-builder:${RELEASE} AS build
ARG NEUTRON_GIT_REF=019294c71d94b788c14b23dc1da3c21f51bcdb0b
ADD --keep-git-dir=true https://opendev.org/openstack/neutron.git#${NEUTRON_GIT_REF} /src/neutron
RUN git -C /src/neutron fetch --unshallow
@@ -29,7 +30,7 @@
/src/neutron-ovn-network-logging-parser
EOF
-FROM harbor.atmosphere.dev/library/openstack-python-runtime:${RELEASE}
+FROM ${REGISTRY}/openstack-python-runtime:${RELEASE}
RUN <<EOF bash -xe
apt-get update -qq
apt-get install -qq -y --no-install-recommends \
diff --git a/images/nova-ssh/Dockerfile b/images/nova-ssh/Dockerfile
index 6566b90..2a1980d 100644
--- a/images/nova-ssh/Dockerfile
+++ b/images/nova-ssh/Dockerfile
@@ -1,9 +1,10 @@
# SPDX-License-Identifier: Apache-2.0
# Atmosphere-Rebuild-Time: 2024-06-25T22:49:25Z
+ARG REGISTRY
ARG RELEASE
-FROM harbor.atmosphere.dev/library/openstack-runtime:${RELEASE}
+FROM ${REGISTRY}/openstack-runtime:${RELEASE}
RUN <<EOF bash -xe
apt-get update -qq
apt-get install -qq -y --no-install-recommends \
diff --git a/images/nova/Dockerfile b/images/nova/Dockerfile
index 6ad288a..1ce9eb0 100644
--- a/images/nova/Dockerfile
+++ b/images/nova/Dockerfile
@@ -1,9 +1,10 @@
# SPDX-License-Identifier: Apache-2.0
# Atmosphere-Rebuild-Time: 2024-12-17T01:27:44Z
+ARG REGISTRY
ARG RELEASE
-FROM harbor.atmosphere.dev/library/openstack-venv-builder:${RELEASE} AS build
+FROM ${REGISTRY}/openstack-venv-builder:${RELEASE} AS build
ARG NOVA_GIT_REF=c199becf52267ba37c5191f6f82e29bb5232b607
ADD --keep-git-dir=true https://opendev.org/openstack/nova.git#${NOVA_GIT_REF} /src/nova
RUN git -C /src/nova fetch --unshallow
@@ -25,7 +26,7 @@
https://github.com/storpool/storpool-openstack-integration/raw/master/drivers/os_brick/openstack/bobcat/storpool.py \
/var/lib/openstack/lib/python3.10/site-packages/os_brick/initiator/connectors/storpool.py
-FROM harbor.atmosphere.dev/library/openstack-python-runtime:${RELEASE}
+FROM ${REGISTRY}/openstack-python-runtime:${RELEASE}
ADD https://github.com/novnc/noVNC.git#v1.4.0 /usr/share/novnc
RUN <<EOF bash -xe
apt-get update -qq
diff --git a/images/octavia/Dockerfile b/images/octavia/Dockerfile
index e7aa491..109035d 100644
--- a/images/octavia/Dockerfile
+++ b/images/octavia/Dockerfile
@@ -1,9 +1,10 @@
# SPDX-License-Identifier: Apache-2.0
# Atmosphere-Rebuild-Time: 2024-06-25T22:49:25Z
+ARG REGISTRY
ARG RELEASE
-FROM harbor.atmosphere.dev/library/openstack-venv-builder:${RELEASE} AS build
+FROM ${REGISTRY}/openstack-venv-builder:${RELEASE} AS build
ARG OCTAVIA_GIT_REF=824b51a1dad80292b7a8ad5d61bf3ce706b1fb29
ADD --keep-git-dir=true https://opendev.org/openstack/octavia.git#${OCTAVIA_GIT_REF} /src/octavia
RUN git -C /src/octavia fetch --unshallow
@@ -16,7 +17,7 @@
/src/ovn-octavia-provider
EOF
-FROM harbor.atmosphere.dev/library/openstack-python-runtime:${RELEASE}
+FROM ${REGISTRY}/openstack-python-runtime:${RELEASE}
RUN <<EOF bash -xe
apt-get update -qq
apt-get install -qq -y --no-install-recommends \
diff --git a/images/openstack-runtime/Dockerfile b/images/openstack-runtime/Dockerfile
index d968a31..5c17a3c 100644
--- a/images/openstack-runtime/Dockerfile
+++ b/images/openstack-runtime/Dockerfile
@@ -1,9 +1,10 @@
# SPDX-License-Identifier: Apache-2.0
# Atmosphere-Rebuild-Time: 2024-06-25T22:49:25Z
+ARG REGISTRY
ARG RELEASE
-ARG FROM=harbor.atmosphere.dev/library/ubuntu-cloud-archive:${RELEASE}
+ARG FROM=${REGISTRY}/ubuntu-cloud-archive:${RELEASE}
FROM ${FROM}
ONBUILD ARG PROJECT
ONBUILD ARG SHELL=/usr/sbin/nologin
diff --git a/images/openstack-venv-builder/Dockerfile b/images/openstack-venv-builder/Dockerfile
index 5aaf023..e58a776 100644
--- a/images/openstack-venv-builder/Dockerfile
+++ b/images/openstack-venv-builder/Dockerfile
@@ -1,9 +1,10 @@
# SPDX-License-Identifier: Apache-2.0
# Atmosphere-Rebuild-Time: 2024-06-25T22:49:25Z
+ARG REGISTRY
ARG RELEASE
-FROM harbor.atmosphere.dev/library/ubuntu-cloud-archive:${RELEASE} AS requirements
+FROM ${REGISTRY}/ubuntu-cloud-archive:${RELEASE} AS requirements
ARG REQUIREMENTS_GIT_REF=18098b9abacbd8d7257bebc1b302294f634441ab
ADD --keep-git-dir=true https://opendev.org/openstack/requirements.git#${REQUIREMENTS_GIT_REF} /src/requirements
RUN cp /src/requirements/upper-constraints.txt /upper-constraints.txt
@@ -12,7 +13,7 @@
sed -i '/horizon/d' /upper-constraints.txt
EOF
-FROM harbor.atmosphere.dev/library/python-base:${RELEASE}
+FROM ${REGISTRY}/python-base:${RELEASE}
RUN <<EOF bash -xe
apt-get update -qq
apt-get install -qq -y --no-install-recommends \
diff --git a/images/ovn/Dockerfile b/images/ovn/Dockerfile
index 272ce28..e031a04 100644
--- a/images/ovn/Dockerfile
+++ b/images/ovn/Dockerfile
@@ -1,6 +1,7 @@
# SPDX-License-Identifier: Apache-2.0
# Atmosphere-Rebuild-Time: 2024-10-31T12:56:04Z
+ARG REGISTRY
ARG RELEASE
FROM harbor.atmosphere.dev/docker.io/library/golang:1.20 AS ovn-kubernetes
@@ -13,7 +14,7 @@
go build -o /usr/bin/ovn-kube-util ./cmd/ovn-kube-util
EOF
-FROM harbor.atmosphere.dev/library/openvswitch:${RELEASE}
+FROM ${REGISTRY}/openvswitch:${RELEASE}
ARG TARGETPLATFORM
ADD --chmod=755 https://dl.k8s.io/release/v1.29.3/bin/${TARGETPLATFORM}/kubectl /usr/local/bin/kubectl
ARG OVN_SERIES=24.03
diff --git a/images/placement/Dockerfile b/images/placement/Dockerfile
index 04e8d36..b5be5e8 100644
--- a/images/placement/Dockerfile
+++ b/images/placement/Dockerfile
@@ -1,9 +1,10 @@
# SPDX-License-Identifier: Apache-2.0
# Atmosphere-Rebuild-Time: 2024-06-25T22:49:25Z
+ARG REGISTRY
ARG RELEASE
-FROM harbor.atmosphere.dev/library/openstack-venv-builder:${RELEASE} AS build
+FROM ${REGISTRY}/openstack-venv-builder:${RELEASE} AS build
ARG PLACEMENT_GIT_REF=96a9aeb3b4a6ffff5bbf247b213409395239fc7a
ADD --keep-git-dir=true https://opendev.org/openstack/placement.git#${PLACEMENT_GIT_REF} /src/placement
RUN git -C /src/placement fetch --unshallow
@@ -13,5 +14,5 @@
/src/placement
EOF
-FROM harbor.atmosphere.dev/library/openstack-python-runtime:${RELEASE}
+FROM ${REGISTRY}/openstack-python-runtime:${RELEASE}
COPY --from=build --link /var/lib/openstack /var/lib/openstack
diff --git a/images/python-base/Dockerfile b/images/python-base/Dockerfile
index 6293ecd..0a7be4b 100644
--- a/images/python-base/Dockerfile
+++ b/images/python-base/Dockerfile
@@ -1,9 +1,10 @@
# SPDX-License-Identifier: Apache-2.0
# Atmosphere-Rebuild-Time: 2024-06-25T22:49:25Z
+ARG REGISTRY
ARG RELEASE
-FROM harbor.atmosphere.dev/library/ubuntu-cloud-archive:${RELEASE}
+FROM ${REGISTRY}/ubuntu-cloud-archive:${RELEASE}
ENV PATH=/var/lib/openstack/bin:$PATH
RUN \
apt-get update -qq && \
diff --git a/images/python-openstackclient/Dockerfile b/images/python-openstackclient/Dockerfile
index 2763d01..1dfa764 100644
--- a/images/python-openstackclient/Dockerfile
+++ b/images/python-openstackclient/Dockerfile
@@ -1,9 +1,10 @@
# SPDX-License-Identifier: Apache-2.0
# Atmosphere-Rebuild-Time: 2024-06-25T22:49:25Z
+ARG REGISTRY
ARG RELEASE
-FROM harbor.atmosphere.dev/library/openstack-venv-builder:${RELEASE} AS build
+FROM ${REGISTRY}/openstack-venv-builder:${RELEASE} AS build
RUN --mount=type=cache,mode=0755,target=/root/.cache/pip,sharing=private <<EOF bash -xe
pip3 install \
--constraint /upper-constraints.txt \
@@ -21,7 +22,7 @@
python-swiftclient
EOF
-FROM harbor.atmosphere.dev/library/python-base:${RELEASE}
+FROM ${REGISTRY}/python-base:${RELEASE}
COPY --from=build --link /var/lib/openstack /var/lib/openstack
# NOTE(mnaser): The Magnum client relies on the SHELL environment variable
diff --git a/images/staffeln/Dockerfile b/images/staffeln/Dockerfile
index 0f9a6e9..d75fa37 100644
--- a/images/staffeln/Dockerfile
+++ b/images/staffeln/Dockerfile
@@ -1,9 +1,10 @@
# SPDX-License-Identifier: Apache-2.0
# Atmosphere-Rebuild-Time: 2024-06-25T22:49:25Z
+ARG REGISTRY
ARG RELEASE
-FROM harbor.atmosphere.dev/library/openstack-venv-builder:${RELEASE} AS build
+FROM ${REGISTRY}/openstack-venv-builder:${RELEASE} AS build
ARG STAFFELN_GIT_REF=v2.2.3
ADD --keep-git-dir=true https://github.com/vexxhost/staffeln.git#${STAFFELN_GIT_REF} /src/staffeln
RUN git -C /src/staffeln fetch --unshallow
@@ -13,5 +14,5 @@
/src/staffeln
EOF
-FROM harbor.atmosphere.dev/library/openstack-python-runtime:${RELEASE}
+FROM ${REGISTRY}/openstack-python-runtime:${RELEASE}
COPY --from=build --link /var/lib/openstack /var/lib/openstack
diff --git a/images/tempest/Dockerfile b/images/tempest/Dockerfile
index 0bccea4..1545877 100644
--- a/images/tempest/Dockerfile
+++ b/images/tempest/Dockerfile
@@ -1,6 +1,7 @@
# SPDX-License-Identifier: Apache-2.0
# Atmosphere-Rebuild-Time: 2024-06-25T22:49:25Z
+ARG REGISTRY
ARG RELEASE
FROM harbor.atmosphere.dev/docker.io/library/golang:1.18 AS octavia-test-server
@@ -10,7 +11,7 @@
-o /build/test_server.bin \
/src/octavia_tempest_plugin/contrib/test_server/test_server.go
-FROM harbor.atmosphere.dev/library/openstack-venv-builder:${RELEASE} AS build
+FROM ${REGISTRY}/openstack-venv-builder:${RELEASE} AS build
ARG TEMPEST_GIT_REF=c0da6e843a74c2392c8e87e8ff36d2fea12949c4
ADD --keep-git-dir=true https://opendev.org/openstack/tempest.git#${TEMPEST_GIT_REF} /src/tempest
RUN git -C /src/tempest fetch --unshallow
@@ -39,7 +40,7 @@
/src/octavia-tempest-plugin
EOF
-FROM harbor.atmosphere.dev/library/openstack-python-runtime:${RELEASE}
+FROM ${REGISTRY}/openstack-python-runtime:${RELEASE}
RUN <<EOF bash -xe
apt-get update -qq
apt-get install -qq -y --no-install-recommends \
diff --git a/images/ubuntu-cloud-archive/Dockerfile b/images/ubuntu-cloud-archive/Dockerfile
index 5f61784..841542e 100644
--- a/images/ubuntu-cloud-archive/Dockerfile
+++ b/images/ubuntu-cloud-archive/Dockerfile
@@ -1,9 +1,10 @@
# SPDX-License-Identifier: Apache-2.0
# Atmosphere-Rebuild-Time: 2024-06-25T22:49:25Z
+ARG REGISTRY
ARG RELEASE
-FROM harbor.atmosphere.dev/library/ubuntu:${RELEASE}
+FROM ${REGISTRY}/ubuntu:${RELEASE}
COPY trusted.gpg.d/ubuntu-cloud-keyring.gpg /etc/apt/trusted.gpg.d/ubuntu-cloud-keyring.gpg
COPY <<EOF /etc/apt/sources.list.d/cloudarchive.list
deb http://ubuntu-cloud.archive.canonical.com/ubuntu jammy-updates/caracal main
diff --git a/zuul.d/container-images/barbican.yaml b/zuul.d/container-images/barbican.yaml
index 3a9caa8..e2ecc40 100644
--- a/zuul.d/container-images/barbican.yaml
+++ b/zuul.d/container-images/barbican.yaml
@@ -44,10 +44,11 @@
container_images:
- context: images/barbican
registry: harbor.atmosphere.dev
- repository: harbor.atmosphere.dev/library/barbican
+ repository: "{{ container_registry }}/barbican"
arch:
- linux/amd64
build_args:
+ - REGISTRY={{ container_registry }}
- "RELEASE={{ zuul.branch | replace('stable/', '') }}"
- PROJECT=barbican
tags:
diff --git a/zuul.d/container-images/cinder.yaml b/zuul.d/container-images/cinder.yaml
index a755adf..e039bda 100644
--- a/zuul.d/container-images/cinder.yaml
+++ b/zuul.d/container-images/cinder.yaml
@@ -44,10 +44,11 @@
container_images:
- context: images/cinder
registry: harbor.atmosphere.dev
- repository: harbor.atmosphere.dev/library/cinder
+ repository: "{{ container_registry }}/cinder"
arch:
- linux/amd64
build_args:
+ - REGISTRY={{ container_registry }}
- "RELEASE={{ zuul.branch | replace('stable/', '') }}"
- PROJECT=cinder
tags:
diff --git a/zuul.d/container-images/designate.yaml b/zuul.d/container-images/designate.yaml
index 41be3a7..fd02908 100644
--- a/zuul.d/container-images/designate.yaml
+++ b/zuul.d/container-images/designate.yaml
@@ -44,10 +44,11 @@
container_images:
- context: images/designate
registry: harbor.atmosphere.dev
- repository: harbor.atmosphere.dev/library/designate
+ repository: "{{ container_registry }}/designate"
arch:
- linux/amd64
build_args:
+ - REGISTRY={{ container_registry }}
- "RELEASE={{ zuul.branch | replace('stable/', '') }}"
- PROJECT=designate
tags:
diff --git a/zuul.d/container-images/glance.yaml b/zuul.d/container-images/glance.yaml
index f158d35..411b5a4 100644
--- a/zuul.d/container-images/glance.yaml
+++ b/zuul.d/container-images/glance.yaml
@@ -44,10 +44,11 @@
container_images:
- context: images/glance
registry: harbor.atmosphere.dev
- repository: harbor.atmosphere.dev/library/glance
+ repository: "{{ container_registry }}/glance"
arch:
- linux/amd64
build_args:
+ - REGISTRY={{ container_registry }}
- "RELEASE={{ zuul.branch | replace('stable/', '') }}"
- PROJECT=glance
tags:
diff --git a/zuul.d/container-images/heat.yaml b/zuul.d/container-images/heat.yaml
index 4c2fd87..98b3d2c 100644
--- a/zuul.d/container-images/heat.yaml
+++ b/zuul.d/container-images/heat.yaml
@@ -44,10 +44,11 @@
container_images:
- context: images/heat
registry: harbor.atmosphere.dev
- repository: harbor.atmosphere.dev/library/heat
+ repository: "{{ container_registry }}/heat"
arch:
- linux/amd64
build_args:
+ - REGISTRY={{ container_registry }}
- "RELEASE={{ zuul.branch | replace('stable/', '') }}"
- PROJECT=heat
tags:
diff --git a/zuul.d/container-images/horizon.yaml b/zuul.d/container-images/horizon.yaml
index d3a713e..eb8872b 100644
--- a/zuul.d/container-images/horizon.yaml
+++ b/zuul.d/container-images/horizon.yaml
@@ -44,10 +44,11 @@
container_images:
- context: images/horizon
registry: harbor.atmosphere.dev
- repository: harbor.atmosphere.dev/library/horizon
+ repository: "{{ container_registry }}/horizon"
arch:
- linux/amd64
build_args:
+ - REGISTRY={{ container_registry }}
- "RELEASE={{ zuul.branch | replace('stable/', '') }}"
- PROJECT=horizon
tags:
diff --git a/zuul.d/container-images/ironic.yaml b/zuul.d/container-images/ironic.yaml
index 18403e0..33a0d4d 100644
--- a/zuul.d/container-images/ironic.yaml
+++ b/zuul.d/container-images/ironic.yaml
@@ -44,10 +44,11 @@
container_images:
- context: images/ironic
registry: harbor.atmosphere.dev
- repository: harbor.atmosphere.dev/library/ironic
+ repository: "{{ container_registry }}/ironic"
arch:
- linux/amd64
build_args:
+ - REGISTRY={{ container_registry }}
- "RELEASE={{ zuul.branch | replace('stable/', '') }}"
- PROJECT=ironic
tags:
diff --git a/zuul.d/container-images/keepalived.yaml b/zuul.d/container-images/keepalived.yaml
index e4f55ce..31e4a6c 100644
--- a/zuul.d/container-images/keepalived.yaml
+++ b/zuul.d/container-images/keepalived.yaml
@@ -36,10 +36,11 @@
container_images:
- context: images/keepalived
registry: harbor.atmosphere.dev
- repository: harbor.atmosphere.dev/library/keepalived
+ repository: "{{ container_registry }}/keepalived"
arch:
- linux/amd64
build_args:
+ - REGISTRY={{ container_registry }}
- "RELEASE={{ zuul.branch | replace('stable/', '') }}"
tags:
- "{{ zuul.branch | replace('stable/', '') }}"
diff --git a/zuul.d/container-images/keystone.yaml b/zuul.d/container-images/keystone.yaml
index d3bc1b7..39d9d10 100644
--- a/zuul.d/container-images/keystone.yaml
+++ b/zuul.d/container-images/keystone.yaml
@@ -44,10 +44,11 @@
container_images:
- context: images/keystone
registry: harbor.atmosphere.dev
- repository: harbor.atmosphere.dev/library/keystone
+ repository: "{{ container_registry }}/keystone"
arch:
- linux/amd64
build_args:
+ - REGISTRY={{ container_registry }}
- "RELEASE={{ zuul.branch | replace('stable/', '') }}"
- PROJECT=keystone
tags:
diff --git a/zuul.d/container-images/kubernetes-entrypoint.yaml b/zuul.d/container-images/kubernetes-entrypoint.yaml
index 03a2a39..8a1132f 100644
--- a/zuul.d/container-images/kubernetes-entrypoint.yaml
+++ b/zuul.d/container-images/kubernetes-entrypoint.yaml
@@ -34,7 +34,7 @@
container_images:
- context: images/kubernetes-entrypoint
registry: harbor.atmosphere.dev
- repository: harbor.atmosphere.dev/library/kubernetes-entrypoint
+ repository: "{{ container_registry }}/kubernetes-entrypoint"
arch:
- linux/amd64
- linux/arm64
diff --git a/zuul.d/container-images/libvirtd.yaml b/zuul.d/container-images/libvirtd.yaml
index fc34df0..9b2596b 100644
--- a/zuul.d/container-images/libvirtd.yaml
+++ b/zuul.d/container-images/libvirtd.yaml
@@ -40,11 +40,12 @@
container_images:
- context: images/libvirtd
registry: harbor.atmosphere.dev
- repository: harbor.atmosphere.dev/library/libvirtd
+ repository: "{{ container_registry }}/libvirtd"
arch:
- linux/amd64
- linux/arm64
build_args:
+ - REGISTRY={{ container_registry }}
- "RELEASE={{ zuul.branch | replace('stable/', '') }}"
- PROJECT=nova
tags:
diff --git a/zuul.d/container-images/magnum.yaml b/zuul.d/container-images/magnum.yaml
index 2772c95..71001a5 100644
--- a/zuul.d/container-images/magnum.yaml
+++ b/zuul.d/container-images/magnum.yaml
@@ -44,11 +44,12 @@
container_images:
- context: images/magnum
registry: harbor.atmosphere.dev
- repository: harbor.atmosphere.dev/library/magnum
+ repository: "{{ container_registry }}/magnum"
arch:
- linux/amd64
- linux/arm64
build_args:
+ - REGISTRY={{ container_registry }}
- "RELEASE={{ zuul.branch | replace('stable/', '') }}"
- PROJECT=magnum
tags:
diff --git a/zuul.d/container-images/manila.yaml b/zuul.d/container-images/manila.yaml
index 893f9fe..f82fdea 100644
--- a/zuul.d/container-images/manila.yaml
+++ b/zuul.d/container-images/manila.yaml
@@ -44,10 +44,11 @@
container_images:
- context: images/manila
registry: harbor.atmosphere.dev
- repository: harbor.atmosphere.dev/library/manila
+ repository: "{{ container_registry }}/manila"
arch:
- linux/amd64
build_args:
+ - REGISTRY={{ container_registry }}
- "RELEASE={{ zuul.branch | replace('stable/', '') }}"
- PROJECT=manila
tags:
diff --git a/zuul.d/container-images/netoffload.yaml b/zuul.d/container-images/netoffload.yaml
index 4e23e9e..4494d44 100644
--- a/zuul.d/container-images/netoffload.yaml
+++ b/zuul.d/container-images/netoffload.yaml
@@ -36,10 +36,11 @@
container_images:
- context: images/netoffload
registry: harbor.atmosphere.dev
- repository: harbor.atmosphere.dev/library/netoffload
+ repository: "{{ container_registry }}/netoffload"
arch:
- linux/amd64
build_args:
+ - REGISTRY={{ container_registry }}
- "RELEASE={{ zuul.branch | replace('stable/', '') }}"
tags:
- "{{ zuul.branch | replace('stable/', '') }}"
diff --git a/zuul.d/container-images/neutron.yaml b/zuul.d/container-images/neutron.yaml
index 54594fd..b8dabca 100644
--- a/zuul.d/container-images/neutron.yaml
+++ b/zuul.d/container-images/neutron.yaml
@@ -44,11 +44,12 @@
container_images:
- context: images/neutron
registry: harbor.atmosphere.dev
- repository: harbor.atmosphere.dev/library/neutron
+ repository: "{{ container_registry }}/neutron"
arch:
- linux/amd64
- linux/arm64
build_args:
+ - REGISTRY={{ container_registry }}
- "RELEASE={{ zuul.branch | replace('stable/', '') }}"
- PROJECT=neutron
tags:
diff --git a/zuul.d/container-images/nova-ssh.yaml b/zuul.d/container-images/nova-ssh.yaml
index 5d3e337..d60275d 100644
--- a/zuul.d/container-images/nova-ssh.yaml
+++ b/zuul.d/container-images/nova-ssh.yaml
@@ -40,11 +40,12 @@
container_images:
- context: images/nova-ssh
registry: harbor.atmosphere.dev
- repository: harbor.atmosphere.dev/library/nova-ssh
+ repository: "{{ container_registry }}/nova-ssh"
arch:
- linux/amd64
- linux/arm64
build_args:
+ - REGISTRY={{ container_registry }}
- "RELEASE={{ zuul.branch | replace('stable/', '') }}"
- PROJECT=nova
- SHELL=/bin/bash
diff --git a/zuul.d/container-images/nova.yaml b/zuul.d/container-images/nova.yaml
index f377b8a..b037875 100644
--- a/zuul.d/container-images/nova.yaml
+++ b/zuul.d/container-images/nova.yaml
@@ -44,11 +44,12 @@
container_images:
- context: images/nova
registry: harbor.atmosphere.dev
- repository: harbor.atmosphere.dev/library/nova
+ repository: "{{ container_registry }}/nova"
arch:
- linux/amd64
- linux/arm64
build_args:
+ - REGISTRY={{ container_registry }}
- "RELEASE={{ zuul.branch | replace('stable/', '') }}"
- PROJECT=nova
- SHELL=/bin/bash
diff --git a/zuul.d/container-images/octavia.yaml b/zuul.d/container-images/octavia.yaml
index 7912168..6710cb8 100644
--- a/zuul.d/container-images/octavia.yaml
+++ b/zuul.d/container-images/octavia.yaml
@@ -44,10 +44,11 @@
container_images:
- context: images/octavia
registry: harbor.atmosphere.dev
- repository: harbor.atmosphere.dev/library/octavia
+ repository: "{{ container_registry }}/octavia"
arch:
- linux/amd64
build_args:
+ - REGISTRY={{ container_registry }}
- "RELEASE={{ zuul.branch | replace('stable/', '') }}"
- PROJECT=octavia
tags:
diff --git a/zuul.d/container-images/openstack-python-runtime.yaml b/zuul.d/container-images/openstack-python-runtime.yaml
index eaa403c..6256cb5 100644
--- a/zuul.d/container-images/openstack-python-runtime.yaml
+++ b/zuul.d/container-images/openstack-python-runtime.yaml
@@ -40,13 +40,14 @@
container_images:
- context: images/openstack-runtime
registry: harbor.atmosphere.dev
- repository: harbor.atmosphere.dev/library/openstack-python-runtime
+ repository: "{{ container_registry }}/openstack-python-runtime"
arch:
- linux/amd64
- linux/arm64
build_args:
+ - REGISTRY={{ container_registry }}
- "RELEASE={{ zuul.branch | replace('stable/', '') }}"
- - "FROM=harbor.atmosphere.dev/library/python-base:{{ zuul.branch | replace('stable/', '') }}"
+ - "FROM={{ container_registry }}/python-base:{{ zuul.branch | replace('stable/', '') }}"
tags:
- "{{ zuul.branch | replace('stable/', '') }}"
files: &container_image_files
diff --git a/zuul.d/container-images/openstack-runtime.yaml b/zuul.d/container-images/openstack-runtime.yaml
index 33f5298..35a1b06 100644
--- a/zuul.d/container-images/openstack-runtime.yaml
+++ b/zuul.d/container-images/openstack-runtime.yaml
@@ -38,11 +38,12 @@
container_images:
- context: images/openstack-runtime
registry: harbor.atmosphere.dev
- repository: harbor.atmosphere.dev/library/openstack-runtime
+ repository: "{{ container_registry }}/openstack-runtime"
arch:
- linux/amd64
- linux/arm64
build_args:
+ - REGISTRY={{ container_registry }}
- "RELEASE={{ zuul.branch | replace('stable/', '') }}"
tags:
- "{{ zuul.branch | replace('stable/', '') }}"
diff --git a/zuul.d/container-images/openstack-venv-builder.yaml b/zuul.d/container-images/openstack-venv-builder.yaml
index 844d203..c042bf8 100644
--- a/zuul.d/container-images/openstack-venv-builder.yaml
+++ b/zuul.d/container-images/openstack-venv-builder.yaml
@@ -40,11 +40,12 @@
container_images:
- context: images/openstack-venv-builder
registry: harbor.atmosphere.dev
- repository: harbor.atmosphere.dev/library/openstack-venv-builder
+ repository: "{{ container_registry }}/openstack-venv-builder"
arch:
- linux/amd64
- linux/arm64
build_args:
+ - REGISTRY={{ container_registry }}
- "RELEASE={{ zuul.branch | replace('stable/', '') }}"
tags:
- "{{ zuul.branch | replace('stable/', '') }}"
diff --git a/zuul.d/container-images/openvswitch.yaml b/zuul.d/container-images/openvswitch.yaml
index f11caec..2ebec04 100644
--- a/zuul.d/container-images/openvswitch.yaml
+++ b/zuul.d/container-images/openvswitch.yaml
@@ -34,7 +34,7 @@
container_images:
- context: images/openvswitch
registry: harbor.atmosphere.dev
- repository: harbor.atmosphere.dev/library/openvswitch
+ repository: "{{ container_registry }}/openvswitch"
arch:
- linux/amd64
- linux/arm64
diff --git a/zuul.d/container-images/ovn.yaml b/zuul.d/container-images/ovn.yaml
index 83d4aca..07fa151 100644
--- a/zuul.d/container-images/ovn.yaml
+++ b/zuul.d/container-images/ovn.yaml
@@ -36,21 +36,23 @@
container_images:
- context: images/ovn
registry: harbor.atmosphere.dev
- repository: harbor.atmosphere.dev/library/ovn-central
+ repository: "{{ container_registry }}/ovn-central"
arch:
- linux/amd64
build_args:
+ - REGISTRY={{ container_registry }}
- "RELEASE={{ zuul.branch | replace('stable/', '') }}"
- OVN_COMPONENT=central
tags:
- "{{ zuul.branch | replace('stable/', '') }}"
- context: images/ovn
registry: harbor.atmosphere.dev
- repository: harbor.atmosphere.dev/library/ovn-host
+ repository: "{{ container_registry }}/ovn-host"
arch:
- linux/amd64
- linux/arm64
build_args:
+ - REGISTRY={{ container_registry }}
- "RELEASE={{ zuul.branch | replace('stable/', '') }}"
- OVN_COMPONENT=host
tags:
diff --git a/zuul.d/container-images/placement.yaml b/zuul.d/container-images/placement.yaml
index c892dc4..945f341 100644
--- a/zuul.d/container-images/placement.yaml
+++ b/zuul.d/container-images/placement.yaml
@@ -44,10 +44,11 @@
container_images:
- context: images/placement
registry: harbor.atmosphere.dev
- repository: harbor.atmosphere.dev/library/placement
+ repository: "{{ container_registry }}/placement"
arch:
- linux/amd64
build_args:
+ - REGISTRY={{ container_registry }}
- "RELEASE={{ zuul.branch | replace('stable/', '') }}"
- PROJECT=placement
tags:
diff --git a/zuul.d/container-images/python-base.yaml b/zuul.d/container-images/python-base.yaml
index dae0fd3..90e5acf 100644
--- a/zuul.d/container-images/python-base.yaml
+++ b/zuul.d/container-images/python-base.yaml
@@ -38,11 +38,12 @@
container_images:
- context: images/python-base
registry: harbor.atmosphere.dev
- repository: harbor.atmosphere.dev/library/python-base
+ repository: "{{ container_registry }}/python-base"
arch:
- linux/amd64
- linux/arm64
build_args:
+ - REGISTRY={{ container_registry }}
- "RELEASE={{ zuul.branch | replace('stable/', '') }}"
tags:
- "{{ zuul.branch | replace('stable/', '') }}"
diff --git a/zuul.d/container-images/python-openstackclient.yaml b/zuul.d/container-images/python-openstackclient.yaml
index f05b9b5..cfb9826 100644
--- a/zuul.d/container-images/python-openstackclient.yaml
+++ b/zuul.d/container-images/python-openstackclient.yaml
@@ -42,10 +42,11 @@
container_images:
- context: images/python-openstackclient
registry: harbor.atmosphere.dev
- repository: harbor.atmosphere.dev/library/python-openstackclient
+ repository: "{{ container_registry }}/python-openstackclient"
arch:
- linux/amd64
build_args:
+ - REGISTRY={{ container_registry }}
- "RELEASE={{ zuul.branch | replace('stable/', '') }}"
tags:
- "{{ zuul.branch | replace('stable/', '') }}"
diff --git a/zuul.d/container-images/staffeln.yaml b/zuul.d/container-images/staffeln.yaml
index 30cb920..77200c2 100644
--- a/zuul.d/container-images/staffeln.yaml
+++ b/zuul.d/container-images/staffeln.yaml
@@ -44,10 +44,11 @@
container_images:
- context: images/staffeln
registry: harbor.atmosphere.dev
- repository: harbor.atmosphere.dev/library/staffeln
+ repository: "{{ container_registry }}/staffeln"
arch:
- linux/amd64
build_args:
+ - REGISTRY={{ container_registry }}
- "RELEASE={{ zuul.branch | replace('stable/', '') }}"
- PROJECT=staffeln
tags:
diff --git a/zuul.d/container-images/tempest.yaml b/zuul.d/container-images/tempest.yaml
index ead0bdb..22dd426 100644
--- a/zuul.d/container-images/tempest.yaml
+++ b/zuul.d/container-images/tempest.yaml
@@ -44,10 +44,11 @@
container_images:
- context: images/tempest
registry: harbor.atmosphere.dev
- repository: harbor.atmosphere.dev/library/tempest
+ repository: "{{ container_registry }}/tempest"
arch:
- linux/amd64
build_args:
+ - REGISTRY={{ container_registry }}
- "RELEASE={{ zuul.branch | replace('stable/', '') }}"
- PROJECT=tempest
tags:
diff --git a/zuul.d/container-images/ubuntu-cloud-archive.yaml b/zuul.d/container-images/ubuntu-cloud-archive.yaml
index aab44f8..69e826e 100644
--- a/zuul.d/container-images/ubuntu-cloud-archive.yaml
+++ b/zuul.d/container-images/ubuntu-cloud-archive.yaml
@@ -36,11 +36,12 @@
container_images:
- context: images/ubuntu-cloud-archive
registry: harbor.atmosphere.dev
- repository: harbor.atmosphere.dev/library/ubuntu-cloud-archive
+ repository: "{{ container_registry }}/ubuntu-cloud-archive"
arch:
- linux/amd64
- linux/arm64
build_args:
+ - REGISTRY={{ container_registry }}
- "RELEASE={{ zuul.branch | replace('stable/', '') }}"
tags:
- "{{ zuul.branch | replace('stable/', '') }}"
diff --git a/zuul.d/container-images/ubuntu.yaml b/zuul.d/container-images/ubuntu.yaml
index 6c90f69..2b54f92 100644
--- a/zuul.d/container-images/ubuntu.yaml
+++ b/zuul.d/container-images/ubuntu.yaml
@@ -34,11 +34,12 @@
container_images:
- context: images/ubuntu
registry: harbor.atmosphere.dev
- repository: harbor.atmosphere.dev/library/ubuntu
+ repository: "{{ container_registry }}/ubuntu"
arch:
- linux/amd64
- linux/arm64
build_args:
+ - REGISTRY={{ container_registry }}
- "RELEASE={{ zuul.branch | replace('stable/', '') }}"
tags:
- "{{ zuul.branch | replace('stable/', '') }}"
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index b9c97e5..c28e328 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -157,3 +157,5 @@
dependencies: *molecule_check_dependencies
- atmosphere-molecule-aio-upgrade-ovn:
dependencies: *molecule_check_dependencies
+ vars:
+ container_registry: harbor.atmosphere.dev/library