Skip to content
Snippets Groups Projects
Commit 32bd1f10 authored by Roang's avatar Roang
Browse files

Update kaniko calls

* Use multi-line strings for better readability
* Move the context to the KANIKO_ARGS
parent 2a30a38a
Branches
No related tags found
No related merge requests found
...@@ -78,8 +78,15 @@ warmup: ...@@ -78,8 +78,15 @@ warmup:
name: gcr.io/kaniko-project/executor:debug name: gcr.io/kaniko-project/executor:debug
entrypoint: [""] entrypoint: [""]
variables: variables:
KANIKO_CACHE_ARGS: "--cache=true --cache-copy-layers=true --cache-run-layers=true --cache-ttl=24h --cache-repo=$CI_REGISTRY_IMAGE/cache" KANIKO_CACHE_ARGS:
KANIKO_ARGS: "--skip-unused-stages=true" --cache=true
--cache-copy-layers=true
--cache-run-layers=true
--cache-ttl=24h
--cache-repo=$CI_REGISTRY_IMAGE/cache
KANIKO_ARGS:
--skip-unused-stages=true
--context $CI_PROJECT_DIR
before_script: before_script:
- echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"},\"https://index.docker.io/v1/\":{\"username\":\"$DOCKER_HUB_USER\",\"password\":\"$DOCKER_HUB_PASSWORD\"}}}" > /kaniko/.docker/config.json - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"},\"https://index.docker.io/v1/\":{\"username\":\"$DOCKER_HUB_USER\",\"password\":\"$DOCKER_HUB_PASSWORD\"}}}" > /kaniko/.docker/config.json
- echo "{\"tag\":\"$CI_COMMIT_TAG\",\"commit\":\"$CI_COMMIT_SHA\",\"branch\":\"$CI_COMMIT_BRANCH\",\"ci\":true}" > src/version.json - echo "{\"tag\":\"$CI_COMMIT_TAG\",\"commit\":\"$CI_COMMIT_SHA\",\"branch\":\"$CI_COMMIT_BRANCH\",\"ci\":true}" > src/version.json
...@@ -114,7 +121,11 @@ meta_build: ...@@ -114,7 +121,11 @@ meta_build:
variables: variables:
PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip" PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
script: script:
- /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/.meta/Dockerfile --destination $CI_REGISTRY_IMAGE/build_image:$CI_PIPELINE_ID $KANIKO_ARGS $KANIKO_CACHE_ARGS - /kaniko/executor
$KANIKO_ARGS
$KANIKO_CACHE_ARGS
--dockerfile $CI_PROJECT_DIR/.meta/Dockerfile
--destination $CI_REGISTRY_IMAGE/build_image:$CI_PIPELINE_ID
rules: rules:
- when: always - when: always
...@@ -227,23 +238,35 @@ build_test: ...@@ -227,23 +238,35 @@ build_test:
- generate_css - generate_css
- sanity_check - sanity_check
script: script:
- /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CI_REGISTRY_IMAGE/ci/hub:ci-$CI_PIPELINE_ID-test $KANIKO_ARGS $KANIKO_CACHE_ARGS - /kaniko/executor
$KANIKO_ARGS
$KANIKO_CACHE_ARGS
--dockerfile $CI_PROJECT_DIR/Dockerfile
--destination $CI_REGISTRY_IMAGE/ci/hub:ci-$CI_PIPELINE_ID-test
build_nginx: build_nginx:
extends: .container-build extends: .container-build
needs: needs:
- generate_css - generate_css
- build_test
script: script:
- /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --target nginx --destination $CI_REGISTRY_IMAGE/ci/nginx:ci-$CI_PIPELINE_ID $KANIKO_ARGS $KANIKO_CACHE_ARGS - /kaniko/executor
$KANIKO_ARGS
$KANIKO_CACHE_ARGS
--dockerfile $CI_PROJECT_DIR/Dockerfile
--target nginx
--destination $CI_REGISTRY_IMAGE/ci/nginx:ci-$CI_PIPELINE_ID
build_release: build_release:
extends: .container-build extends: .container-build
needs: needs:
- generate_css - generate_css
- build_test
script: script:
- /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --target webworker --destination $CI_REGISTRY_IMAGE/ci/hub:ci-$CI_PIPELINE_ID $KANIKO_ARGS $KANIKO_CACHE_ARGS - /kaniko/executor
$KANIKO_ARGS
$KANIKO_CACHE_ARGS
--dockerfile $CI_PROJECT_DIR/Dockerfile
--target webworker
--destination $CI_REGISTRY_IMAGE/ci/hub:ci-$CI_PIPELINE_ID
test_internals: test_internals:
extends: extends:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment