Commit 08bfbc96 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Intercambia volúmenes nfs por seaweedfs, limpia

parent 13c673a2

.gitlab-ci.yml

+0 −2
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ variables: 
.deploy:

  variables:

    STACK: ${PROJECT_PARENT_NAME}

  environment:

    url: https://${DD_GEOSERVER_SUBDOMAIN}.${PUBLIC_HOSTNAME}



.deploy-external-service:

  variables:

deploy/.env

+2 −3
Original line number Diff line number Diff line
@@ -43,9 +43,8 @@ POSTGRES_DB=gwc 
PGDATA=/var/lib/postgresql/data

POSTGRES_INITDB_WALDIR=/var/lib/postgresql/wal



VOL_TYPE=nfs4

VOL_ADDR=127.0.0.1

VOL_OPTS=rw,nolock,noatime,tcp,rsize=8192,wsize=8192,timeo=14

DEV_VOL_DRIVER=seaweedfs



GEOSERVER_DATA_VOL_NAME=geoserver-data-vol

CACHE_VOL_NAME=geoserver-cache-vol

FONTS_VOL_NAME=geoserver-fonts-vol

deploy/docker-compose.dev.yml

+7 −31
Original line number Diff line number Diff line 
version: '3.8'

version: '3.9'



services:

  geoserver-master:
@@ -30,48 +30,24 @@ services: 
volumes:

  geoserver-data-vol:

    name: ${GEOSERVER_DATA_VOL_NAME}

    driver: local

    driver_opts:

      type: ${VOL_TYPE}

      o: addr=${VOL_ADDR},${VOL_OPTS}

      device: ${GEOSERVER_DATA_VOL_DEVICE:-:/geoserver-data-vol/}

    driver: ${DEV_VOL_DRIVER}



  cache-vol:

    name: ${CACHE_VOL_NAME}

    driver: local

    driver_opts:

      type: ${VOL_TYPE}

      o: addr=${VOL_ADDR},${VOL_OPTS}

      device: ${CACHE_VOL_DEVICE:-:/geoserver-cache-vol/}

    driver: ${DEV_VOL_DRIVER}



  fonts-vol:

    name: ${FONTS_VOL_NAME}

    driver: local

    driver_opts:

      type: ${VOL_TYPE}

      o: addr=${VOL_ADDR},${VOL_OPTS}

      device: ${FONTS_VOL_DEVICE:-:/geoserver-fonts-vol/}

    driver: ${DEV_VOL_DRIVER}



  footprints-vol:

    name: ${FOOTPRINTS_VOL_NAME}

    driver: local

    driver_opts:

      type: ${VOL_TYPE}

      o: addr=${VOL_ADDR},${VOL_OPTS}

      device: ${FOOTPRINTS_VOL_DEVICE:-:/geoserver-footprints-vol/}

    driver: ${DEV_VOL_DRIVER}



  postgres-data-vol:

    name: ${POSTGRES_DATA_VOL_NAME}

    driver: local

    driver_opts:

      type: ${VOL_TYPE}

      o: addr=${VOL_ADDR},${VOL_OPTS}

      device: ${POSTGRES_DATA_VOL_DEVICE:-:/postgres-gwc-data-vol/}

    driver: ${DEV_VOL_DRIVER}



  wal-vol:

    name: ${WAL_VOL_NAME}

    driver: local

    driver_opts:

      type: ${VOL_TYPE}

      o: addr=${VOL_ADDR},${VOL_OPTS}

      device: ${WAL_VOL_DEVICE:-:/postgres-gwc-wal-vol/}
 
    driver: ${DEV_VOL_DRIVER}

deploy/docker-compose.prod.yml

+1 −1
Original line number Diff line number Diff line 
version: '3.8'

version: '3.9'



services:

  geoserver-master:

deploy/docker-compose.tmpl.yml

+1 −1
Original line number Diff line number Diff line 
version: '3.8'

version: '3.9'



x-geoserver-root: &geoserver-root

  image: ${GEOSERVER_IMAGE_NAME:-kartoza/geoserver}:${GEOSERVER_IMAGE_TAG:-latest}