Commit 6f97eeaf authored by Nacho's avatar Nacho
Browse files

Replace image path by variable

parent 6cb20bd5

.gitlab-ci.yml

+6 −2
Original line number Diff line number Diff line
@@ -71,7 +71,9 @@ deploy-dev: 
  services:

    - docker:dind

  script:

    - deploy.sh IMAGE_TAG=${IMAGE_TAG} REGISTRY_HOSTNAME=${REGISTRY_HOSTNAME} COMPOSE_FILE=${COMPOSE_FILE}

    - >

      deploy.sh DOCKER_ENV_CI_REGISTRY_IMAGE={DOCKER_ENV_CI_REGISTRY_IMAGE} IMAGE_TAG=${IMAGE_TAG}

      COMPOSE_FILE=${COMPOSE_FILE}

  environment:

    name: dev

  only:
@@ -92,7 +94,9 @@ deploy-pro: 
  services:

    - docker:dind

  script:

    - deploy.sh IMAGE_TAG=${IMAGE_TAG} REGISTRY_HOSTNAME=${REGISTRY_HOSTNAME} COMPOSE_FILE=${COMPOSE_FILE}

    - >

      deploy.sh DOCKER_ENV_CI_REGISTRY_IMAGE={DOCKER_ENV_CI_REGISTRY_IMAGE} IMAGE_TAG=${IMAGE_TAG}

      COMPOSE_FILE=${COMPOSE_FILE}

  environment:

    name: pro

  only:

docker-compose.tmpl.yml

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ version: '3.5' 


services:

  geoserver:

    image: ${REGISTRY_HOSTNAME}/redmic-project/gis/geoserver:${IMAGE_TAG:-latest}

    image: ${DOCKER_ENV_CI_REGISTRY_IMAGE}:${IMAGE_TAG:-latest}

    environment:

      - ROLE=master

      - BROKER_SERVICE_NAME=activemq