summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2019-06-06 12:14:20 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2019-06-06 12:14:20 +0000
commit5b77fa8c56abd4193de681b313e7fc966e76473c (patch)
treea8179a058df10ec1be6b6a7085b167fa56a6f78f
parent9318fba9cb352e91c9f45513c814bc5f7e18057f (diff)
parente882954321b8c407f2ac158487d908437d6bfcf3 (diff)
downloadgitlab-ce-5b77fa8c56abd4193de681b313e7fc966e76473c.tar.gz
Merge branch 'fix/gb/fix-serverless-apps-deployment-template' into 'master'
Fix serverless apps deployments by bumping `tm` version Closes #62543 See merge request gitlab-org/gitlab-ce!29254
-rw-r--r--changelogs/unreleased/fix-gb-fix-serverless-apps-deployment-template.yml5
-rw-r--r--lib/gitlab/ci/templates/Serverless.gitlab-ci.yml2
2 files changed, 6 insertions, 1 deletions
diff --git a/changelogs/unreleased/fix-gb-fix-serverless-apps-deployment-template.yml b/changelogs/unreleased/fix-gb-fix-serverless-apps-deployment-template.yml
new file mode 100644
index 00000000000..88656b7ef4c
--- /dev/null
+++ b/changelogs/unreleased/fix-gb-fix-serverless-apps-deployment-template.yml
@@ -0,0 +1,5 @@
+---
+title: Fix serverless apps deployments by bumping 'tm' version
+merge_request: 29254
+author:
+type: fixed
diff --git a/lib/gitlab/ci/templates/Serverless.gitlab-ci.yml b/lib/gitlab/ci/templates/Serverless.gitlab-ci.yml
index 9d651db27f1..b4b4cc1f01a 100644
--- a/lib/gitlab/ci/templates/Serverless.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Serverless.gitlab-ci.yml
@@ -20,7 +20,7 @@ stages:
.serverless:deploy:image:
stage: deploy
- image: gcr.io/triggermesh/tm@sha256:e3ee74db94d215bd297738d93577481f3e4db38013326c90d57f873df7ab41d5
+ image: gcr.io/triggermesh/tm@sha256:3cfdd470a66b741004fb02354319d79f1598c70117ce79978d2e07e192bfb336 # v0.0.11
environment: development
script:
- echo "$CI_REGISTRY_IMAGE"