Update stable deployment configs to use 1.0-RC4 and add admin-server

geoserver · Dec 16, 2021 · 85fbd3a · 85fbd3a
1 parent fccae57
commit 85fbd3a
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 20 deletions.
diff --git a/docs/deploy/docker-compose/stable/jdbcconfig/docker-compose.yml b/docs/deploy/docker-compose/stable/jdbcconfig/docker-compose.yml
@@ -43,7 +43,7 @@ services:
   # Browse to http://localhost:8761 to check all services are registered.
   # Run docker-compose -f docker-compose.yml -f docker-compose-discovery-ha.yml to run extra discovery service instances for HA
   discovery:
-    image: geoservercloud/geoserver-cloud-discovery:1.0-RC3
+    image: geoservercloud/geoserver-cloud-discovery:1.0-RC4
     ports:
       - 8761:8761
     networks:
@@ -59,7 +59,7 @@ services:
   # microservices. Being a Discovery First Bootstrap configuration, it'll
   # register itself with the Eureka discovery service and can be scaled
   config:
-    image: geoservercloud/geoserver-cloud-config:1.0-RC3
+    image: geoservercloud/geoserver-cloud-config:1.0-RC4
     depends_on:
       - discovery
       - rabbitmq
@@ -71,8 +71,8 @@ services:
       SPRING_PROFILES_ACTIVE: git
       # 'git' profile config
       CONFIG_GIT_URI: https://github.com/geoserver/geoserver-cloud-config.git
-      # get the config for this release from the rv1.0-RC3 branch
-      SPRING_CLOUD_CONFIG_SERVER_GIT_DEFAULT_LABEL: v1.0-RC3
+      # get the config for this release from the rv1.0-RC4 branch
+      SPRING_CLOUD_CONFIG_SERVER_GIT_DEFAULT_LABEL: v1.0-RC4
       # where to store the cloned repository, if unset, it'll use /tmp/config-repo-<randomid>
       CONFIG_GIT_BASEDIR: /opt/app/git_config
       # 'native' profile config
@@ -88,10 +88,24 @@ services:
           cpus: '2.0'
           memory: 512M
 
+  admin:
+    image: geoservercloud/geoserver-cloud-admin-server:1.0-RC4
+    depends_on:
+      - config
+    ports:
+      - 9091:8080
+    networks:
+      - gs-cloud-network
+    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)
   gateway:
-    image: geoservercloud/geoserver-cloud-gateway:1.0-RC3
+    image: geoservercloud/geoserver-cloud-gateway:1.0-RC4
     depends_on:
       - config
     environment:
@@ -108,7 +122,7 @@ services:
 
   # WFS microservice, port dynamically allocated to allow scaling (e.g docker-compose scale wfs=5)
   wfs:
-    image: geoservercloud/geoserver-cloud-wfs:1.0-RC3
+    image: geoservercloud/geoserver-cloud-wfs:1.0-RC4
     depends_on:
       - config
     environment:
@@ -123,7 +137,7 @@ services:
 
   # WMS microservice, port dynamically allocated to allow scaling (e.g docker-compose scale wms=5)
   wms:
-    image: geoservercloud/geoserver-cloud-wms:1.0-RC3
+    image: geoservercloud/geoserver-cloud-wms:1.0-RC4
     depends_on:
       - config
     environment:
@@ -138,7 +152,7 @@ services:
 
   # WCS microservice, port dynamically allocated to allow scaling (e.g docker-compose scale wcs=5)
   wcs:
-    image: geoservercloud/geoserver-cloud-wcs:1.0-RC3
+    image: geoservercloud/geoserver-cloud-wcs:1.0-RC4
     depends_on:
       - config
     environment:
@@ -153,7 +167,7 @@ services:
 
   # REST config microservice, port dynamically allocated to allow scaling (e.g docker-compose scale rest=5)
   rest:
-    image: geoservercloud/geoserver-cloud-rest:1.0-RC3
+    image: geoservercloud/geoserver-cloud-rest:1.0-RC4
     depends_on:
       - config
     environment:
@@ -170,7 +184,7 @@ services:
 
   # WEB UI microservice
   webui:
