From 19d042e08497a3f00f26a5a5bf2bf2b7ed5e2921 Mon Sep 17 00:00:00 2001
From: Dominik Hebeler <dominik@suma-ev.de>
Date: Thu, 29 Aug 2019 10:28:22 +0000
Subject: [PATCH] Update .gitlab-ci.yml
---
.gitlab-ci.yml | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0573cfc..5a13391 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,10 @@
variables:
DOCKER_HOST: tcp://docker-dind.gitlab:2375
+include:
+ - template: Jobs/Build.gitlab-ci.yml
+ - template: Jobs/Deploy.gitlab-ci.yml
+
stages:
- prepare
- build
@@ -39,16 +43,10 @@ prepare_composer:
key: "composer-$CI_JOB_STAGE-$CI_COMMIT_REF_SLUG"
paths:
- vendor
-
-include:
- - template: Jobs/Build.gitlab-ci.yml
build:
services:
-include:
- - template: Jobs/Deploy.gitlab-ci.yml
-
review:
variables:
HELM_UPGRADE_EXTRA_ARGS: --set service.internalPort=80 --set service.commonName= --set ingress.tls.enabled=false --set ingress.annotations.kubernetes\.io/tls-acme="false" --set ingress.annotations.nginx\.ingress\.kubernetes\.io/ssl-redirect="false"
--
GitLab