Merge branch 'eero/podman-dockerhub' into 'master'

Fix registry for podman docker images See merge request dfinity-lab/public/ic!11803
dfinity · Apr 12, 2023 · c319018 · c319018
2 parents 60a8e46 + 597cb00
commit c319018
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 24 deletions.
diff --git a/gitlab-ci/config/46--guest-os-build--guest-base-image.yml b/gitlab-ci/config/46--guest-os-build--guest-base-image.yml
@@ -2,33 +2,33 @@
   TAG=$(date '+%Y-%m-%d-%H%M')
   # guestos-base & guestos-base-dev
   cd "${CI_PROJECT_DIR}/ic-os/guestos/rootfs"
-  docker build -q --no-cache -t dfinity/guestos-base:"$TAG" -t dfinity/guestos-base:latest \
+  docker build -q --no-cache -t docker.io/dfinity/guestos-base:"$TAG" -t docker.io/dfinity/guestos-base:latest \
       -f Dockerfile.base .
-  docker build -q --no-cache -t dfinity/guestos-base-dev:"$TAG" -t dfinity/guestos-base-dev:latest \
+  docker build -q --no-cache -t docker.io/dfinity/guestos-base-dev:"$TAG" -t docker.io/dfinity/guestos-base-dev:latest \
       --build-arg PACKAGE_FILES="packages.common packages.dev" -f Dockerfile.base .
   # boundaryos-base & boundaryos-base-snp
   cd "${CI_PROJECT_DIR}/ic-os/boundary-guestos/rootfs"
-  docker build -q --no-cache -t dfinity/boundaryos-base:"$TAG" -t dfinity/boundaryos-base:latest \
+  docker build -q --no-cache -t docker.io/dfinity/boundaryos-base:"$TAG" -t docker.io/dfinity/boundaryos-base:latest \
       -f Dockerfile.base .
-  docker build -q --no-cache -t dfinity/boundaryos-base-snp:"$TAG" -t dfinity/boundaryos-base-snp:latest \
+  docker build -q --no-cache -t docker.io/dfinity/boundaryos-base-snp:"$TAG" -t docker.io/dfinity/boundaryos-base-snp:latest \
       --build-arg CPU_SUPPORT="snp" -f Dockerfile.base .
   # boundary-api-guestos-base & boundary-api-guestos-base-snp
   cd "${CI_PROJECT_DIR}/ic-os/boundary-api-guestos/rootfs"
-  docker build -q --no-cache -t dfinity/boundary-api-guestos-base:"$TAG" -t dfinity/boundary-api-guestos-base:latest \
+  docker build -q --no-cache -t docker.io/dfinity/boundary-api-guestos-base:"$TAG" -t docker.io/dfinity/boundary-api-guestos-base:latest \
       -f Dockerfile.base .
-  docker build -q --no-cache -t dfinity/boundary-api-guestos-base-snp:"$TAG" -t dfinity/boundary-api-guestos-base-snp:latest \
+  docker build -q --no-cache -t docker.io/dfinity/boundary-api-guestos-base-snp:"$TAG" -t docker.io/dfinity/boundary-api-guestos-base-snp:latest \
       --build-arg CPU_SUPPORT="snp" -f Dockerfile.base .
   # hostos-base & hostos-base-dev
   cd "${CI_PROJECT_DIR}/ic-os/hostos/rootfs"
-  docker build -q --no-cache -t dfinity/hostos-base:"$TAG" -t dfinity/hostos-base:latest \
+  docker build -q --no-cache -t docker.io/dfinity/hostos-base:"$TAG" -t docker.io/dfinity/hostos-base:latest \
       -f Dockerfile.base .
-  docker build -q --no-cache -t dfinity/hostos-base-dev:"$TAG" -t dfinity/hostos-base-dev:latest \
+  docker build -q --no-cache -t docker.io/dfinity/hostos-base-dev:"$TAG" -t docker.io/dfinity/hostos-base-dev:latest \
       --build-arg PACKAGE_FILES="packages.common packages.dev" -f Dockerfile.base .
   # setupos-base & setupos-base-dev
   cd "${CI_PROJECT_DIR}/ic-os/setupos/rootfs"
-  docker build -q --no-cache -t dfinity/setupos-base:"$TAG" -t dfinity/setupos-base:latest \
+  docker build -q --no-cache -t docker.io/dfinity/setupos-base:"$TAG" -t docker.io/dfinity/setupos-base:latest \
       -f Dockerfile.base .
-  docker build -q --no-cache -t dfinity/setupos-base-dev:"$TAG" -t dfinity/setupos-base-dev:latest \
+  docker build -q --no-cache -t docker.io/dfinity/setupos-base-dev:"$TAG" -t docker.io/dfinity/setupos-base-dev:latest \
       --build-arg PACKAGE_FILES="packages.common packages.dev" -f Dockerfile.base .
 
 build-base-images:
@@ -72,11 +72,7 @@ build-push-base-images:
          docker push "${IMAGE}":"${TAG}"
          docker push "${IMAGE}":latest
 
-         # The digest may contain the localhost entry
          NEW_REF="$(docker inspect --format='{{index .RepoDigests 0}}' "${IMAGE}":"${TAG}")"
