Skip to content

Commit

Permalink
Point docs to 1.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
groldan committed Jun 7, 2023
1 parent e79dff8 commit 632a235
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 32 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,9 @@ make test
GeoServer that have not yet been integrated into the mainstream
`main` branch. Additionally, the `geoserver-cloud_integration`
GeoServer branch changes the artifact versions from `2.21-SNAPSHOT`
to `2.21.0-CLOUD`, to avoid confusing maven if you also work
to `2.23.0-CLOUD`, to avoid confusing maven if you also work
with vanilla GeoServer, and to avoid your IDE downloading the
latest `2.21-SNAPSHOT` artifacts from the OsGeo maven repository,
latest `2.23-SNAPSHOT` artifacts from the OsGeo maven repository,
overriding your local maven repository ones, and having
confusing compilation errors that would require re-building
the branch we need.
Expand Down Expand Up @@ -112,7 +112,7 @@ make build-image
*Cloud Native GeoServer*-specific modules source code
is under the `src/` directory.

When you already have the `2.21.0-CLOUD` GeoServer artifacts,
When you already have the `2.23.0-CLOUD` GeoServer artifacts,
you can chose to only build these projects, either by:


Expand Down Expand Up @@ -181,9 +181,9 @@ Follow the [developer's guide](docs/develop/index.md) to know more about the pro

## Status

`v1.0.4` released against GeoServer `2.23.0`.
`v1.1.0` released against GeoServer `2.23.0`.

Read the [changelog](https://github.com/geoserver/geoserver-cloud/releases/tag/v1.0.2) for more information.
Read the [changelog](https://github.com/geoserver/geoserver-cloud/releases/tag/v1.1.0) for more information.

## Bugs

Expand Down
24 changes: 12 additions & 12 deletions docs/deploy/docker-compose/stable/jdbcconfig/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.0.4
image: geoservercloud/geoserver-cloud-discovery:1.1.0
user: 1000:1000 # set the userid:groupid the container runs as
ports:
- 8761:8761
Expand All @@ -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.0.4
image: geoservercloud/geoserver-cloud-config:1.1.0
user: 1000:1000 # set the userid:groupid the container runs as
depends_on:
- discovery
Expand All @@ -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.0.4 tag
SPRING_CLOUD_CONFIG_SERVER_GIT_DEFAULT_LABEL: v1.0.4
# get the config for this release from the v1.1.0 tag
SPRING_CLOUD_CONFIG_SERVER_GIT_DEFAULT_LABEL: v1.1.0
# where to store the cloned repository, if unset, it'll use /tmp/config-repo-<randomid>
CONFIG_GIT_BASEDIR: /tmp/git_config
# 'native' profile config
Expand All @@ -95,7 +95,7 @@ services:
memory: 512M

admin:
image: geoservercloud/geoserver-cloud-admin-server:1.0.4
image: geoservercloud/geoserver-cloud-admin-server:1.1.0
user: 1000:1000 # set the userid:groupid the container runs as
depends_on:
- config
Expand All @@ -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.0.4
image: geoservercloud/geoserver-cloud-gateway:1.1.0
user: 1000:1000 # set the userid:groupid the container runs as
depends_on:
- config
Expand All @@ -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.0.4
image: geoservercloud/geoserver-cloud-wfs:1.1.0
user: 1000:1000 # set the userid:groupid the container runs as
depends_on:
- config
Expand All @@ -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.0.4
image: geoservercloud/geoserver-cloud-wms:1.1.0
user: 1000:1000 # set the userid:groupid the container runs as
depends_on:
- config
Expand All @@ -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.0.4
image: geoservercloud/geoserver-cloud-wcs:1.1.0
user: 1000:1000 # set the userid:groupid the container runs as
depends_on:
- config
Expand All @@ -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.0.4
image: geoservercloud/geoserver-cloud-rest:1.1.0
user: 1000:1000 # set the userid:groupid the container runs as
depends_on:
- config
Expand All @@ -196,7 +196,7 @@ services:

# WEB UI microservice
webui:
image: geoservercloud/geoserver-cloud-webui:1.0.4
image: geoservercloud/geoserver-cloud-webui:1.1.0
user: 1000:1000 # set the userid:groupid the container runs as
depends_on:
- rabbitmq
Expand All @@ -211,7 +211,7 @@ services:
cpus: '2.0'
memory: 1G
gwc:
image: geoservercloud/geoserver-cloud-gwc:1.0.4
image: geoservercloud/geoserver-cloud-gwc:1.1.0
user: 1000:1000 # set the userid:groupid the container runs as
depends_on:
- config
Expand Down
24 changes: 12 additions & 12 deletions docs/deploy/docker-compose/stable/shared_datadir/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.0.4
image: geoservercloud/geoserver-cloud-discovery:1.1.0
user: 1000:1000 # set the userid:groupid the container runs as
ports:
- 8761:8761
Expand All @@ -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.0.4
image: geoservercloud/geoserver-cloud-config:1.1.0
user: 1000:1000 # set the userid:groupid the container runs as
depends_on:
- discovery
Expand All @@ -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.0.4 tag
SPRING_CLOUD_CONFIG_SERVER_GIT_DEFAULT_LABEL: v1.0.4
# get the config for this release from the v1.1.0 tag
SPRING_CLOUD_CONFIG_SERVER_GIT_DEFAULT_LABEL: v1.1.0
# where to store the cloned repository, if unset, it'll use /tmp/config-repo-<randomid>
CONFIG_GIT_BASEDIR: /tmp/git_config
# 'native' profile config
Expand All @@ -85,7 +85,7 @@ services:
memory: 512M

admin:
image: geoservercloud/geoserver-cloud-admin-server:1.0.4
image: geoservercloud/geoserver-cloud-admin-server:1.1.0
user: 1000:1000 # set the userid:groupid the container runs as
depends_on:
- config
Expand All @@ -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.0.4
image: geoservercloud/geoserver-cloud-gateway:1.1.0
user: 1000:1000 # set the userid:groupid the container runs as
depends_on:
- config
Expand All @@ -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.0.4
image: geoservercloud/geoserver-cloud-wfs:1.1.0
user: 1000:1000 # set the userid:groupid the container runs as
depends_on:
- config
Expand All @@ -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.0.4
image: geoservercloud/geoserver-cloud-wms:1.1.0
user: 1000:1000 # set the userid:groupid the container runs as
depends_on:
- config
Expand All @@ -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.0.4
image: geoservercloud/geoserver-cloud-wcs:1.1.0
user: 1000:1000 # set the userid:groupid the container runs as
depends_on:
- config
Expand All @@ -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.0.4
image: geoservercloud/geoserver-cloud-rest:1.1.0
user: 1000:1000 # set the userid:groupid the container runs as
depends_on:
- config
Expand All @@ -198,7 +198,7 @@ services:

# WEB UI microservice
webui:
image: geoservercloud/geoserver-cloud-webui:1.0.4
image: geoservercloud/geoserver-cloud-webui:1.1.0
user: 1000:1000 # set the userid:groupid the container runs as
depends_on:
- config
Expand All @@ -217,7 +217,7 @@ services:
cpus: '2.0'
memory: 1G
gwc:
image: geoservercloud/geoserver-cloud-gwc:1.0.4
image: geoservercloud/geoserver-cloud-gwc:1.1.0
user: 1000:1000 # set the userid:groupid the container runs as
depends_on:
- config
Expand Down
4 changes: 2 additions & 2 deletions docs/deploy/podman/traditional/manual/podman.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.0.4
export GSCLOUD_VERSION=1.1.0

for service in discovery config gateway admin-server rest webui wms wfs wcs
do
Expand Down Expand Up @@ -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.0.4 \
-e SPRING_CLOUD_CONFIG_SERVER_GIT_DEFAULT_LABEL=v1.1.0 \
-e CONFIG_GIT_BASEDIR=/opt/app/git_config \
geoservercloud/geoserver-cloud-config:$GSCLOUD_VERSION
```
Expand Down
2 changes: 1 addition & 1 deletion docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ The following diagram depicts the System's general architecture:
# Project Status

Version `1.0.2` has been released against a slightly customized GeoServer `2.23.0`
Version `1.1.0` has been released against a slightly customized GeoServer `2.23.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.
Expand Down

0 comments on commit 632a235

Please sign in to comment.