diff --git a/charts/calicoctl-utility/values_overrides/images-ubuntu_bionic.yaml b/charts/calicoctl-utility/values_overrides/images-ubuntu_bionic.yaml index 3252d9a0..0ccf7c35 100644 --- a/charts/calicoctl-utility/values_overrides/images-ubuntu_bionic.yaml +++ b/charts/calicoctl-utility/values_overrides/images-ubuntu_bionic.yaml @@ -1,5 +1,5 @@ --- images: tags: - calicoctl_utility: localhost:5000/porthole-calicoctl-utility:latest-ubuntu_bionic + calicoctl_utility: localhost:5000/airshipit/porthole-calicoctl-utility:latest-ubuntu_bionic ... \ No newline at end of file diff --git a/charts/calicoctl-utility/values_overrides/images-ubuntu_focal.yaml b/charts/calicoctl-utility/values_overrides/images-ubuntu_focal.yaml index b666b6d8..07e0f93c 100644 --- a/charts/calicoctl-utility/values_overrides/images-ubuntu_focal.yaml +++ b/charts/calicoctl-utility/values_overrides/images-ubuntu_focal.yaml @@ -1,5 +1,5 @@ --- images: tags: - calicoctl_utility: localhost:5000/porthole-calicoctl-utility:latest-ubuntu_focal + calicoctl_utility: localhost:5000/airshipit/porthole-calicoctl-utility:latest-ubuntu_focal ... \ No newline at end of file diff --git a/charts/calicoctl-utility/values_overrides/images-ubuntu_jammy.yaml b/charts/calicoctl-utility/values_overrides/images-ubuntu_jammy.yaml index 24011e22..d025da6c 100644 --- a/charts/calicoctl-utility/values_overrides/images-ubuntu_jammy.yaml +++ b/charts/calicoctl-utility/values_overrides/images-ubuntu_jammy.yaml @@ -1,5 +1,5 @@ --- images: tags: - calicoctl_utility: localhost:5000/porthole-calicoctl-utility:latest-ubuntu_jammy + calicoctl_utility: localhost:5000/airshipit/porthole-calicoctl-utility:latest-ubuntu_jammy ... \ No newline at end of file diff --git a/charts/ceph-utility/values_overrides/images-ubuntu_bionic.yaml b/charts/ceph-utility/values_overrides/images-ubuntu_bionic.yaml index 40f6be3d..eba98c5c 100644 --- a/charts/ceph-utility/values_overrides/images-ubuntu_bionic.yaml +++ b/charts/ceph-utility/values_overrides/images-ubuntu_bionic.yaml @@ -1,5 +1,5 @@ --- images: tags: - ceph_utility: localhost:5000/porthole-ceph-utility:latest-ubuntu_bionic + ceph_utility: localhost:5000/airshipit/porthole-ceph-utility:latest-ubuntu_bionic ... \ No newline at end of file diff --git a/charts/ceph-utility/values_overrides/images-ubuntu_focal.yaml b/charts/ceph-utility/values_overrides/images-ubuntu_focal.yaml index c6a0b44e..2a1ba5a9 100644 --- a/charts/ceph-utility/values_overrides/images-ubuntu_focal.yaml +++ b/charts/ceph-utility/values_overrides/images-ubuntu_focal.yaml @@ -1,5 +1,5 @@ --- images: tags: - ceph_utility: localhost:5000/porthole-ceph-utility:latest-ubuntu_focal + ceph_utility: localhost:5000/airshipit/porthole-ceph-utility:latest-ubuntu_focal ... \ No newline at end of file diff --git a/charts/ceph-utility/values_overrides/images-ubuntu_jammy.yaml b/charts/ceph-utility/values_overrides/images-ubuntu_jammy.yaml index 092db3f9..fa85bb94 100644 --- a/charts/ceph-utility/values_overrides/images-ubuntu_jammy.yaml +++ b/charts/ceph-utility/values_overrides/images-ubuntu_jammy.yaml @@ -1,5 +1,5 @@ --- images: tags: - ceph_utility: localhost:5000/porthole-ceph-utility:latest-ubuntu_jammy + ceph_utility: localhost:5000/airshipit/porthole-ceph-utility:latest-ubuntu_jammy ... \ No newline at end of file diff --git a/charts/compute-utility/values_overrides/images-ubuntu_bionic.yaml b/charts/compute-utility/values_overrides/images-ubuntu_bionic.yaml index e1bcbcd4..1545e9d7 100644 --- a/charts/compute-utility/values_overrides/images-ubuntu_bionic.yaml +++ b/charts/compute-utility/values_overrides/images-ubuntu_bionic.yaml @@ -1,5 +1,5 @@ --- images: tags: - compute_utility: localhost:5000/porthole-compute-utility:latest-ubuntu_bionic + compute_utility: localhost:5000/airshipit/porthole-compute-utility:latest-ubuntu_bionic ... \ No newline at end of file diff --git a/charts/compute-utility/values_overrides/images-ubuntu_focal.yaml b/charts/compute-utility/values_overrides/images-ubuntu_focal.yaml index 1be7a594..ede6c9ad 100644 --- a/charts/compute-utility/values_overrides/images-ubuntu_focal.yaml +++ b/charts/compute-utility/values_overrides/images-ubuntu_focal.yaml @@ -1,5 +1,5 @@ --- images: tags: - compute_utility: localhost:5000/porthole-compute-utility:latest-ubuntu_focal + compute_utility: localhost:5000/airshipit/porthole-compute-utility:latest-ubuntu_focal ... \ No newline at end of file diff --git a/charts/compute-utility/values_overrides/images-ubuntu_jammy.yaml b/charts/compute-utility/values_overrides/images-ubuntu_jammy.yaml index 084ae7d5..71fbcaf4 100644 --- a/charts/compute-utility/values_overrides/images-ubuntu_jammy.yaml +++ b/charts/compute-utility/values_overrides/images-ubuntu_jammy.yaml @@ -1,5 +1,5 @@ --- images: tags: - compute_utility: localhost:5000/porthole-compute-utility:latest-ubuntu_jammy + compute_utility: localhost:5000/airshipit/porthole-compute-utility:latest-ubuntu_jammy ... \ No newline at end of file diff --git a/charts/etcdctl-utility/values_overrides/images-ubuntu_bionic.yaml b/charts/etcdctl-utility/values_overrides/images-ubuntu_bionic.yaml index 003c43a8..e583aaad 100644 --- a/charts/etcdctl-utility/values_overrides/images-ubuntu_bionic.yaml +++ b/charts/etcdctl-utility/values_overrides/images-ubuntu_bionic.yaml @@ -1,5 +1,5 @@ --- images: tags: - etcdctl_utility: localhost:5000/porthole-etcdctl-utility:latest-ubuntu_bionic + etcdctl_utility: localhost:5000/airshipit/porthole-etcdctl-utility:latest-ubuntu_bionic ... \ No newline at end of file diff --git a/charts/etcdctl-utility/values_overrides/images-ubuntu_focal.yaml b/charts/etcdctl-utility/values_overrides/images-ubuntu_focal.yaml index 5d6d7c24..7751c7fe 100644 --- a/charts/etcdctl-utility/values_overrides/images-ubuntu_focal.yaml +++ b/charts/etcdctl-utility/values_overrides/images-ubuntu_focal.yaml @@ -1,5 +1,5 @@ --- images: tags: - etcdctl_utility: localhost:5000/porthole-etcdctl-utility:latest-ubuntu_focal + etcdctl_utility: localhost:5000/airshipit/porthole-etcdctl-utility:latest-ubuntu_focal ... \ No newline at end of file diff --git a/charts/etcdctl-utility/values_overrides/images-ubuntu_jammy.yaml b/charts/etcdctl-utility/values_overrides/images-ubuntu_jammy.yaml index 83ff0eed..195860c9 100644 --- a/charts/etcdctl-utility/values_overrides/images-ubuntu_jammy.yaml +++ b/charts/etcdctl-utility/values_overrides/images-ubuntu_jammy.yaml @@ -1,5 +1,5 @@ --- images: tags: - etcdctl_utility: localhost:5000/porthole-etcdctl-utility:latest-ubuntu_jammy + etcdctl_utility: localhost:5000/airshipit/porthole-etcdctl-utility:latest-ubuntu_jammy ... \ No newline at end of file diff --git a/charts/mysqlclient-utility/values_overrides/images-ubuntu_bionic.yaml b/charts/mysqlclient-utility/values_overrides/images-ubuntu_bionic.yaml index 4c807d08..8d04dbc4 100644 --- a/charts/mysqlclient-utility/values_overrides/images-ubuntu_bionic.yaml +++ b/charts/mysqlclient-utility/values_overrides/images-ubuntu_bionic.yaml @@ -1,5 +1,5 @@ --- images: tags: - mysqlclient_utility: localhost:5000/porthole-mysqlclient-utility:latest-ubuntu_bionic + mysqlclient_utility: localhost:5000/airshipit/porthole-mysqlclient-utility:latest-ubuntu_bionic ... \ No newline at end of file diff --git a/charts/mysqlclient-utility/values_overrides/images-ubuntu_focal.yaml b/charts/mysqlclient-utility/values_overrides/images-ubuntu_focal.yaml index d794bcac..b6155e2e 100644 --- a/charts/mysqlclient-utility/values_overrides/images-ubuntu_focal.yaml +++ b/charts/mysqlclient-utility/values_overrides/images-ubuntu_focal.yaml @@ -1,5 +1,5 @@ --- images: tags: - mysqlclient_utility: localhost:5000/porthole-mysqlclient-utility:latest-ubuntu_focal + mysqlclient_utility: localhost:5000/airshipit/porthole-mysqlclient-utility:latest-ubuntu_focal ... \ No newline at end of file diff --git a/charts/mysqlclient-utility/values_overrides/images-ubuntu_jammy.yaml b/charts/mysqlclient-utility/values_overrides/images-ubuntu_jammy.yaml index d1a6226f..8a551b7b 100644 --- a/charts/mysqlclient-utility/values_overrides/images-ubuntu_jammy.yaml +++ b/charts/mysqlclient-utility/values_overrides/images-ubuntu_jammy.yaml @@ -1,5 +1,5 @@ --- images: tags: - mysqlclient_utility: localhost:5000/porthole-mysqlclient-utility:latest-ubuntu_jammy + mysqlclient_utility: localhost:5000/airshipit/porthole-mysqlclient-utility:latest-ubuntu_jammy ... \ No newline at end of file diff --git a/charts/openstack-utility/values_overrides/images-ubuntu_bionic.yaml b/charts/openstack-utility/values_overrides/images-ubuntu_bionic.yaml index 4fe95227..1c96e243 100644 --- a/charts/openstack-utility/values_overrides/images-ubuntu_bionic.yaml +++ b/charts/openstack-utility/values_overrides/images-ubuntu_bionic.yaml @@ -1,5 +1,5 @@ --- images: tags: - openstack_utility: localhost:5000/porthole-openstack-utility:latest-ubuntu_bionic + openstack_utility: localhost:5000/airshipit/porthole-openstack-utility:latest-ubuntu_bionic ... \ No newline at end of file diff --git a/charts/openstack-utility/values_overrides/images-ubuntu_focal.yaml b/charts/openstack-utility/values_overrides/images-ubuntu_focal.yaml index 689e252b..8ec87579 100644 --- a/charts/openstack-utility/values_overrides/images-ubuntu_focal.yaml +++ b/charts/openstack-utility/values_overrides/images-ubuntu_focal.yaml @@ -1,5 +1,5 @@ --- images: tags: - openstack_utility: localhost:5000/porthole-openstack-utility:latest-ubuntu_focal + openstack_utility: localhost:5000/airshipit/porthole-openstack-utility:latest-ubuntu_focal ... \ No newline at end of file diff --git a/charts/openstack-utility/values_overrides/images-ubuntu_jammy.yaml b/charts/openstack-utility/values_overrides/images-ubuntu_jammy.yaml index 15662ac3..81ddd37a 100644 --- a/charts/openstack-utility/values_overrides/images-ubuntu_jammy.yaml +++ b/charts/openstack-utility/values_overrides/images-ubuntu_jammy.yaml @@ -1,5 +1,5 @@ --- images: tags: - openstack_utility: localhost:5000/porthole-openstack-utility:latest-ubuntu_jammy + openstack_utility: localhost:5000/airshipit/porthole-openstack-utility:latest-ubuntu_jammy ... \ No newline at end of file diff --git a/charts/postgresql-utility/values_overrides/images-ubuntu_bionic.yaml b/charts/postgresql-utility/values_overrides/images-ubuntu_bionic.yaml index 1bc6b163..f8982a3d 100644 --- a/charts/postgresql-utility/values_overrides/images-ubuntu_bionic.yaml +++ b/charts/postgresql-utility/values_overrides/images-ubuntu_bionic.yaml @@ -1,5 +1,5 @@ --- images: tags: - postgresql_utility: localhost:5000/porthole-postgresql-utility:latest-ubuntu_bionic + postgresql_utility: localhost:5000/airshipit/porthole-postgresql-utility:latest-ubuntu_bionic ... \ No newline at end of file diff --git a/charts/postgresql-utility/values_overrides/images-ubuntu_focal.yaml b/charts/postgresql-utility/values_overrides/images-ubuntu_focal.yaml index 45168bd2..f4f0f5d3 100644 --- a/charts/postgresql-utility/values_overrides/images-ubuntu_focal.yaml +++ b/charts/postgresql-utility/values_overrides/images-ubuntu_focal.yaml @@ -1,5 +1,5 @@ --- images: tags: - postgresql_utility: localhost:5000/porthole-postgresql-utility:latest-ubuntu_focal + postgresql_utility: localhost:5000/airshipit/porthole-postgresql-utility:latest-ubuntu_focal ... \ No newline at end of file diff --git a/charts/postgresql-utility/values_overrides/images-ubuntu_jammy.yaml b/charts/postgresql-utility/values_overrides/images-ubuntu_jammy.yaml index 25c122f2..46c71a87 100644 --- a/charts/postgresql-utility/values_overrides/images-ubuntu_jammy.yaml +++ b/charts/postgresql-utility/values_overrides/images-ubuntu_jammy.yaml @@ -1,5 +1,5 @@ --- images: tags: - postgresql_utility: localhost:5000/porthole-postgresql-utility:latest-ubuntu_jammy + postgresql_utility: localhost:5000/airshipit/porthole-postgresql-utility:latest-ubuntu_jammy ... \ No newline at end of file diff --git a/tools/deployment/004-make-images.sh b/tools/deployment/004-make-images.sh index ac57925b..640562da 100755 --- a/tools/deployment/004-make-images.sh +++ b/tools/deployment/004-make-images.sh @@ -17,25 +17,11 @@ set -x : "${DISTRO:="ubuntu_focal"}" env -make images +echo "[*] Deploy local docker registry..." docker rm registry --force || true 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} -docker tag quay.io/airshipit/porthole-ceph-utility:latest-${DISTRO} localhost:5000/porthole-ceph-utility:latest-${DISTRO} -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} +echo "[*] Build images and push them to local docker registry..." +make images -e DOCKER_REGISTRY="localhost:5000" -e PUSH_IMAGE=true - - -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}