From 71121bfd13e9fc6c51dfb70b480d58ba8d077756 Mon Sep 17 00:00:00 2001 From: Nandor Kracser Date: Sun, 2 Jun 2019 13:31:57 +0200 Subject: [PATCH] gcr: use json_key to keep compatibility with docker plugin --- README.md | 9 +++++---- plugin.sh | 10 +++++----- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 6b54903..c58ba13 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ steps: - name: publish image: banzaicloud/drone-kaniko settings: - registry: registry.example.com + registry: registry.example.com # if not provided index.docker.io is supposed repo: registry.example.com/example-project tags: ${DRONE_COMMIT_SHA} cache: true @@ -35,10 +35,11 @@ steps: - name: publish image: banzaicloud/drone-kaniko settings: - repo: gcr.io/example.com/example-project + registry: gcr.io + repo: example.com/example-project tags: ${DRONE_COMMIT_SHA} cache: true - google_application_credentials: + json_key: from_secret: google-application-credentials ``` @@ -84,5 +85,5 @@ docker run --net=host -it --rm -w /src -v $PWD:/cache -v $PWD:/src -e PLUGIN_USE The very same example just pushing to GCR instead of Docker Hub: ```bash -docker run --net=host -it --rm -w /src -v $PWD:/cache -v $PWD:/src -e PLUGIN_REPO=gcr.io/banzaicloud/drone-kaniko-test -e PLUGIN_TAGS=test -e PLUGIN_DOCKERFILE=Dockerfile.test -e PLUGIN_CACHE=true -e PLUGIN_GOOGLE_APPLICATION_CREDENTIALS="$(<$HOME/google-application-credentials.json)" banzaicloud/drone-kaniko +docker run --net=host -it --rm -w /src -v $PWD:/cache -v $PWD:/src -e PLUGIN_REGISTRY=gcr.io -e PLUGIN_REPO=paas-dev1/drone-kaniko-test -e PLUGIN_TAGS=test -e PLUGIN_DOCKERFILE=Dockerfile.test -e PLUGIN_CACHE=true -e PLUGIN_JSON_KEY="$(<$HOME/google-application-credentials.json)" banzaicloud/drone-kaniko ``` diff --git a/plugin.sh b/plugin.sh index 2f4b9ef..4ea1ed3 100755 --- a/plugin.sh +++ b/plugin.sh @@ -4,11 +4,11 @@ set -euo pipefail export PATH=$PATH:/kaniko/ +REGISTRY=${PLUGIN_REGISTRY:-index.docker.io} + if [ "${PLUGIN_USERNAME:-}" ] || [ "${PLUGIN_PASSWORD:-}" ]; then DOCKER_AUTH=`echo -n "${PLUGIN_USERNAME}:${PLUGIN_PASSWORD}" | base64 | tr -d "\n"` - REGISTRY=${PLUGIN_REGISTRY:-https://index.docker.io/v1/} - cat > /kaniko/.docker/config.json < /kaniko/gcr.json +if [ "${PLUGIN_JSON_KEY:-}" ];then + echo "${PLUGIN_JSON_KEY}" > /kaniko/gcr.json export GOOGLE_APPLICATION_CREDENTIALS=/kaniko/gcr.json fi @@ -42,7 +42,7 @@ if [ -n "${PLUGIN_BUILD_ARGS:-}" ]; then fi if [ -n "${PLUGIN_TAGS:-}" ]; then - DESTINATIONS=$(echo "${PLUGIN_TAGS}" | tr ',' '\n' | while read tag; do echo "--destination=${PLUGIN_REPO}:${tag} "; done) + DESTINATIONS=$(echo "${PLUGIN_TAGS}" | tr ',' '\n' | while read tag; do echo "--destination=${REGISTRY}/${PLUGIN_REPO}:${tag} "; done) else DESTINATIONS="--destination=${PLUGIN_REPO}:latest" fi