Commit 939613f8 authored by Alex Felippe Chiozo's avatar Alex Felippe Chiozo
Browse files

build para develop e correção no gitlab-ci.yml

parent 92bbec27
......@@ -8,10 +8,27 @@ stages:
- deploy
variables:
DEVELOP_IMAGE: $CI_REGISTRY_IMAGE:$CI_BUILD_REF_NAME-$CI_COMMIT_SHORT_SHA
HOMOLOG_IMAGE: $CI_REGISTRY_IMAGE:$CI_BUILD_REF_NAME-$CI_COMMIT_SHORT_SHA
RELEASE_IMAGE: $CI_REGISTRY_IMAGE:$CI_BUILD_REF_NAME
KUBECONFIG: /etc/k8s-config
build to develop:
variables:
GIT_SUBMODULE_STRATEGY: normal
stage: build
script:
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
- docker pull mapasculturais/mapasculturais:v5.1
- docker pull mapasculturais/mapasculturais:develop
- docker build -t $DEVELOP_IMAGE -f compose/develop/Dockerfile .
- docker push $DEVELOP_IMAGE
only:
- /develop/
environment: develop
tags:
- docker
build to homolog:
variables:
GIT_SUBMODULE_STRATEGY: normal
......@@ -19,7 +36,7 @@ build to homolog:
stage: build
script:
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
- docker pull mapasculturais/mapasculturais:v5.1.0-RC
- docker pull mapasculturais/mapasculturais:v5.1
- docker pull mapasculturais/mapasculturais:develop
- docker build -t $HOMOLOG_IMAGE -f compose/production/Dockerfile .
- docker push $HOMOLOG_IMAGE
......
FROM mapasculturais/mapasculturais:develop
COPY compose/common/config.php /var/www/html/protected/application/conf/config.php
COPY compose/common/config.d /var/www/html/protected/application/conf/conf-common.d
COPY compose/production/config.d /var/www/html/protected/application/conf/config.d
COPY themes /var/www/html/protected/application/themes
COPY plugins /var/www/html/protected/application/plugins
COPY compose/common/php-ini.d /usr/local/etc/php/conf.d
COPY compose/common/branchMap.csv /var/www/html/protected/application/plugins/AldirBlanc/CSV/branchMap.csv
RUN curl https://raw.githubusercontent.com/opauth/facebook/master/FacebookStrategy.php > /var/www/html/protected/application/plugins/MultipleLocalAuth/Facebook/FacebookStrategy.php
FROM mapasculturais/mapasculturais:v5.1.47
FROM mapasculturais/mapasculturais:v5.1
COPY compose/common/config.php /var/www/html/protected/application/conf/config.php
COPY compose/common/config.d /var/www/html/protected/application/conf/conf-common.d
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment