airship/porthole
Code Issues Proposed changes

Improve 004-make-images script

Browse Source 
Enhance the script to build local images by passing the
appropriate environment variables supported by Makefile

Change-Id: Ibab99b725cad77891064105d37b46105eb8fd747
This commit is contained in:
astebenkova 2024-05-21 12:36:39 +03:00
parent f543332804
commit 80f3dfd08d
22 changed files with 24 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charts/calicoctl-utility/values_overrides/images-ubuntu_bionic.yaml
View File

@ -1,5 +1,5 @@
--- ---
images: images:
tags: tags:
calicoctl_utility: localhost:5000/porthole-calicoctl-utility:latest-ubuntu_bionic calicoctl_utility: localhost:5000/airshipit/porthole-calicoctl-utility:latest-ubuntu_bionic
... ...

2
charts/calicoctl-utility/values_overrides/images-ubuntu_focal.yaml
View File

@ -1,5 +1,5 @@
--- ---
images: images:
tags: tags:
calicoctl_utility: localhost:5000/porthole-calicoctl-utility:latest-ubuntu_focal calicoctl_utility: localhost:5000/airshipit/porthole-calicoctl-utility:latest-ubuntu_focal
... ...

2
charts/calicoctl-utility/values_overrides/images-ubuntu_jammy.yaml
View File

@ -1,5 +1,5 @@
--- ---
images: images:
tags: tags:
calicoctl_utility: localhost:5000/porthole-calicoctl-utility:latest-ubuntu_jammy calicoctl_utility: localhost:5000/airshipit/porthole-calicoctl-utility:latest-ubuntu_jammy
... ...

2
charts/ceph-utility/values_overrides/images-ubuntu_bionic.yaml
View File

@ -1,5 +1,5 @@
--- ---
images: images:
tags: tags:
ceph_utility: localhost:5000/porthole-ceph-utility:latest-ubuntu_bionic ceph_utility: localhost:5000/airshipit/porthole-ceph-utility:latest-ubuntu_bionic
... ...

2
charts/ceph-utility/values_overrides/images-ubuntu_focal.yaml
View File

@ -1,5 +1,5 @@
--- ---
images: images:
tags: tags:
ceph_utility: localhost:5000/porthole-ceph-utility:latest-ubuntu_focal ceph_utility: localhost:5000/airshipit/porthole-ceph-utility:latest-ubuntu_focal
... ...

2
charts/ceph-utility/values_overrides/images-ubuntu_jammy.yaml
View File

@ -1,5 +1,5 @@
--- ---
images: images:
tags: tags:
ceph_utility: localhost:5000/porthole-ceph-utility:latest-ubuntu_jammy ceph_utility: localhost:5000/airshipit/porthole-ceph-utility:latest-ubuntu_jammy
... ...

2
charts/compute-utility/values_overrides/images-ubuntu_bionic.yaml
View File

@ -1,5 +1,5 @@
--- ---
images: images:
tags: tags:
compute_utility: localhost:5000/porthole-compute-utility:latest-ubuntu_bionic compute_utility: localhost:5000/airshipit/porthole-compute-utility:latest-ubuntu_bionic
... ...

2
charts/compute-utility/values_overrides/images-ubuntu_focal.yaml
View File

@ -1,5 +1,5 @@
--- ---
images: images:
tags: tags:
compute_utility: localhost:5000/porthole-compute-utility:latest-ubuntu_focal compute_utility: localhost:5000/airshipit/porthole-compute-utility:latest-ubuntu_focal
... ...

2
charts/compute-utility/values_overrides/images-ubuntu_jammy.yaml
View File

@ -1,5 +1,5 @@
--- ---
images: images:
tags: tags:
compute_utility: localhost:5000/porthole-compute-utility:latest-ubuntu_jammy compute_utility: localhost:5000/airshipit/porthole-compute-utility:latest-ubuntu_jammy
... ...

2
charts/etcdctl-utility/values_overrides/images-ubuntu_bionic.yaml
View File

@ -1,5 +1,5 @@
--- ---
images: images:
tags: tags:
etcdctl_utility: localhost:5000/porthole-etcdctl-utility:latest-ubuntu_bionic etcdctl_utility: localhost:5000/airshipit/porthole-etcdctl-utility:latest-ubuntu_bionic
... ...

2
charts/etcdctl-utility/values_overrides/images-ubuntu_focal.yaml
View File

@ -1,5 +1,5 @@
--- ---
images: images:
tags: tags:
etcdctl_utility: localhost:5000/porthole-etcdctl-utility:latest-ubuntu_focal etcdctl_utility: localhost:5000/airshipit/porthole-etcdctl-utility:latest-ubuntu_focal
... ...

2
charts/etcdctl-utility/values_overrides/images-ubuntu_jammy.yaml
View File

@ -1,5 +1,5 @@
--- ---
images: images:
tags: tags:
etcdctl_utility: localhost:5000/porthole-etcdctl-utility:latest-ubuntu_jammy etcdctl_utility: localhost:5000/airshipit/porthole-etcdctl-utility:latest-ubuntu_jammy
... ...

2
charts/mysqlclient-utility/values_overrides/images-ubuntu_bionic.yaml
View File

@ -1,5 +1,5 @@
--- ---
images: images:
tags: tags:
mysqlclient_utility: localhost:5000/porthole-mysqlclient-utility:latest-ubuntu_bionic mysqlclient_utility: localhost:5000/airshipit/porthole-mysqlclient-utility:latest-ubuntu_bionic
... ...

