Commit 76755cf3 authored by Ignacio's avatar Ignacio
Browse files

Merge branch 'dev' into 'master' 

Restaura config de EFS

See merge request redmic-project/gis/geoserver!3
parents a5814372 699020b2

.gitlab-ci.yml

+2 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ deploy-dev: 
    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

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

    STATUS_CHECK_DELAY: 120

  services:

    - docker:dind

  script:
@@ -92,6 +93,7 @@ deploy-pro: 
    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

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

    STATUS_CHECK_DELAY: 120

  services:

    - docker:dind

  script:

docker-compose.prod.yml

+6 −3
Original line number Diff line number Diff line
@@ -4,17 +4,17 @@ services: 
  geoserver:

    ports:

      - ${GEOSERVER_PORT}

    networks:

      - traefik-net

    environment:

      - SWARM_MODE=true

    networks:

      - traefik-net

    deploy:

      mode: replicated

      replicas: 3

      labels:

        traefik.port: "${GEOSERVER_PORT}"

        traefik.docker.network: traefik-net

        traefik.frontend.rule: Host:atlas.${PUBLIC_HOSTNAME}

        traefik.frontend.rule: Host:${GEOSERVER_SUBDOMAIN}.${PUBLIC_HOSTNAME}

        traefik.backend: geoserver

        traefik.backend.loadbalancer.stickiness: "true"

      placement:
@@ -30,4 +30,7 @@ networks: 


volumes:

  geoserver-vol:

    name: "geoserver-vol"

    driver: "cloudstor:aws"

    driver_opts:

      backing: shared

docker-compose.tmpl.yml

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ services: 
      - JAVA_OPTS=-Xmx512m -Xss512m

    networks:

      - gis-net

      - postgres-net

    volumes:

      - geoserver-vol:/var/geoserver/data

    healthcheck: