Commit 727e8c26 authored by Nacho's avatar Nacho
Browse files

Merge branch 'dev' of gitlab.com:redmic-project/gis/geoserver into dev

parents 20489c18 f1bfcfbe

.env

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

ACTIVEMQ_PORT=61666

.gitlab-ci.yml

+6 −2
Original line number Diff line number Diff line
@@ -66,14 +66,16 @@ deploy-dev: 
    DOCKER_DRIVER: overlay2

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    SERVICE: ${CI_PROJECT_NAME}

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

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

  services:

    - docker:dind

  script:

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

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

  environment:

    name: dev

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

  only:

    - branches

  except:
@@ -87,14 +89,16 @@ deploy-pro: 
    DOCKER_DRIVER: overlay2

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    SERVICE: ${CI_PROJECT_NAME}

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

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

  services:

    - docker:dind

  script:

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

    - deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} 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.prod.yml

+2 −0
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ services: 
      - ${GEOSERVER_PORT}

    networks:

      - traefik-net

    environment:

      - SWARM_MODE=true

    deploy:

      mode: replicated

      replicas: 3

docker-compose.tmpl.yml

+3 −2
Original line number Diff line number Diff line
@@ -2,17 +2,18 @@ version: '3.5' 


services:

  geoserver:

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

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

    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