]> git.apps.os.sepia.ceph.com Git - ceph-build.git/commitdiff
Merge pull request #1709 from ceph/wip-login-dockerhub
authorDavid Galloway <dgallowa@redhat.com>
Thu, 18 Mar 2021 19:59:54 +0000 (15:59 -0400)
committerGitHub <noreply@github.com>
Thu, 18 Mar 2021 19:59:54 +0000 (15:59 -0400)
ceph*build: Login to docker.io if needed

1  2 
ceph-dev-build/config/definitions/ceph-dev-build.yml
ceph-dev-new-build/config/definitions/ceph-dev-new-build.yml
scripts/build_utils.sh

index 2286a803816efc3a0a21a471026654c10ac1778b,1c904e10d5620525ce8579ec966dd82a8121bfbd..129d81025a5224246be4f1b13243fdbced835298
@@@ -1463,9 -1301,12 +1463,12 @@@ maybe_reset_ci_container() 
  
  # dockerhub started aggressively rate limiting in November 2020. We can use an internal docker mirror if the builder is in the upstream lab.
  use_internal_container_registry() {
 -  if curl -s "https://docker-mirror.front.sepia.ceph.com:5000"; then
 +  if curl -s -k "https://docker-mirror.front.sepia.ceph.com:5000"; then
      REGISTRY="docker-mirror.front.sepia.ceph.com:5000/library"
    else
+     if [ -n "${DOCKER_HUB_USERNAME}" ] && [ -n "${DOCKER_HUB_PASSWORD}" ]; then
+       docker login -u "${DOCKER_HUB_USERNAME}" -p "${DOCKER_HUB_PASSWORD}" docker.io
+     fi
      REGISTRY="docker.io"
    fi
  }