Commit b00a30ec authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master'

Corrige propiedad inventada

See merge request redmic-project/gis/geoserver!45
parents f799af14 f17a9766
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -65,12 +65,14 @@ deploy-geoserver-master-dev:
    IMAGE_TAG: ${CI_COMMIT_SHA}
    COMPOSE_FILE: docker-compose.geoserver-master.tmpl.yml:docker-compose.geoserver-master.dev.yml
    GEOSERVER_SUBDOMAIN: ${DEV_GEOSERVER_ADMIN_SUBDOMAIN}
    GEOSERVER_PASS: ${DEV_GEOSERVER_PASS}
    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}
  script:
    - create-nets.sh gis-net
    - >
      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}
      GEOSERVER_SUBDOMAIN=${GEOSERVER_SUBDOMAIN} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}
      GEOSERVER_PASS=${GEOSERVER_PASS}
  environment:
    name: geoserver-master-dev
    url: https://${DEV_GEOSERVER_ADMIN_SUBDOMAIN}.${DEV_PUBLIC_HOSTNAME}
@@ -115,12 +117,14 @@ deploy-geoserver-master-supporting-branch:
    IMAGE_TAG: ${CI_COMMIT_SHA}
    COMPOSE_FILE: docker-compose.geoserver-master.tmpl.yml:docker-compose.geoserver-master.dev.yml
    GEOSERVER_SUBDOMAIN: ${DEV_GEOSERVER_ADMIN_SUBDOMAIN}
    GEOSERVER_PASS: ${DEV_GEOSERVER_PASS}
    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}
  script:
    - create-nets.sh gis-net
    - >
      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}
      GEOSERVER_SUBDOMAIN=${GEOSERVER_SUBDOMAIN} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}
      GEOSERVER_PASS=${GEOSERVER_PASS}
  environment:
    name: geoserver-master-dev
    url: https://${DEV_GEOSERVER_ADMIN_SUBDOMAIN}.${DEV_PUBLIC_HOSTNAME}
@@ -171,12 +175,14 @@ deploy-geoserver-master-pro:
    IMAGE_TAG: ${CI_COMMIT_SHA}
    COMPOSE_FILE: docker-compose.geoserver-master.tmpl.yml:docker-compose.geoserver-master.prod.yml
    GEOSERVER_SUBDOMAIN: ${PRO_GEOSERVER_ADMIN_SUBDOMAIN}
    GEOSERVER_PASS: ${PRO_GEOSERVER_PASS}
    PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}
  script:
    - create-nets.sh gis-net
    - >
      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}
      GEOSERVER_SUBDOMAIN=${GEOSERVER_SUBDOMAIN} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}
      GEOSERVER_PASS=${GEOSERVER_PASS}
  environment:
    name: geoserver-master-pro
    url: https://${PRO_GEOSERVER_ADMIN_SUBDOMAIN}.${PRO_PUBLIC_HOSTNAME}
+11 −18
Original line number Diff line number Diff line
@@ -10,27 +10,20 @@ ENV DEBIAN_FRONTEND="noninteractive" \
	GEOSERVER_DATA_DIR="/var/geoserver/data" \
	GEOSERVER_HOME="/opt/geoserver" \
	GEOSERVER_LOG_DIR="/var/log/geoserver" \
	GEOSERVER_OPTS="-server \
		-XX:+AggressiveOpts \
		-XX:+HeapDumpOnOutOfMemoryError \
		-XX:MaxNewSize=256m \
		-XX:NewSize=256m \
		-XX:MaxMetaspaceSize=128m \
		-XX:SurvivorRatio=12 \
		-XX:MaxTenuringThreshold=0 \
		-XX:+UseConcMarkSweepGC \
		-XX:+CMSIncrementalMode \
		-XX:+CMSIncrementalPacing \
		-XX:+CMSClassUnloadingEnabled \
		-XX:+DisableExplicitGC \
		-XX:+UseTLAB \
		-XX:SoftRefLRUPolicyMSPerMB=36000 \
	GEOSERVER_OPTS="-Djava.awt.headless=true \
		-server \
		-XX:PerfDataSamplingInterval=500 \
		-Dorg.geotools.referencing.forceXY=true \
		-XX:SoftRefLRUPolicyMSPerMB=36000  \
		-XX:NewRatio=2 \
		-XX:+CMSClassUnloadingEnabled \
		-Djavax.servlet.request.encoding=UTF-8 \
		-Djavax.servlet.response.encoding=UTF-8 \
		-Dorg.geotools.shapefile.datetime=true \
		-XX:+UnlockExperimentalVMOptions \
		-XX:+UseCGroupMemoryLimitForHeap \
		-XX:MaxRAMFraction=2 \
		-Djava.awt.headless=true \
		-Dorg.geotools.referencing.forceXY=true \
		-XX:+AggressiveOpts \
		-XX:+UseCGroupMemoryLimitForHeap \
		-Djava.library.path=/usr/share/java:/opt/libjpeg-turbo/lib64:/usr/lib/jni" \
	GOOGLE_FONTS="Open%20Sans Roboto Lato Ubuntu" \
	NOTO_FONTS="NotoSans-unhinted NotoSerif-unhinted NotoMono-hinted" \
+29 −0
Original line number Diff line number Diff line
version: '3.5'

services:
  geoserver:
    ports:
      - target: ${GEOSERVER_PORT}
        published: 8095
        mode: host
    deploy:
      mode: replicated
      replicas: 2
      labels:
        traefik.port: "${GEOSERVER_PORT}"
        traefik.docker.network: traefik-net
        traefik.frontend.rule: "Host:${GEOSERVER_SUBDOMAIN}.${PUBLIC_HOSTNAME};PathPrefix:/geoserver"
        traefik.backend: geoserver
      restart_policy:
        delay: 1m
        window: 3m
      resources:
        limits:
          cpus: '0.75'
          memory: 1G
        reservations:
          memory: 820M

volumes:
  geoserver-vol:
    name: geoserver-vol

resources/Lato.zip

deleted100644 → 0
−488 KiB

File deleted.

resources/NotoMono-hinted.zip

deleted100644 → 0
−69.9 KiB

File deleted.

Loading