From 9caf05e756dc89ce7deaa668bc60dec6ae3a7c73 Mon Sep 17 00:00:00 2001 From: Gabriel Roldan Date: Wed, 20 Mar 2024 16:50:53 -0300 Subject: [PATCH] Update docs to point to v1.7.0 --- README.md | 2 +- .../experimental/pgconfig/compose.yml | 28 +++++++++---------- .../stable/jdbcconfig/docker-compose.yml | 24 ++++++++-------- .../stable/shared_datadir/docker-compose.yml | 24 ++++++++-------- .../podman/traditional/manual/podman.md | 4 +-- docs/develop/index.md | 18 ++++++------ docs/index.md | 2 +- 7 files changed, 51 insertions(+), 51 deletions(-) diff --git a/README.md b/README.md index 77543666..e0604c0a 100644 --- a/README.md +++ b/README.md @@ -81,7 +81,7 @@ Follow the [developer's guide](docs/develop/index.md) to know more about the pro ## Status -`v1.6.1` released against GeoServer `2.24.2`. +`v1.7.0` released against GeoServer `2.25.0`. Read the [changelog](https://github.com/geoserver/geoserver-cloud/releases/) for more information. diff --git a/docs/deploy/docker-compose/experimental/pgconfig/compose.yml b/docs/deploy/docker-compose/experimental/pgconfig/compose.yml index ca6f228d..e5e66225 100644 --- a/docs/deploy/docker-compose/experimental/pgconfig/compose.yml +++ b/docs/deploy/docker-compose/experimental/pgconfig/compose.yml @@ -28,7 +28,7 @@ services: memory: 4G acl: - image: geoservercloud/geoserver-acl:2.0-SNAPSHOT + image: geoservercloud/geoserver-acl:2.0.2 user: 1000:1000 depends_on: pgconfigdb: @@ -66,7 +66,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.6.1 + image: geoservercloud/geoserver-cloud-discovery:1.7.0 user: 1000:1000 depends_on: - config @@ -82,7 +82,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.6.1 + image: geoservercloud/geoserver-cloud-config:1.7.0 user: 1000:1000 # set the userid:groupid the container runs as environment: # Either 'git' or 'native'. Use the default sample git repository to download the services configuration from @@ -91,7 +91,7 @@ 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.6.1 tag + # get the config for this release from the v1.7.0 tag SPRING_CLOUD_CONFIG_SERVER_GIT_DEFAULT_LABEL: master # where to store the cloned repository, if unset, it'll use /tmp/config-repo- CONFIG_GIT_BASEDIR: /tmp/git_config @@ -109,7 +109,7 @@ services: memory: 512M admin: - image: geoservercloud/geoserver-cloud-admin-server:1.6.1 + image: geoservercloud/geoserver-cloud-admin-server:1.7.0 user: 1000:1000 depends_on: - discovery @@ -124,7 +124,7 @@ services: # 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.6.1 + image: geoservercloud/geoserver-cloud-gateway:1.7.0 user: 1000:1000 depends_on: - discovery @@ -141,7 +141,7 @@ services: # WFS microservice, port dynamically allocated to allow scaling (e.g docker-compose scale wfs=5) wfs: - image: geoservercloud/geoserver-cloud-wfs:1.6.1 + image: geoservercloud/geoserver-cloud-wfs:1.7.0 extends: service: geoserver deploy: @@ -149,7 +149,7 @@ services: # WMS microservice, port dynamically allocated to allow scaling (e.g docker-compose scale wms=5) wms: - image: geoservercloud/geoserver-cloud-wms:1.6.1 + image: geoservercloud/geoserver-cloud-wms:1.7.0 extends: service: geoserver deploy: @@ -157,7 +157,7 @@ services: # WCS microservice, port dynamically allocated to allow scaling (e.g docker-compose scale wcs=5) wcs: - image: geoservercloud/geoserver-cloud-wcs:1.6.1 + image: geoservercloud/geoserver-cloud-wcs:1.7.0 extends: service: geoserver deploy: @@ -165,7 +165,7 @@ services: # WPS microservice, port dynamically allocated to allow scaling (e.g docker-compose scale wps=5) wps: - image: geoservercloud/geoserver-cloud-wps:1.6.1 + image: geoservercloud/geoserver-cloud-wps:1.7.0 extends: service: geoserver deploy: @@ -173,7 +173,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.6.1 + image: geoservercloud/geoserver-cloud-rest:1.7.0 extends: service: geoserver deploy: @@ -181,7 +181,7 @@ services: # WEB UI microservice webui: - image: geoservercloud/geoserver-cloud-webui:1.6.1 + image: geoservercloud/geoserver-cloud-webui:1.7.0 extends: service: geoserver volumes: @@ -190,7 +190,7 @@ services: replicas: 1 gwc: - image: geoservercloud/geoserver-cloud-gwc:1.6.1 + image: geoservercloud/geoserver-cloud-gwc:1.7.0 extends: service: geoserver volumes: @@ -199,7 +199,7 @@ services: replicas: 1 geoserver: - image: geoservercloud/geoserver-cloud-webui:1.6.1 + image: geoservercloud/geoserver-cloud-webui:1.7.0 user: 1000:1000 # set the userid:groupid the container runs as environment: JAVA_OPTS: -XX:MaxRAMPercentage=80 -XshowSettings:system diff --git a/docs/deploy/docker-compose/stable/jdbcconfig/docker-compose.yml b/docs/deploy/docker-compose/stable/jdbcconfig/docker-compose.yml index e1124384..bf9d4b93 100644 --- a/docs/deploy/docker-compose/stable/jdbcconfig/docker-compose.yml +++ b/docs/deploy/docker-compose/stable/jdbcconfig/docker-compose.yml @@ -45,7 +45,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.6.1 + image: geoservercloud/geoserver-cloud-discovery:1.7.0 user: 1000:1000 # set the userid:groupid the container runs as ports: - 8761:8761 @@ -62,7 +62,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.6.1 + image: geoservercloud/geoserver-cloud-config:1.7.0 user: 1000:1000 # set the userid:groupid the container runs as depends_on: - discovery @@ -75,8 +75,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.6.1 tag - SPRING_CLOUD_CONFIG_SERVER_GIT_DEFAULT_LABEL: v1.6.1 + # get the config for this release from the v1.7.0 tag + SPRING_CLOUD_CONFIG_SERVER_GIT_DEFAULT_LABEL: v1.7.0 # where to store the cloned repository, if unset, it'll use /tmp/config-repo- CONFIG_GIT_BASEDIR: /tmp/git_config # 'native' profile config @@ -95,7 +95,7 @@ services: memory: 512M admin: - image: geoservercloud/geoserver-cloud-admin-server:1.6.1 + image: geoservercloud/geoserver-cloud-admin-server:1.7.0 user: 1000:1000 # set the userid:groupid the container runs as depends_on: - config @@ -112,7 +112,7 @@ services: # 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.6.1 + image: geoservercloud/geoserver-cloud-gateway:1.7.0 user: 1000:1000 # set the userid:groupid the container runs as depends_on: - config @@ -130,7 +130,7 @@ services: # WFS microservice, port dynamically allocated to allow scaling (e.g docker-compose scale wfs=5) wfs: - image: geoservercloud/geoserver-cloud-wfs:1.6.1 + image: geoservercloud/geoserver-cloud-wfs:1.7.0 user: 1000:1000 # set the userid:groupid the container runs as depends_on: - config @@ -146,7 +146,7 @@ services: # WMS microservice, port dynamically allocated to allow scaling (e.g docker-compose scale wms=5) wms: - image: geoservercloud/geoserver-cloud-wms:1.6.1 + image: geoservercloud/geoserver-cloud-wms:1.7.0 user: 1000:1000 # set the userid:groupid the container runs as depends_on: - config @@ -162,7 +162,7 @@ services: # WCS microservice, port dynamically allocated to allow scaling (e.g docker-compose scale wcs=5) wcs: - image: geoservercloud/geoserver-cloud-wcs:1.6.1 + image: geoservercloud/geoserver-cloud-wcs:1.7.0 user: 1000:1000 # set the userid:groupid the container runs as depends_on: - config @@ -178,7 +178,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.6.1 + image: geoservercloud/geoserver-cloud-rest:1.7.0 user: 1000:1000 # set the userid:groupid the container runs as depends_on: - config @@ -196,7 +196,7 @@ services: # WEB UI microservice webui: - image: geoservercloud/geoserver-cloud-webui:1.6.1 + image: geoservercloud/geoserver-cloud-webui:1.7.0 user: 1000:1000 # set the userid:groupid the container runs as depends_on: - rabbitmq @@ -211,7 +211,7 @@ services: cpus: '2.0' memory: 1G gwc: - image: geoservercloud/geoserver-cloud-gwc:1.6.1 + image: geoservercloud/geoserver-cloud-gwc:1.7.0 user: 1000:1000 # set the userid:groupid the container runs as depends_on: - config 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 245c8dd3..1c0b498f 100644 --- a/docs/deploy/docker-compose/stable/shared_datadir/docker-compose.yml +++ b/docs/deploy/docker-compose/stable/shared_datadir/docker-compose.yml @@ -36,7 +36,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.6.1 + image: geoservercloud/geoserver-cloud-discovery:1.7.0 user: 1000:1000 # set the userid:groupid the container runs as ports: - 8761:8761 @@ -53,7 +53,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.6.1 + image: geoservercloud/geoserver-cloud-config:1.7.0 user: 1000:1000 # set the userid:groupid the container runs as depends_on: - discovery @@ -65,8 +65,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.6.1 tag - SPRING_CLOUD_CONFIG_SERVER_GIT_DEFAULT_LABEL: v1.6.1 + # get the config for this release from the v1.7.0 tag + SPRING_CLOUD_CONFIG_SERVER_GIT_DEFAULT_LABEL: v1.7.0 # where to store the cloned repository, if unset, it'll use /tmp/config-repo- CONFIG_GIT_BASEDIR: /tmp/git_config # 'native' profile config @@ -85,7 +85,7 @@ services: memory: 512M admin: - image: geoservercloud/geoserver-cloud-admin-server:1.6.1 + image: geoservercloud/geoserver-cloud-admin-server:1.7.0 user: 1000:1000 # set the userid:groupid the container runs as depends_on: - config @@ -102,7 +102,7 @@ services: # 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.6.1 + image: geoservercloud/geoserver-cloud-gateway:1.7.0 user: 1000:1000 # set the userid:groupid the container runs as depends_on: - config @@ -120,7 +120,7 @@ services: # WFS microservice, port dynamically allocated to allow scaling (e.g docker-compose scale wfs=5) wfs: - image: geoservercloud/geoserver-cloud-wfs:1.6.1 + image: geoservercloud/geoserver-cloud-wfs:1.7.0 user: 1000:1000 # set the userid:groupid the container runs as depends_on: - config @@ -139,7 +139,7 @@ services: # WMS microservice, port dynamically allocated to allow scaling (e.g docker-compose scale wms=5) wms: - image: geoservercloud/geoserver-cloud-wms:1.6.1 + image: geoservercloud/geoserver-cloud-wms:1.7.0 user: 1000:1000 # set the userid:groupid the container runs as depends_on: - config @@ -158,7 +158,7 @@ services: # WCS microservice, port dynamically allocated to allow scaling (e.g docker-compose scale wcs=5) wcs: - image: geoservercloud/geoserver-cloud-wcs:1.6.1 + image: geoservercloud/geoserver-cloud-wcs:1.7.0 user: 1000:1000 # set the userid:groupid the container runs as depends_on: - config @@ -177,7 +177,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.6.1 + image: geoservercloud/geoserver-cloud-rest:1.7.0 user: 1000:1000 # set the userid:groupid the container runs as depends_on: - config @@ -198,7 +198,7 @@ services: # WEB UI microservice webui: - image: geoservercloud/geoserver-cloud-webui:1.6.1 + image: geoservercloud/geoserver-cloud-webui:1.7.0 user: 1000:1000 # set the userid:groupid the container runs as depends_on: - config @@ -217,7 +217,7 @@ services: cpus: '2.0' memory: 1G gwc: - image: geoservercloud/geoserver-cloud-gwc:1.6.1 + image: geoservercloud/geoserver-cloud-gwc:1.7.0 user: 1000:1000 # set the userid:groupid the container runs as depends_on: - config diff --git a/docs/deploy/podman/traditional/manual/podman.md b/docs/deploy/podman/traditional/manual/podman.md index e72f5ded..66c92fbb 100644 --- a/docs/deploy/podman/traditional/manual/podman.md +++ b/docs/deploy/podman/traditional/manual/podman.md @@ -28,7 +28,7 @@ In order to speed up the "starting" part of the documentation we are going to do ```bash podman pull docker.io/library/rabbitmq:3.9-management -export GSCLOUD_VERSION=1.6.1 +export GSCLOUD_VERSION=1.7.0 for service in discovery config gateway admin-server rest webui wms wfs wcs do @@ -71,7 +71,7 @@ podman run -d --name=config --hostname=config \ --network gs-cloud-network \ -e SPRING_PROFILES_ACTIVE=git \ -e CONFIG_GIT_URI=https://github.com/geoserver/geoserver-cloud-config.git \ - -e SPRING_CLOUD_CONFIG_SERVER_GIT_DEFAULT_LABEL=v1.6.1 \ + -e SPRING_CLOUD_CONFIG_SERVER_GIT_DEFAULT_LABEL=v1.7.0 \ -e CONFIG_GIT_BASEDIR=/opt/app/git_config \ geoservercloud/geoserver-cloud-config:$GSCLOUD_VERSION ``` diff --git a/docs/develop/index.md b/docs/develop/index.md index 5ea5aa7e..1a1bf297 100644 --- a/docs/develop/index.md +++ b/docs/develop/index.md @@ -152,15 +152,15 @@ The simple build command above creates the following docker images: ```bash $ docker images|grep geoserver-cloud|sort -geoservercloud/geoserver-cloud-config 1.6.1 be987ff2a85e 42 minutes ago 319MB -geoservercloud/geoserver-cloud-discovery 1.6.1 abc5a17cf14c 42 minutes ago 320MB -geoservercloud/geoserver-cloud-gateway 1.6.1 10f267950c15 42 minutes ago 317MB -geoservercloud/geoserver-cloud-rest 1.6.1 29406a1e1fdb 36 minutes ago 429MB -geoservercloud/geoserver-cloud-wcs 1.6.1 c77ac22aa522 37 minutes ago 391MB -geoservercloud/geoserver-cloud-webui 1.6.1 876d6fc3fac0 36 minutes ago 449MB -geoservercloud/geoserver-cloud-wfs 1.6.1 62960137eb5a 38 minutes ago 410MB -geoservercloud/geoserver-cloud-wms 1.6.1 6686ca90b552 38 minutes ago 437MB -geoservercloud/geoserver-cloud-wps 1.6.1 73bae600226c 37 minutes ago 416MB +geoservercloud/geoserver-cloud-config 1.7.0 be987ff2a85e 42 minutes ago 319MB +geoservercloud/geoserver-cloud-discovery 1.7.0 abc5a17cf14c 42 minutes ago 320MB +geoservercloud/geoserver-cloud-gateway 1.7.0 10f267950c15 42 minutes ago 317MB +geoservercloud/geoserver-cloud-rest 1.7.0 29406a1e1fdb 36 minutes ago 429MB +geoservercloud/geoserver-cloud-wcs 1.7.0 c77ac22aa522 37 minutes ago 391MB +geoservercloud/geoserver-cloud-webui 1.7.0 876d6fc3fac0 36 minutes ago 449MB +geoservercloud/geoserver-cloud-wfs 1.7.0 62960137eb5a 38 minutes ago 410MB +geoservercloud/geoserver-cloud-wms 1.7.0 6686ca90b552 38 minutes ago 437MB +geoservercloud/geoserver-cloud-wps 1.7.0 73bae600226c 37 minutes ago 416MB ``` To run the build without building the docker images, disable the `docker` maven profile: diff --git a/docs/index.md b/docs/index.md index 7af5e675..4974a1fe 100644 --- a/docs/index.md +++ b/docs/index.md @@ -176,7 +176,7 @@ The following diagram depicts the System's general architecture: # Project Status -Version `1.6.1` has been released against a slightly customized GeoServer `2.24.2` +Version `1.7.0` has been released against a slightly customized GeoServer `2.25.0` with some important fixes to allow starting up several GeoServer instances from an empty directory or database. We will make sure to contribute those fixes upstream before the final release.