tormakris/drone-kaniko
1
0
Fork 0
Code Pull Requests Releases Activity

gcr: use json_key to keep compatibility with docker plugin

Browse Source
This commit is contained in:
Nandor Kracser 2019-06-02 13:31:57 +02:00 committed by Nándor István Krácser
parent 71dd35e3ec
commit 71121bfd13
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
README.md
View File

@ -12,7 +12,7 @@ steps:
- name: publish - name: publish
image: banzaicloud/drone-kaniko image: banzaicloud/drone-kaniko
settings: settings:
registry: registry.example.com registry: registry.example.com # if not provided index.docker.io is supposed
repo: registry.example.com/example-project repo: registry.example.com/example-project
tags: ${DRONE_COMMIT_SHA} tags: ${DRONE_COMMIT_SHA}
cache: true cache: true
@ -35,10 +35,11 @@ steps:
- name: publish - name: publish
image: banzaicloud/drone-kaniko image: banzaicloud/drone-kaniko
settings: settings:
repo: gcr.io/example.com/example-project registry: gcr.io
repo: example.com/example-project
tags: ${DRONE_COMMIT_SHA} tags: ${DRONE_COMMIT_SHA}
cache: true cache: true
google_application_credentials: json_key:
from_secret: google-application-credentials 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: The very same example just pushing to GCR instead of Docker Hub:
```bash ```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
``` ```

10
plugin.sh
View File

@ -4,11 +4,11 @@ set -euo pipefail
export PATH=$PATH:/kaniko/ export PATH=$PATH:/kaniko/
REGISTRY=${PLUGIN_REGISTRY:-index.docker.io}
if [ "${PLUGIN_USERNAME:-}" ] || [ "${PLUGIN_PASSWORD:-}" ]; then if [ "${PLUGIN_USERNAME:-}" ] || [ "${PLUGIN_PASSWORD:-}" ]; then
DOCKER_AUTH=`echo -n "${PLUGIN_USERNAME}:${PLUGIN_PASSWORD}" | base64 | tr -d "\n"` 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 <<DOCKERJSON cat > /kaniko/.docker/config.json <<DOCKERJSON
{ {
"auths": { "auths": {
@ -20,8 +20,8 @@ if [ "${PLUGIN_USERNAME:-}" ] || [ "${PLUGIN_PASSWORD:-}" ]; then
DOCKERJSON DOCKERJSON
fi fi
if [ "${PLUGIN_GOOGLE_APPLICATION_CREDENTIALS:-}" ];then if [ "${PLUGIN_JSON_KEY:-}" ];then
echo "${PLUGIN_GOOGLE_APPLICATION_CREDENTIALS}" > /kaniko/gcr.json echo "${PLUGIN_JSON_KEY}" > /kaniko/gcr.json
export GOOGLE_APPLICATION_CREDENTIALS=/kaniko/gcr.json export GOOGLE_APPLICATION_CREDENTIALS=/kaniko/gcr.json
fi fi
@ -42,7 +42,7 @@ if [ -n "${PLUGIN_BUILD_ARGS:-}" ]; then
fi fi
if [ -n "${PLUGIN_TAGS:-}" ]; then 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 else
DESTINATIONS="--destination=${PLUGIN_REPO}:latest" DESTINATIONS="--destination=${PLUGIN_REPO}:latest"
fi fi