Merge branch '1.1.x'

Author: bclozel

ci/tasks/build-ci-image.yml

@@ -4,28 +4,26 @@ image_resource:
   type: registry-image
   source:
     repository: concourse/oci-build-task
-    tag: 0.10.0
-    registry_mirror:
-      host: ((registry-mirror-host))
-      username: ((registry-mirror-username))
-      password: ((registry-mirror-password))
+    tag: 0.11.1
+    username: ((docker-hub-username))
+    password: ((docker-hub-password))
 inputs:
-- name: ci-images-git-repo
+  - name: ci-images-git-repo
 outputs:
-- name: image
+  - name: image
 caches:
-- path: ci-image-cache
+  - path: ci-image-cache
 params:
   CONTEXT: ci-images-git-repo/ci/images
   DOCKERFILE: ci-images-git-repo/ci/images/((ci-image-name))/Dockerfile
   DOCKER_HUB_AUTH: ((docker-hub-auth))
 run:
   path: /bin/sh
   args:
-  - "-c"
-  - |
-    mkdir -p /root/.docker
-    cat > /root/.docker/config.json <<EOF
-    { "auths": { "https://index.docker.io/v1/": { "auth": "$DOCKER_HUB_AUTH" }}}
-    EOF
-    build
+    - "-c"
+    - |
+      mkdir -p /root/.docker
+      cat > /root/.docker/config.json <<EOF
+      { "auths": { "https://index.docker.io/v1/": { "auth": "$DOCKER_HUB_AUTH" }}}
+      EOF
+      build