[couchdb-ci] branch main updated: bump pull script for new hub location

[wo...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wohali pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/couchdb-ci.git


The following commit(s) were added to refs/heads/main by this push:
     new 4cff856  bump pull script for new hub location
4cff856 is described below

commit 4cff8560fd7a1233709836d82ff46c682094f675
Author: Joan Touzet <wo...@apache.org>
AuthorDate: Tue Apr 13 21:28:12 2021 -0700

    bump pull script for new hub location
---
 pull-all-couchdbdev-docker | 92 +++++++++++-----------------------------------
 1 file changed, 21 insertions(+), 71 deletions(-)

diff --git a/pull-all-couchdbdev-docker b/pull-all-couchdbdev-docker
index 435ccec..050db39 100644
--- a/pull-all-couchdbdev-docker
+++ b/pull-all-couchdbdev-docker
@@ -1,82 +1,32 @@
 #!/bin/bash
 
-DOCKER_ORG="couchdbdev"
+DOCKER_ORG="apache"
 
 # These are the images that are currently being used, so don't `docker rmi` them on cleanup.
 KEEP_IMAGES=(
-debian-buster-erlang-all
-centos-8-erlang-20.3.8.25-1
-centos-7-erlang-20.3.8.25-1
-centos-6-erlang-20.3.8.25-1
-ubuntu-focal-erlang-20.3.8.25-1
-ubuntu-bionic-erlang-20.3.8.25-1
-ubuntu-xenial-erlang-20.3.8.25-1
-debian-buster-erlang-20.3.8.25-1
-debian-stretch-erlang-20.3.8.25-1
-# ppc64le-debian-buster-erlang-20.3.8.25-1
-arm64v8-debian-buster-erlang-20.3.8.25-1
-debian-stretch-erlang-19.3.6
-centos-7-erlang-19.3.6
-centos-6-erlang-19.3.6
+couchdbci-debian:stretch-erlang-20.3.8.26-1
+couchdbci-debian:buster-erlang-20.3.8.26-1
+couchdbci-debian:arm64v8-buster-erlang-20.3.8.26-1
+couchdbci-debian:buster-erlang-all
+couchdbci-centos:8-erlang-20.3.8.26-1
+couchdbci-centos:7-erlang-20.3.8.26-1
+couchdbci-ubuntu:focal-erlang-20.3.8.26-1
+couchdbci-ubuntu:bionic-erlang-20.3.8.26-1
+couchdbci-ubuntu:xenial-erlang-20.3.8.26-1
 )
 
 # Base images are used for building old libmozjs, primarily.
 BASE_IMAGES=(
-aarch64-debian-stretch-base
-arm64v8-debian-buster-base
-centos-6-base
-centos-7-base
-centos-8-base
-debian-buster-base
-debian-jessie-base
-debian-stretch-base
-ppc64le-debian-buster-base
-ubuntu-bionic-base
-ubuntu-trusty-base
-ubuntu-xenial-base
+couchdbci-debian:ppc64le-stretch-base
 )
 # These images layer in the rest of the CouchDB build chain, and 1 or more Erlang versions.
 IMAGES=(
-aarch64-debian-stretch-erlang-20.3.8.20
-#arm64v8-debian-buster-erlang-20.3.8.22-1
-#arm64v8-debian-buster-erlang-20.3.8.24-1
-arm64v8-debian-buster-erlang-20.3.8.25-1
-arm64v8-debian-stretch-erlang-20.3.8.22-1
-centos-6-erlang-19.3.6
-#centos-6-erlang-20.3.8.22-1
-#centos-6-erlang-20.3.8.24-1
-centos-6-erlang-20.3.8.25-1
-centos-7-erlang-19.3.6
-#centos-7-erlang-20.3.8.22-1
-#centos-7-erlang-20.3.8.24-1
-centos-7-erlang-20.3.8.25-1
-#centos-8-erlang-20.3.8.22-1
-#centos-8-erlang-20.3.8.24-1
-centos-8-erlang-20.3.8.25-1
-#debian-buster-erlang-20.3.8.22-1
-#debian-buster-erlang-20.3.8.24-1
-debian-buster-erlang-20.3.8.25-1
-debian-buster-erlang-all
-debian-jessie-erlang-17.5.3
-debian-jessie-erlang-19.3.6
-debian-stretch-erlang-19.3.6
-#debian-stretch-erlang-20.3.8.22-1
-#debian-stretch-erlang-20.3.8.24-1
-debian-stretch-erlang-20.3.8.25-1
-ppc64le-debian-buster-erlang-20.3.8.25-1
-s390x-debian-buster-erlang-20.3.8.25-1
-ubuntu-12.04-erlang-18.3
-ubuntu-bionic-erlang-19.3.6
-#ubuntu-bionic-erlang-20.3.8.22-1
-#ubuntu-bionic-erlang-20.3.8.24-1
-ubuntu-bionic-erlang-20.3.8.25-1
-ubuntu-focal-erlang-20.3.8.25-1
-ubuntu-trusty-erlang-19.3.6
-ubuntu-trusty-erlang-default
-ubuntu-xenial-erlang-19.3.6
-#ubuntu-xenial-erlang-20.3.8.22-1
-#ubuntu-xenial-erlang-20.3.8.24-1
-ubuntu-xenial-erlang-20.3.8.25-1
+couchdbci-debian:arm64v8-buster-erlang-20.3.8.25-1
+couchdbci-debian:ppc64le-buster-erlang-20.3.8.25-1
+couchdbci-centos:6-erlang-20.3.8.25-1
+couchdbci-centos:6-erlang-19.3.6
+couchdbci-centos:7-erlang-19.3.6
+couchdbci-debian:stretch-erlang-19.3.6
 )
 
 if [ "$(date +%u)" -ne "1" ]; then
@@ -87,12 +37,12 @@ fi
 
 for image in ${LIST[*]}
 do
-    echo docker pull couchdbdev/${image}
-    docker pull couchdbdev/${image}
+    echo docker pull ${DOCKER_ORG}/${image}
+    docker pull ${DOCKER_ORG}/${image}
     # We don't want to delete the current working set of images.
     if ! printf '%s\n' "${KEEP_IMAGES[@]}" | grep -q -P "^${image}$"; then
-        echo docker rmi couchdbdev/$image
-        docker rmi couchdbdev/$image
+        echo docker rmi ${DOCKER_ORG}/$image
+        docker rmi ${DOCKER_ORG}/$image
     fi
 done