From 4a6b266a3c48d8a213d47d46548cc04f85d308d3 Mon Sep 17 00:00:00 2001 From: Gabriel Roldan Date: Wed, 20 Mar 2024 17:01:33 -0300 Subject: [PATCH] Move pgconfig docker compose deployment example from experimental to stable --- compose/compose.yml | 2 +- .../stable/jdbcconfig/docker-compose.yml | 20 +-- .../pgconfig/compose.yml | 131 ++++++++++++++---- .../stable/shared_datadir/docker-compose.yml | 20 +-- 4 files changed, 109 insertions(+), 64 deletions(-) rename docs/deploy/docker-compose/{experimental => stable}/pgconfig/compose.yml (69%) diff --git a/compose/compose.yml b/compose/compose.yml index 846ee6958..733c2ae3d 100644 --- a/compose/compose.yml +++ b/compose/compose.yml @@ -21,7 +21,7 @@ services: - PG_PORT=5432 - PG_DB=acl - PG_SCHEMA=acl - - PG_USER=acl + - PG_USERNAME=acl - PG_PASSWORD=acls3cr3t - 'ACL_USERS_ADMIN_PASSWORD={noop}s3cr3t' - 'ACL_USERS_GEOSERVER_PASSWORD={noop}s3cr3t' diff --git a/docs/deploy/docker-compose/stable/jdbcconfig/docker-compose.yml b/docs/deploy/docker-compose/stable/jdbcconfig/docker-compose.yml index bf9d4b93e..fae44311e 100644 --- a/docs/deploy/docker-compose/stable/jdbcconfig/docker-compose.yml +++ b/docs/deploy/docker-compose/stable/jdbcconfig/docker-compose.yml @@ -94,30 +94,16 @@ services: cpus: '2.0' memory: 512M - admin: - image: geoservercloud/geoserver-cloud-admin-server:1.7.0 - user: 1000:1000 # set the userid:groupid the container runs as - depends_on: - - config - ports: - - 9091:8080 - networks: - - gs-cloud-network - deploy: - resources: - limits: - cpus: '2.0' - memory: 1G - # Application facade, provides a single entry point routing to all - # microservices (e.g. http://localhost:9090/geoserver/wms, http://localhost:9090/geoserver/wfs, etc) + # microservices (e.g. http://localhost:9090/geoserver/cloud/wms, http://localhost:9090/geoserver/cloud/wfs, etc) gateway: image: geoservercloud/geoserver-cloud-gateway:1.7.0 user: 1000:1000 # set the userid:groupid the container runs as depends_on: - config environment: - SPRING_PROFILES_ACTIVE: "jdbcconfig" + # eat our own dogfood and set a base path + GEOSERVER_BASE_PATH: /geoserver/cloud ports: - 9090:8080 networks: diff --git a/docs/deploy/docker-compose/experimental/pgconfig/compose.yml b/docs/deploy/docker-compose/stable/pgconfig/compose.yml similarity index 69% rename from docs/deploy/docker-compose/experimental/pgconfig/compose.yml rename to docs/deploy/docker-compose/stable/pgconfig/compose.yml index e5e662254..f5b2690f1 100644 --- a/docs/deploy/docker-compose/experimental/pgconfig/compose.yml +++ b/docs/deploy/docker-compose/stable/pgconfig/compose.yml @@ -28,19 +28,28 @@ services: memory: 4G acl: - image: geoservercloud/geoserver-acl:2.0.2 + image: geoservercloud/geoserver-acl:2.0.1 user: 1000:1000 depends_on: pgconfigdb: condition: service_healthy + rabbitmq: + condition: service_healthy environment: - ACL_DB_URL: jdbc:postgresql://pgconfigdb:5432/pgconfig - ACL_DB_SCHEMA: acl - ACL_DB_USERNAME: pgconfig - ACL_DB_PASSWORD: pgconfig - ACL_SECURITY_BASIC_ENABLED: true - ACL_USERS_ADMIN_ENABLED: true - ACL_USERS_ADMIN_PASSWORD: "{noop}s3cr3t" + # Override default values in the container's /etc/geoserver/acl-service.yml + - PG_HOST=pgconfigdb + - PG_PORT=5432 + - PG_DB=pgconfig + - PG_SCHEMA=acl + - PG_USERNAME=pgconfig + - PG_PASSWORD=pgconfig + - 'ACL_USERS_ADMIN_PASSWORD={noop}s3cr3t' + - 'ACL_USERS_GEOSERVER_PASSWORD={noop}s3cr3t' + - GEOSERVER_BUS_ENABLED=true + - RABBITMQ_HOST=rabbitmq + - RABBITMQ_PORT=5672 + - RABBITMQ_USER=guest + - RABBITMQ_PASSWORD=guest deploy: resources: limits: @@ -55,11 +64,17 @@ services: restart: unless-stopped volumes: - rabbitmq_data:/var/lib/rabbitmq + healthcheck: + test: rabbitmq-diagnostics is_running + start_period: 10s + interval: 15s + timeout: 30s + retries: 3 deploy: resources: limits: - cpus: '2.0' - memory: 1G + cpus: '4.0' + memory: 2G # Eureka service discovery. This is a Discovery First Bootstrap configuration. # The discovery service is the only fixed entry point. @@ -107,19 +122,6 @@ services: limits: cpus: '2.0' memory: 512M - - admin: - image: geoservercloud/geoserver-cloud-admin-server:1.7.0 - user: 1000:1000 - depends_on: - - discovery - ports: - - 9091:8080 - deploy: - resources: - limits: - cpus: '2.0' - memory: 512M # Application facade, provides a single entry point routing to all # microservices (e.g. http://localhost:9090/geoserver/wms, http://localhost:9090/geoserver/wfs, etc) @@ -144,6 +146,17 @@ services: image: geoservercloud/geoserver-cloud-wfs:1.7.0 extends: service: geoserver + depends_on: + rabbitmq: + condition: service_healthy + discovery: + condition: service_healthy + pgconfigdb: + condition: service_started + config: + condition: service_healthy + acl: + condition: service_healthy deploy: replicas: 1 @@ -152,6 +165,17 @@ services: image: geoservercloud/geoserver-cloud-wms:1.7.0 extends: service: geoserver + depends_on: + rabbitmq: + condition: service_healthy + discovery: + condition: service_healthy + pgconfigdb: + condition: service_started + config: + condition: service_healthy + acl: + condition: service_healthy deploy: replicas: 1 @@ -160,6 +184,17 @@ services: image: geoservercloud/geoserver-cloud-wcs:1.7.0 extends: service: geoserver + depends_on: + rabbitmq: + condition: service_healthy + discovery: + condition: service_healthy + pgconfigdb: + condition: service_started + config: + condition: service_healthy + acl: + condition: service_healthy deploy: replicas: 1 @@ -168,6 +203,17 @@ services: image: geoservercloud/geoserver-cloud-wps:1.7.0 extends: service: geoserver + depends_on: + rabbitmq: + condition: service_healthy + discovery: + condition: service_healthy + pgconfigdb: + condition: service_started + config: + condition: service_healthy + acl: + condition: service_healthy deploy: replicas: 1 @@ -176,6 +222,17 @@ services: image: geoservercloud/geoserver-cloud-rest:1.7.0 extends: service: geoserver + depends_on: + rabbitmq: + condition: service_healthy + discovery: + condition: service_healthy + pgconfigdb: + condition: service_started + config: + condition: service_healthy + acl: + condition: service_healthy deploy: replicas: 1 @@ -186,6 +243,17 @@ services: service: geoserver volumes: - geowebcache_data:/data/geowebcache + depends_on: + rabbitmq: + condition: service_healthy + discovery: + condition: service_healthy + pgconfigdb: + condition: service_started + config: + condition: service_healthy + acl: + condition: service_healthy deploy: replicas: 1 @@ -195,6 +263,17 @@ services: service: geoserver volumes: - geowebcache_data:/data/geowebcache + depends_on: + rabbitmq: + condition: service_healthy + discovery: + condition: service_healthy + pgconfigdb: + condition: service_started + config: + condition: service_healthy + acl: + condition: service_healthy deploy: replicas: 1 @@ -207,12 +286,6 @@ services: ACL_URL: http://acl:8080/acl/api ACL_USERNAME: admin ACL_PASSWORD: s3cr3t - depends_on: - - pgconfigdb - - rabbitmq - - discovery - - config - - acl deploy: mode: replicated replicas: 0 diff --git a/docs/deploy/docker-compose/stable/shared_datadir/docker-compose.yml b/docs/deploy/docker-compose/stable/shared_datadir/docker-compose.yml index 1c0b498f7..17b3f3a36 100644 --- a/docs/deploy/docker-compose/stable/shared_datadir/docker-compose.yml +++ b/docs/deploy/docker-compose/stable/shared_datadir/docker-compose.yml @@ -84,30 +84,16 @@ services: cpus: '2.0' memory: 512M - admin: - image: geoservercloud/geoserver-cloud-admin-server:1.7.0 - user: 1000:1000 # set the userid:groupid the container runs as - depends_on: - - config - ports: - - 9091:8080 - networks: - - gs-cloud-network - deploy: - resources: - limits: - cpus: '2.0' - memory: 1G - # Application facade, provides a single entry point routing to all - # microservices (e.g. http://localhost:9090/geoserver/wms, http://localhost:9090/geoserver/wfs, etc) + # microservices (e.g. http://localhost:9090/geoserver/cloud/wms, http://localhost:9090/geoserver/cloud/wfs, etc) gateway: image: geoservercloud/geoserver-cloud-gateway:1.7.0 user: 1000:1000 # set the userid:groupid the container runs as depends_on: - config environment: - SPRING_PROFILES_ACTIVE: "datadir" + # eat our own dogfood and set a base path + GEOSERVER_BASE_PATH: /geoserver/cloud ports: - 9090:8080 networks: