From 4acfe2285a9c618e451c07a18f85dca1df8b278b Mon Sep 17 00:00:00 2001
From: Dominik Hebeler <dominik@suma-ev.de>
Date: Thu, 29 Aug 2019 10:26:34 +0000
Subject: [PATCH] added review stage
---
.gitlab-ci.yml | 10 ++++++++++
Dockerfile | 2 +-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e7a3521..363c91a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,6 +4,8 @@ variables:
stages:
- prepare
- build
+ - review
+ - cleanup
prepare_node:
stage: prepare
@@ -43,3 +45,11 @@ include:
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"
+
diff --git a/Dockerfile b/Dockerfile
index d2f3890..ae5467b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM nginx
RUN apt -y update && apt -y install php-fpm ca-certificates zip php7.3-mbstring php7.3-dom php7.3-zip php7.3-curl
-COPY / /html
+COPY . /html
COPY /service-configs/nginx/default.conf /etc/nginx/conf.d/default.conf
RUN sed -i 's/listen.owner = www-data/listen.owner = nginx/g' /etc/php/7.3/fpm/pool.d/www.conf
--
GitLab