diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2019-06-06 12:14:30 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2019-06-06 12:14:30 +0000 |
| commit | b34506b54ab62bd7c26e8ed469a86e52b9e88709 (patch) | |
| tree | db669481bbf6352841098d15089e9374f660d8e5 | |
| parent | 5b77fa8c56abd4193de681b313e7fc966e76473c (diff) | |
| parent | ca7a935159ddef0f0155cc0ba0dccc8e841ef911 (diff) | |
| download | gitlab-ce-b34506b54ab62bd7c26e8ed469a86e52b9e88709.tar.gz | |
Merge branch 'feature/gb/use-gitlabktl-to-build-serverless-applications' into 'master'
Use `gitlabktl` to build serverless applications
Closes #61184
See merge request gitlab-org/gitlab-ce!29258
| -rw-r--r-- | changelogs/unreleased/feature-gb-use-gitlabktl-to-build-serverless-applications.yml | 5 | ||||
| -rw-r--r-- | lib/gitlab/ci/templates/Serverless.gitlab-ci.yml | 10 |
2 files changed, 7 insertions, 8 deletions
diff --git a/changelogs/unreleased/feature-gb-use-gitlabktl-to-build-serverless-applications.yml b/changelogs/unreleased/feature-gb-use-gitlabktl-to-build-serverless-applications.yml new file mode 100644 index 00000000000..443fff92f55 --- /dev/null +++ b/changelogs/unreleased/feature-gb-use-gitlabktl-to-build-serverless-applications.yml @@ -0,0 +1,5 @@ +--- +title: Use to 'gitlabktl' build serverless applications +merge_request: 29258 +author: +type: added diff --git a/lib/gitlab/ci/templates/Serverless.gitlab-ci.yml b/lib/gitlab/ci/templates/Serverless.gitlab-ci.yml index b4b4cc1f01a..3f46bb89e94 100644 --- a/lib/gitlab/ci/templates/Serverless.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Serverless.gitlab-ci.yml @@ -8,15 +8,9 @@ stages: - deploy .serverless:build:image: - variables: - DOCKERFILE: "Dockerfile" stage: build - image: - name: gcr.io/kaniko-project/executor:debug - entrypoint: [""] - 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 + image: registry.gitlab.com/gitlab-org/gitlabktl:latest + script: /usr/bin/gitlabktl app build .serverless:deploy:image: stage: deploy |