Commit 166d9b12 authored by Phillip Webb's avatar Phillip Webb

Merge branch '2.2.x' into 2.3.x

parents f5f1b434 7ed64f06
...@@ -13,7 +13,6 @@ caches: ...@@ -13,7 +13,6 @@ caches:
params: params:
CONTEXT: ci-images-git-repo/ci/images CONTEXT: ci-images-git-repo/ci/images
DOCKERFILE: ci-images-git-repo/ci/images/((ci-image-name))/Dockerfile DOCKERFILE: ci-images-git-repo/ci/images/((ci-image-name))/Dockerfile
REGISTRY_MIRRORS: ((docker-hub-mirror))
DOCKER_HUB_AUTH: ((docker-hub-auth)) DOCKER_HUB_AUTH: ((docker-hub-auth))
run: run:
path: /bin/sh path: /bin/sh
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment