summaryrefslogtreecommitdiff
path: root/.gitlab/ci/global.gitlab-ci.yml
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-04-20 18:38:24 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-04-20 18:38:24 +0000
commit983a0bba5d2a042c4a3bbb22432ec192c7501d82 (patch)
treeb153cd387c14ba23bd5a07514c7c01fddf6a78a0 /.gitlab/ci/global.gitlab-ci.yml
parenta2bddee2cdb38673df0e004d5b32d9f77797de64 (diff)
downloadgitlab-ce-983a0bba5d2a042c4a3bbb22432ec192c7501d82.tar.gz
Add latest changes from gitlab-org/gitlab@12-10-stable-ee
Diffstat (limited to '.gitlab/ci/global.gitlab-ci.yml')
-rw-r--r--.gitlab/ci/global.gitlab-ci.yml10
1 files changed, 9 insertions, 1 deletions
diff --git a/.gitlab/ci/global.gitlab-ci.yml b/.gitlab/ci/global.gitlab-ci.yml
index 83a2f7abad0..66b7c47efcf 100644
--- a/.gitlab/ci/global.gitlab-ci.yml
+++ b/.gitlab/ci/global.gitlab-ci.yml
@@ -21,7 +21,7 @@
# Jobs that only need to pull cache
.default-cache:
cache:
- key: "debian-stretch-ruby-2.6.5-pg10-node-12.x"
+ key: "debian-stretch-ruby-2.6.5-pg11-node-12.x"
paths:
- .go/pkg/mod
- vendor/ruby
@@ -98,6 +98,14 @@
cache:
key: "debian-stretch-ruby-2.6.5-pg11-node-12.x"
+# Pin kaniko to v0.16.0 due to https://github.com/GoogleContainerTools/kaniko/issues/1162
+.use-kaniko:
+ image:
+ name: gcr.io/kaniko-project/executor:debug-v0.16.0
+ entrypoint: [""]
+ before_script:
+ - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
+
.as-if-foss:
variables:
FOSS_ONLY: '1'