2
charts/mysqlclient-utility/values_overrides/images-ubuntu_focal.yaml
View File

@ -1,5 +1,5 @@
--- ---
images: images:
tags: tags:
mysqlclient_utility: localhost:5000/porthole-mysqlclient-utility:latest-ubuntu_focal mysqlclient_utility: localhost:5000/airshipit/porthole-mysqlclient-utility:latest-ubuntu_focal
... ...

2
charts/mysqlclient-utility/values_overrides/images-ubuntu_jammy.yaml
View File

@ -1,5 +1,5 @@
--- ---
images: images:
tags: tags:
mysqlclient_utility: localhost:5000/porthole-mysqlclient-utility:latest-ubuntu_jammy mysqlclient_utility: localhost:5000/airshipit/porthole-mysqlclient-utility:latest-ubuntu_jammy
... ...

2
charts/openstack-utility/values_overrides/images-ubuntu_bionic.yaml
View File

@ -1,5 +1,5 @@
--- ---
images: images:
tags: tags:
openstack_utility: localhost:5000/porthole-openstack-utility:latest-ubuntu_bionic openstack_utility: localhost:5000/airshipit/porthole-openstack-utility:latest-ubuntu_bionic
... ...

2
charts/openstack-utility/values_overrides/images-ubuntu_focal.yaml
View File

@ -1,5 +1,5 @@
--- ---
images: images:
tags: tags:
openstack_utility: localhost:5000/porthole-openstack-utility:latest-ubuntu_focal openstack_utility: localhost:5000/airshipit/porthole-openstack-utility:latest-ubuntu_focal
... ...

2
charts/openstack-utility/values_overrides/images-ubuntu_jammy.yaml
View File

@ -1,5 +1,5 @@
--- ---
images: images:
tags: tags:
openstack_utility: localhost:5000/porthole-openstack-utility:latest-ubuntu_jammy openstack_utility: localhost:5000/airshipit/porthole-openstack-utility:latest-ubuntu_jammy
... ...

2
charts/postgresql-utility/values_overrides/images-ubuntu_bionic.yaml
View File

@ -1,5 +1,5 @@
--- ---
images: images:
tags: tags:
postgresql_utility: localhost:5000/porthole-postgresql-utility:latest-ubuntu_bionic postgresql_utility: localhost:5000/airshipit/porthole-postgresql-utility:latest-ubuntu_bionic
... ...

2
charts/postgresql-utility/values_overrides/images-ubuntu_focal.yaml
View File

@ -1,5 +1,5 @@
--- ---
images: images:
tags: tags:
postgresql_utility: localhost:5000/porthole-postgresql-utility:latest-ubuntu_focal postgresql_utility: localhost:5000/airshipit/porthole-postgresql-utility:latest-ubuntu_focal
... ...

2
charts/postgresql-utility/values_overrides/images-ubuntu_jammy.yaml
View File

@ -1,5 +1,5 @@
--- ---
images: images:
tags: tags:
postgresql_utility: localhost:5000/porthole-postgresql-utility:latest-ubuntu_jammy postgresql_utility: localhost:5000/airshipit/porthole-postgresql-utility:latest-ubuntu_jammy
... ...

20
tools/deployment/004-make-images.sh
View File

@ -17,25 +17,11 @@ set -x
: "${DISTRO:="ubuntu_focal"}" : "${DISTRO:="ubuntu_focal"}"
env env
make images
echo "[*] Deploy local docker registry..."
docker rm registry --force || true docker rm registry --force || true
docker run -d -p 5000:5000 --restart=always --name registry registry:2 docker run -d -p 5000:5000 --restart=always --name registry registry:2
docker tag quay.io/airshipit/porthole-calicoctl-utility:latest-${DISTRO} localhost:5000/porthole-calicoctl-utility:latest-${DISTRO} echo "[*] Build images and push them to local docker registry..."
docker tag quay.io/airshipit/porthole-ceph-utility:latest-${DISTRO} localhost:5000/porthole-ceph-utility:latest-${DISTRO} make images -e DOCKER_REGISTRY="localhost:5000" -e PUSH_IMAGE=true
docker tag quay.io/airshipit/porthole-compute-utility:latest-${DISTRO} localhost:5000/porthole-compute-utility:latest-${DISTRO}
docker tag quay.io/airshipit/porthole-etcdctl-utility:latest-${DISTRO} localhost:5000/porthole-etcdctl-utility:latest-${DISTRO}
docker tag quay.io/airshipit/porthole-mysqlclient-utility:latest-${DISTRO} localhost:5000/porthole-mysqlclient-utility:latest-${DISTRO}
docker tag quay.io/airshipit/porthole-openstack-utility:latest-${DISTRO} localhost:5000/porthole-openstack-utility:latest-${DISTRO}
docker tag quay.io/airshipit/porthole-postgresql-utility:latest-${DISTRO} localhost:5000/porthole-postgresql-utility:latest-${DISTRO}
docker push localhost:5000/porthole-calicoctl-utility:latest-${DISTRO}
docker push localhost:5000/porthole-ceph-utility:latest-${DISTRO}
docker push localhost:5000/porthole-compute-utility:latest-${DISTRO}
docker push localhost:5000/porthole-etcdctl-utility:latest-${DISTRO}
docker push localhost:5000/porthole-mysqlclient-utility:latest-${DISTRO}
docker push localhost:5000/porthole-openstack-utility:latest-${DISTRO}
docker push localhost:5000/porthole-postgresql-utility:latest-${DISTRO}