-    image: geoservercloud/geoserver-cloud-webui:1.0-RC3
+    image: geoservercloud/geoserver-cloud-webui:1.0-RC4
     depends_on:
       - rabbitmq
     environment:

diff --git a/docs/deploy/docker-compose/stable/shared_datadir/docker-compose.yml b/docs/deploy/docker-compose/stable/shared_datadir/docker-compose.yml
@@ -34,7 +34,7 @@ services:
   # Browse to http://localhost:8761 to check all services are registered.
   # Run docker-compose -f docker-compose.yml -f docker-compose-discovery-ha.yml to run extra discovery service instances for HA
   discovery:
-    image: geoservercloud/geoserver-cloud-discovery:1.0-RC3
+    image: geoservercloud/geoserver-cloud-discovery:1.0-RC4
     ports:
       - 8761:8761
     networks:
@@ -50,7 +50,7 @@ services:
   # microservices. Being a Discovery First Bootstrap configuration, it'll
   # register itself with the Eureka discovery service and can be scaled
   config:
-    image: geoservercloud/geoserver-cloud-config:1.0-RC3
+    image: geoservercloud/geoserver-cloud-config:1.0-RC4
     depends_on:
       - discovery
       - rabbitmq
@@ -61,8 +61,8 @@ services:
       SPRING_PROFILES_ACTIVE: git
       # 'git' profile config
       CONFIG_GIT_URI: https://github.com/geoserver/geoserver-cloud-config.git
-      # get the config for this release from the v1.0-RC3 tag
-      SPRING_CLOUD_CONFIG_SERVER_GIT_DEFAULT_LABEL: v1.0-RC3
+      # get the config for this release from the v1.0-RC4 tag
+      SPRING_CLOUD_CONFIG_SERVER_GIT_DEFAULT_LABEL: v1.0-RC4
       # where to store the cloned repository, if unset, it'll use /tmp/config-repo-<randomid>
       CONFIG_GIT_BASEDIR: /opt/app/git_config
       # 'native' profile config
@@ -78,10 +78,24 @@ services:
           cpus: '2.0'
           memory: 512M
 
+  admin:
+    image: geoservercloud/geoserver-cloud-admin-server:1.0-RC4
+    depends_on:
+      - config
+    ports:
+      - 9091:8080
+    networks:
+      - gs-cloud-network
+    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)
   gateway:
-    image: geoservercloud/geoserver-cloud-gateway:1.0-RC3
+    image: geoservercloud/geoserver-cloud-gateway:1.0-RC4
     depends_on:
       - config
     environment:
@@ -98,7 +112,7 @@ services:
 
   # WFS microservice, port dynamically allocated to allow scaling (e.g docker-compose scale wfs=5)
   wfs:
-    image: geoservercloud/geoserver-cloud-wfs:1.0-RC3
+    image: geoservercloud/geoserver-cloud-wfs:1.0-RC4
     depends_on:
       - config
     environment:
@@ -116,7 +130,7 @@ services:
 
   # WMS microservice, port dynamically allocated to allow scaling (e.g docker-compose scale wms=5)
   wms:
-    image: geoservercloud/geoserver-cloud-wms:1.0-RC3
+    image: geoservercloud/geoserver-cloud-wms:1.0-RC4
     depends_on:
       - config
     environment:
@@ -134,7 +148,7 @@ services:
 
   # WCS microservice, port dynamically allocated to allow scaling (e.g docker-compose scale wcs=5)
   wcs:
-    image: geoservercloud/geoserver-cloud-wcs:1.0-RC3
+    image: geoservercloud/geoserver-cloud-wcs:1.0-RC4
     depends_on:
       - config
     environment:
@@ -152,7 +166,7 @@ services:
 
   # REST config microservice, port dynamically allocated to allow scaling (e.g docker-compose scale rest=5)
   rest:
-    image: geoservercloud/geoserver-cloud-rest:1.0-RC3
+    image: geoservercloud/geoserver-cloud-rest:1.0-RC4
     depends_on:
       - config
     environment:
@@ -172,7 +186,7 @@ services:
 
   # WEB UI microservice
   webui:
-    image: geoservercloud/geoserver-cloud-webui:1.0-RC3
+    image: geoservercloud/geoserver-cloud-webui:1.0-RC4
     depends_on:
       - config
     environment: