Commit 23b0761f authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Corrige entorno de despliegue

See merge request redmic-project/index-page/redmic-pro!1
parents 72039214 0630d8cb

.gitlab-ci.yml

+4 −6
Original line number Diff line number Diff line
@@ -10,11 +10,13 @@ services: 


variables:

  DOCKER_DRIVER: overlay2

  SSH_REMOTE: ${PRO_SSH_REMOTE}

  STATUS_CHECK_DELAY: 60

  STACK: index

  SERVICES_TO_CHECK: index_${CI_PROJECT_NAME}

  IMAGE_NAME: ${CI_REGISTRY_IMAGE}

  IMAGE_TAG: ${CI_COMMIT_SHA}

  PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}



docker-build-development:

  stage: package
@@ -71,16 +73,14 @@ deploy-development: 
  stage: deploy

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

  variables:

    SSH_REMOTE: ${DEV_SSH_REMOTE}

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

    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

  script:

    - >

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

      PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  environment:

    name: dev

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

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

  only:

    - branches

  except:
@@ -91,15 +91,13 @@ deploy-stable: 
  stage: deploy

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

  variables:

    SSH_REMOTE: ${DEV_SSH_REMOTE}

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

    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

  script:

    - >

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

      PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  environment:

    name: pro

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

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

  only:

    - master