Commit 4e2f001f authored by Noel Alonso's avatar Noel Alonso
Browse files

Merge branch 'dev' into 'master' 

Dev

See merge request redmic-project/index-page/redmic-dev!12
parents c654eb1d 52e8acc6

.gitlab-ci.yml

+8 −2
Original line number Diff line number Diff line
@@ -10,12 +10,18 @@ include: 
    file: '/deployment-custom-image.yml'



stages:

  - pre-package

  - package

  - test-package

  - post-package

  - deploy



variables:

  PROJECT_PARENT_NAME: index

  COMPOSE_NAME: docker-compose.yml



.docker-build:

  variables:

    COMPOSE_FILE_NAME: ${COMPOSE_NAME}



.deploy:

  variables:
@@ -27,7 +33,7 @@ variables: 


.deploy-compose-file:

  variables: &deploy-compose-file-variables

    COMPOSE_FILE: docker-compose.yml

    COMPOSE_FILE: ${COMPOSE_NAME}



.deploy-development:

  variables: