diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-06-06 10:52:29 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2019-06-06 10:52:29 +0000 |
| commit | 7f52685a41851ce3ddc117dd36832910d64da9f3 (patch) | |
| tree | 3520ec51af4df744429e1ceb95d4f826f3af422f | |
| parent | 48ca0ddfa2124c9bb01cf312e9d0224487c26fcd (diff) | |
| download | gitlab-ce-7f52685a41851ce3ddc117dd36832910d64da9f3.tar.gz | |
Remove build policies from serverless app template
| -rw-r--r-- | changelogs/unreleased/fix-gb-remove-serverless-app-build-policies-from-template.yml | 5 | ||||
| -rw-r--r-- | lib/gitlab/ci/templates/Serverless.gitlab-ci.yml | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/changelogs/unreleased/fix-gb-remove-serverless-app-build-policies-from-template.yml b/changelogs/unreleased/fix-gb-remove-serverless-app-build-policies-from-template.yml new file mode 100644 index 00000000000..f51ec273a57 --- /dev/null +++ b/changelogs/unreleased/fix-gb-remove-serverless-app-build-policies-from-template.yml @@ -0,0 +1,5 @@ +--- +title: Remove build policies from serverless app template +merge_request: 29253 +author: +type: fixed diff --git a/lib/gitlab/ci/templates/Serverless.gitlab-ci.yml b/lib/gitlab/ci/templates/Serverless.gitlab-ci.yml index 0fb7c57ab72..9d651db27f1 100644 --- a/lib/gitlab/ci/templates/Serverless.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Serverless.gitlab-ci.yml @@ -14,9 +14,6 @@ stages: image: name: gcr.io/kaniko-project/executor:debug entrypoint: [""] - only: - refs: - - master script: - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/$DOCKERFILE --destination $CI_REGISTRY_IMAGE @@ -24,9 +21,6 @@ stages: .serverless:deploy:image: stage: deploy image: gcr.io/triggermesh/tm@sha256:e3ee74db94d215bd297738d93577481f3e4db38013326c90d57f873df7ab41d5 - only: - refs: - - master environment: development script: - echo "$CI_REGISTRY_IMAGE" |