Commit 0d5c382d authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Define puerto ActiveMQ, deploys y check de salud

parent 3de43c99

.env

+1 −0
Original line number Diff line number Diff line 
GEOSERVER_PORT=8080

ACTIVEMQ_PORT=61666

.gitlab-ci.yml

+2 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ deploy-dev: 
    - deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} REGISTRY_HOSTNAME=${REGISTRY_HOSTNAME} COMPOSE_FILE=${COMPOSE_FILE}

  environment:

    name: dev

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

  only:

    - branches

  except:
@@ -97,6 +98,7 @@ deploy-pro: 
    - deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} REGISTRY_HOSTNAME=${REGISTRY_HOSTNAME} COMPOSE_FILE=${COMPOSE_FILE}

  environment:

    name: pro

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

  only:

    - master

  when: manual

Dockerfile

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ ENV DEBIAN_FRONTEND="noninteractive" \ 
    GOOGLE_FONTS="Open%20Sans Roboto Lato Ubuntu" \

    NOTO_FONTS="NotoSans-unhinted NotoSerif-unhinted NotoMono-hinted" \

    BROKER_TOPIC_NAME="VirtualTopic.geoserver" \

    ACTIVEMQ_PORT="61666" \

    BROKER_URL="tcp\://activemq-broker\:61666" \

    BROKER_GROUP="geoserver-cluster" \

    ROLE="slave"

docker-compose.tmpl.yml

+2 −1
Original line number Diff line number Diff line
@@ -6,13 +6,14 @@ services: 
    environment:

      - ROLE=master

      - BROKER_SERVICE_NAME=activemq

      - ACTIVEMQ_PORT

      - JAVA_OPTS=-Xmx512m -Xss512m

    networks:

      - gis-net

    volumes:

      - geoserver-vol:/var/geoserver/data

    healthcheck:

      test: wget --spider -S -t 3 http://localhost:${GEOSERVER_PORT}

      test: wget --spider -S -t 3 http://localhost:${GEOSERVER_PORT}/geoserver

      interval: 30s

      timeout: 10s

      retries: 3