summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames E. Blair <jeblair@redhat.com>2019-02-20 17:16:38 -0800
committerJames E. Blair <jeblair@redhat.com>2019-02-20 17:16:38 -0800
commitc8c439e0d8353b18e5c35f4666320f464521b5f8 (patch)
tree496dd9748e937d0e4cad86b2630f32494aeb13d6
parentcbff0cc355ad0e83557737e8f87e5eb45d70bd51 (diff)
use-buildset-registry: configure as a pull-through proxy
Docker has a curious behavior with respect to the registry-mirror setting: it will only use the credentials for dockerhub itself. Therefore, configure the buildset registry to be a pull-through cache for dockerhub, but with no credentials, so that we can set buildset registry credentials under the dockerhub url without their actually being used for dockerhub. Change-Id: I5daf93868d408d71cf2766fbe1bb17f2cfa8a3c7
Notes
Notes (review): Code-Review+2: Andreas Jaeger <jaegerandi@gmail.com> Code-Review+2: Jeremy Stanley <fungi@yuggoth.org> Workflow+1: Jeremy Stanley <fungi@yuggoth.org> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Thu, 21 Feb 2019 13:28:47 +0000 Reviewed-on: https://review.openstack.org/638312 Project: openstack-infra/zuul-jobs Branch: refs/heads/master
-rw-r--r--roles/run-buildset-registry/tasks/main.yaml3
1 files changed, 3 insertions, 0 deletions
diff --git a/roles/run-buildset-registry/tasks/main.yaml b/roles/run-buildset-registry/tasks/main.yaml
index 4e7575b..f4cf4fd 100644
--- a/roles/run-buildset-registry/tasks/main.yaml
+++ b/roles/run-buildset-registry/tasks/main.yaml
@@ -73,6 +73,9 @@
73 REGISTRY_AUTH: htpasswd 73 REGISTRY_AUTH: htpasswd
74 REGISTRY_AUTH_HTPASSWD_PATH: /auth/htpasswd 74 REGISTRY_AUTH_HTPASSWD_PATH: /auth/htpasswd
75 REGISTRY_AUTH_HTPASSWD_REALM: Registry Realm 75 REGISTRY_AUTH_HTPASSWD_REALM: Registry Realm
76 REGISTRY_PROXY_REMOTEURL: https://registry-1.docker.io
77 REGISTRY_PROXY_USERNAME:
78 REGISTRY_PROXY_PASSWORD:
76 volumes: 79 volumes:
77 - "{{ buildset_registry_root}}/data:/var/lib/registry" 80 - "{{ buildset_registry_root}}/data:/var/lib/registry"
78 - "{{ buildset_registry_root}}/certs:/certs" 81 - "{{ buildset_registry_root}}/certs:/certs"