Commit 816ce6f0 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Elimina ficheros compose innecesarios, retoca CI 

Al ser un proyecto pensado para un solo entorno, no tiene sentido
contemplar varios entornos en los ficheros de despliegue. Corrige nombre
de entorno para despliegue de rama estable.
parent ddbdb525

.dockerignore

+1 −1
Original line number Diff line number Diff line 
*

!/content
 
!content

.gitlab-ci.yml

+7 −15
Original line number Diff line number Diff line
@@ -71,16 +71,12 @@ container-scanning: 


deploy-development:

  stage: deploy

  image: registry.gitlab.com/redmic-project/docker/docker-deploy

  variables:

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml

  image: registry.gitlab.com/redmic-project/docker/docker-deploy:latest

  script:

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

    - deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  environment:

    name: dev

    url: https://index.${PRO_PUBLIC_HOSTNAME}

    name: pro

    url: https://index.${PUBLIC_HOSTNAME}

  only:

    - branches

  except:
@@ -89,15 +85,11 @@ deploy-development: 


deploy-stable:

  stage: deploy

  image: registry.gitlab.com/redmic-project/docker/docker-deploy

  variables:

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.prod.yml

  image: registry.gitlab.com/redmic-project/docker/docker-deploy:latest

  script:

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

    - deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  environment:

    name: pro

    url: https://index.${PRO_PUBLIC_HOSTNAME}

    url: https://index.${PUBLIC_HOSTNAME}

  only:

    - master

deploy/docker-compose.dev.yml

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
version: '3.5'

deploy/docker-compose.prod.yml

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
version: '3.5'