remove docker-io-mirror / use mirror.gcr.io directly

Tiltfile

@@ -58,5 +58,5 @@ else:
 k8s_resource(
   'wedding',
   port_forwards=['12376:2376'],
-  resource_deps=['setup-s3-bucket', 'wedding-registry', 'docker-io-mirror'],
+  resource_deps=['setup-s3-bucket', 'wedding-registry'],
 )

deployment/config.yaml

@@ -11,11 +11,7 @@ data:
       noProcessSandbox = true
 
     [registry."docker.io"]
-      mirrors = ["docker-io-mirror:5000"]
-
-    [registry."docker-io-mirror:5000"]
-      http = true
-      insecure = true
+      mirrors = ["mirror.gcr.io"]
 
     [registry."wedding-registry:5000"]
       http = true

services/Tiltfile

@@ -13,6 +13,3 @@ k8s_resource(
 
 k8s_yaml('wedding-registry.yaml')
 k8s_resource('wedding-registry', port_forwards=5000)
-
-k8s_yaml('docker-io-mirror.yaml')
-k8s_resource('docker-io-mirror', port_forwards="5001:5000")

tests/Tiltfile

@@ -7,7 +7,7 @@ local_resource ('test docker build',
 )
 
 local_resource ('test docker pull tag push',
-  'timeout 80 bash docker-pull-tag-push.sh',
+  'timeout 100 bash docker-pull-tag-push.sh',
   deps=['..'],
   resource_deps=['wedding'],
   allow_parallel=True,

tests/docker-pull-tag-push.sh

@@ -3,10 +3,10 @@ set -uexo pipefail
 export DOCKER_HOST=tcp://127.0.0.1:12376
 until docker version; do sleep 1; done
 
-docker pull mirror.gcr.io/library/alpine
-if docker pull mirror.gcr.io/library/missing; then echo "this should fail"; false; else echo "exit code propagated"; fi
+docker pull alpine
+if docker pull missing; then echo "this should fail"; false; else echo "exit code propagated"; fi
 
-docker tag mirror.gcr.io/library/alpine wedding-registry:5000/test-push:alpine
+docker tag alpine wedding-registry:5000/test-push:alpine
 if docker tag missing b; then echo "this should fail"; false; else echo "exit code propagated"; fi
 
 docker push wedding-registry:5000/test-push:alpine