diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e7a35213577325a5d16d98dd0a9b2f824cc4947f..363c91a65f828f0db98d230f96322e4f533142a4 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 d2f3890027d6fa059034afa20c3ecc1488cd36e5..ae5467b71233bdc0e0f18f35c6395b701e42492a 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