-         if [[ ${NEW_REF} == localhost* ]]; then
-             NEW_REF="$(docker inspect --format='{{index .RepoDigests 1}}' "${IMAGE}":"${TAG}")"
-         fi
          echo "${NEW_REF}" > "${CI_PROJECT_DIR}/${FILE}"
      done
 

diff --git a/ic-os/boundary-api-guestos/rootfs/docker-base.prod b/ic-os/boundary-api-guestos/rootfs/docker-base.prod
@@ -1 +1 @@
-dfinity/boundary-api-guestos-base@sha256:be5d86d5799845154d86fc5207dbbad9625859d24012e7b3044ff6510c351adf
+docker.io/dfinity/boundary-api-guestos-base@sha256:be5d86d5799845154d86fc5207dbbad9625859d24012e7b3044ff6510c351adf
diff --git a/ic-os/boundary-api-guestos/rootfs/docker-base.snp b/ic-os/boundary-api-guestos/rootfs/docker-base.snp
@@ -1 +1 @@
-dfinity/boundary-api-guestos-base-snp@sha256:ac5829d034ad219b9852e4e249078149f87b4150fddfdb415f80499e16556085
+docker.io/dfinity/boundary-api-guestos-base-snp@sha256:ac5829d034ad219b9852e4e249078149f87b4150fddfdb415f80499e16556085
diff --git a/ic-os/boundary-guestos/rootfs/docker-base.prod b/ic-os/boundary-guestos/rootfs/docker-base.prod
@@ -1 +1 @@
-dfinity/boundaryos-base@sha256:9bc2cacd1e89352c7e49e4ba93fb6b10129a56fd28b73fe5e6ec9a45c5565084
+docker.io/dfinity/boundaryos-base@sha256:9bc2cacd1e89352c7e49e4ba93fb6b10129a56fd28b73fe5e6ec9a45c5565084
diff --git a/ic-os/boundary-guestos/rootfs/docker-base.snp b/ic-os/boundary-guestos/rootfs/docker-base.snp
@@ -1 +1 @@
-dfinity/boundaryos-base-snp@sha256:0c19b050d1d9376c536337f6f44236548092861034b803dea251ffda63bddc27
+docker.io/dfinity/boundaryos-base-snp@sha256:0c19b050d1d9376c536337f6f44236548092861034b803dea251ffda63bddc27
diff --git a/ic-os/guestos/rootfs/docker-base.dev b/ic-os/guestos/rootfs/docker-base.dev
@@ -1 +1 @@
-dfinity/guestos-base-dev@sha256:ad21e3c6d1ce9bb8d5de3767cf167aba8f031f649fb9a329fbe1bd50ebfc5ae0
+docker.io/dfinity/guestos-base-dev@sha256:ad21e3c6d1ce9bb8d5de3767cf167aba8f031f649fb9a329fbe1bd50ebfc5ae0
diff --git a/ic-os/guestos/rootfs/docker-base.prod b/ic-os/guestos/rootfs/docker-base.prod
@@ -1 +1 @@
-dfinity/guestos-base@sha256:8207f81e460dfdbaa51bbf18eee4d74d9eaaaf3188d29472c263db816d770c14
+docker.io/dfinity/guestos-base@sha256:8207f81e460dfdbaa51bbf18eee4d74d9eaaaf3188d29472c263db816d770c14
diff --git a/ic-os/hostos/rootfs/docker-base.dev b/ic-os/hostos/rootfs/docker-base.dev
@@ -1 +1 @@
-dfinity/hostos-base-dev@sha256:a9d9a5b34c938181aeb55afbf2af520e608546885117c33e074329c994c2f5a3
+docker.io/dfinity/hostos-base-dev@sha256:a9d9a5b34c938181aeb55afbf2af520e608546885117c33e074329c994c2f5a3
diff --git a/ic-os/hostos/rootfs/docker-base.prod b/ic-os/hostos/rootfs/docker-base.prod
@@ -1 +1 @@
-dfinity/hostos-base@sha256:0dee7ff2052ac35e4036ea14897e5d7cd3af9ffa20d8d50694a171ae6fb1636c
+docker.io/dfinity/hostos-base@sha256:0dee7ff2052ac35e4036ea14897e5d7cd3af9ffa20d8d50694a171ae6fb1636c
diff --git a/ic-os/setupos/rootfs/docker-base.dev b/ic-os/setupos/rootfs/docker-base.dev
@@ -1 +1 @@
-dfinity/setupos-base-dev@sha256:413911fbc3e7dc3314342c19f432df7484b7cc893dde3d1d526069ea93c429a2
+docker.io/dfinity/setupos-base-dev@sha256:413911fbc3e7dc3314342c19f432df7484b7cc893dde3d1d526069ea93c429a2
diff --git a/ic-os/setupos/rootfs/docker-base.prod b/ic-os/setupos/rootfs/docker-base.prod
@@ -1 +1 @@
-dfinity/setupos-base@sha256:866da6142a400a63adad09f967dcc32c81dc5a702bfda8b1857b064094500134
+docker.io/dfinity/setupos-base@sha256:866da6142a400a63adad09f967dcc32c81dc5a702bfda8b1857b064094500134