From 5fbfd38d94b03f093579f30d439804cbf7fbf2a9 Mon Sep 17 00:00:00 2001 From: Sylvain Gaudan Date: Thu, 27 Feb 2025 09:41:27 +0100 Subject: [PATCH 1/8] Update docker compose services documentation --- .../docker_compose_services_aias.md | 22 +++++++++---------- .../docker_compose_services_iam.md | 22 +++++++++---------- .../docker_compose_services_simple.md | 14 ++++++------ 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/docs/docs/dc_services/docker_compose_services_aias.md b/docs/docs/dc_services/docker_compose_services_aias.md index c5155b9..17f5f7c 100644 --- a/docs/docs/dc_services/docker_compose_services_aias.md +++ b/docs/docs/dc_services/docker_compose_services_aias.md @@ -31,7 +31,7 @@ Image: `ELASTIC_VERSION` with `docker.elastic.co/elasticsearch/elasticsearch:8.9 | `discovery.type` | `single-node` | `` | | | | `cluster.name` | `arlas-es-cluster` | `` | | | | `node.name` | `arlas-data-node-1` | `` | | | -| `ES_JAVA_OPTS` | `ES_JAVA_OPTS` | `` | | `-Xms1g -Xmx1g` in `conf/elastic.env` | +| `ES_JAVA_OPTS` | `ES_JAVA_OPTS` | `` | | `-Xms500m -Xmx500m` in `conf/elastic.env` | | `xpack.security.enabled` | `false` | `` | | | | `xpack.security.http.ssl.enabled` | `false` | `` | | | | `xpack.security.transport.ssl.enabled` | `false` | `` | | | @@ -44,7 +44,7 @@ List of volumes: ### Service arlas-server Description: ARLAS Server is the geo-analytic engine of the ARLAS Exploration Stack -Image: `ARLAS_SERVER_VERSION` with `gisaia/arlas-server:26.0.6` in `conf/versions.env` +Image: `ARLAS_SERVER_VERSION` with `gisaia/arlas-server:26.0.8` in `conf/versions.env` | Container variable | Value or environment variable | Default | Description | Env file setting | | --- | --- | --- | --- | --- | @@ -79,7 +79,7 @@ Image: `ARLAS_SERVER_VERSION` with `gisaia/arlas-server:26.0.6` in `conf/version ### Service arlas-persistence-server Description: ARLAS Persistence is a service for storing and retrieving small ojects, such as JSON documents or image previews. -Image: `ARLAS_PERSISTENCE_VERSION` with `gisaia/arlas-persistence-server:26.0.0` in `conf/versions.env` +Image: `ARLAS_PERSISTENCE_VERSION` with `gisaia/arlas-persistence-server:26.0.2` in `conf/versions.env` | Container variable | Value or environment variable | Default | Description | Env file setting | | --- | --- | --- | --- | --- | @@ -116,7 +116,7 @@ List of volumes: ### Service arlas-permissions-server Description: ARLAS Permissions is a service for listing user's permissions -Image: `ARLAS_PERMISSIONS_VERSION` with `gisaia/arlas-permissions-server:26.0.0` in `conf/versions.env` +Image: `ARLAS_PERMISSIONS_VERSION` with `gisaia/arlas-permissions-server:26.0.2` in `conf/versions.env` | Container variable | Value or environment variable | Default | Description | Env file setting | | --- | --- | --- | --- | --- | @@ -145,7 +145,7 @@ Image: `ARLAS_PERMISSIONS_VERSION` with `gisaia/arlas-permissions-server:26.0.0` ### Service arlas-iam-server Description: ARLAS IAM is the ARLAS Identity and Access Management service. -Image: `ARLAS_IAM_SERVER_VERSION` with `gisaia/arlas-iam-server:26.0.2` in `conf/versions.env` +Image: `ARLAS_IAM_SERVER_VERSION` with `gisaia/arlas-iam-server:26.0.5` in `conf/versions.env` | Container variable | Value or environment variable | Default | Description | Env file setting | | --- | --- | --- | --- | --- | @@ -163,7 +163,7 @@ Image: `ARLAS_IAM_SERVER_VERSION` with `gisaia/arlas-iam-server:26.0.2` in `conf | `ARLAS_IAM_PORT` | `ARLAS_IAM_PORT` | `9998` | | | | `ARLAS_IAM_VERIFY_EMAIL` | `ARLAS_IAM_VERIFY_EMAIL` | `` | | `false` in `conf/arlas_iam.env` | | `ARLAS_REFRESH_TOKEN_TTL` | `600000` | `` | | | -| `ARLAS_SERVER_URL` | `"http://arlas-server:9999/arlas/"` | `` | | | +| `ARLAS_SERVER_URL` | `"http://arlas-server:9999/arlas"` | `` | | | | `ARLAS_SMTP_ACTIVATED` | `ARLAS_SMTP_ACTIVATED` | `` | | `false` in `conf/aias.env`
`false` in `conf/arlas_iam.env` | | `ARLAS_SMTP_FROM` | `ARLAS_SMTP_FROM` | `` | | `tobechanged@tobechanged.io` in `conf/aias.env`
empty value in `conf/arlas_iam.env` | | `ARLAS_SMTP_HOST` | `ARLAS_SMTP_HOST` | `` | | `tobechanged` in `conf/aias.env`
empty value in `conf/arlas_iam.env` | @@ -182,7 +182,7 @@ Image: `ARLAS_IAM_SERVER_VERSION` with `gisaia/arlas-iam-server:26.0.2` in `conf ### Service arlas-wui-iam Description: ARLAS IAM is the ARLAS Identity and Access Management web interface. -Image: `ARLAS_WUI_IAM_VERSION` with `gisaia/arlas-wui-iam:26.1.0` in `conf/versions.env` +Image: `ARLAS_WUI_IAM_VERSION` with `gisaia/arlas-wui-iam:26.1.1` in `conf/versions.env` | Container variable | Value or environment variable | Default | Description | Env file setting | | --- | --- | --- | --- | --- | @@ -199,7 +199,7 @@ Image: `ARLAS_WUI_IAM_VERSION` with `gisaia/arlas-wui-iam:26.1.0` in `conf/versi ### Service arlas-builder Description: ARLAS Builder is the interface for elaborating ARLAS Dashboards. -Image: `ARLAS_BUILDER_VERSION` with `gisaia/arlas-wui-builder:26.1.0` in `conf/versions.env` +Image: `ARLAS_BUILDER_VERSION` with `gisaia/arlas-wui-builder:26.1.2` in `conf/versions.env` | Container variable | Value or environment variable | Default | Description | Env file setting | | --- | --- | --- | --- | --- | @@ -231,7 +231,7 @@ Image: `ARLAS_BUILDER_VERSION` with `gisaia/arlas-wui-builder:26.1.0` in `conf/v | `ARLAS_IAM_SERVER_URL` | `ARLAS_IAM_SERVER_URL` | `/arlas_iam_server` | | | | `ARLAS_PERMISSIONS_URL` | `ARLAS_PERMISSIONS_URL` | `/arlas_permissions_server` | | | | `ARLAS_PERSISTENCE_URL` | `ARLAS_PERSISTENCE_URL` | `/arlas_persistence_server` | | `/persist` in `conf/persistence-file.env`
`https://${ARLAS_HOST}/persist` in `conf/arlas_iam.env` | -| `ARLAS_SERVER_URL` | `ARLAS_SERVER_URL` | `/arlas` | | `https://${ARLAS_HOST}/arlas` in `conf/arlas_iam.env` | +| `ARLAS_SERVER_URL` | `ARLAS_SERVER_URL` | `/arlas` | | | | `ARLAS_USE_AUTHENT` | `ARLAS_USE_AUTHENT` | `` | | `true` in `conf/arlas_iam.env` | | `ARLAS_WUI_URL` | `ARLAS_WUI_URL` | `/wui/` | | `https://${ARLAS_HOST}/wui/` in `conf/arlas_iam.env` | | `ARLAS_STATIC_LINKS` | `ARLAS_BUILDER_LINKS` | `` | | `'` in `conf/arlas.env` | @@ -240,7 +240,7 @@ Image: `ARLAS_BUILDER_VERSION` with `gisaia/arlas-wui-builder:26.1.0` in `conf/v ### Service arlas-hub Description: ARLAS Hub is the interface for discovering all the available ARLAS Dashboards -Image: `ARLAS_HUB_VERSION` with `gisaia/arlas-wui-hub:26.1.0` in `conf/versions.env` +Image: `ARLAS_HUB_VERSION` with `gisaia/arlas-wui-hub:26.1.2` in `conf/versions.env` | Container variable | Value or environment variable | Default | Description | Env file setting | | --- | --- | --- | --- | --- | @@ -276,7 +276,7 @@ Image: `ARLAS_HUB_VERSION` with `gisaia/arlas-wui-hub:26.1.0` in `conf/versions. ### Service arlas-wui Description: ARLAS WUI is ARLAS Web interface for visualising an analytic ARLAS Dashboard. -Image: `ARLAS_WUI_VERSION` with `gisaia/arlas-wui:26.1.0-no-analytics` in `conf/versions.env` +Image: `ARLAS_WUI_VERSION` with `gisaia/arlas-wui:26.1.1-no-analytics` in `conf/versions.env` | Container variable | Value or environment variable | Default | Description | Env file setting | | --- | --- | --- | --- | --- | diff --git a/docs/docs/dc_services/docker_compose_services_iam.md b/docs/docs/dc_services/docker_compose_services_iam.md index 3a06907..8637c48 100644 --- a/docs/docs/dc_services/docker_compose_services_iam.md +++ b/docs/docs/dc_services/docker_compose_services_iam.md @@ -22,7 +22,7 @@ Image: `ELASTIC_VERSION` with `docker.elastic.co/elasticsearch/elasticsearch:8.9 | `discovery.type` | `single-node` | `` | | | | `cluster.name` | `arlas-es-cluster` | `` | | | | `node.name` | `arlas-data-node-1` | `` | | | -| `ES_JAVA_OPTS` | `ES_JAVA_OPTS` | `` | | `-Xms1g -Xmx1g` in `conf/elastic.env` | +| `ES_JAVA_OPTS` | `ES_JAVA_OPTS` | `` | | `-Xms500m -Xmx500m` in `conf/elastic.env` | | `xpack.security.enabled` | `false` | `` | | | | `xpack.security.http.ssl.enabled` | `false` | `` | | | | `xpack.security.transport.ssl.enabled` | `false` | `` | | | @@ -35,7 +35,7 @@ List of volumes: ### Service arlas-server Description: ARLAS Server is the geo-analytic engine of the ARLAS Exploration Stack -Image: `ARLAS_SERVER_VERSION` with `gisaia/arlas-server:26.0.6` in `conf/versions.env` +Image: `ARLAS_SERVER_VERSION` with `gisaia/arlas-server:26.0.8` in `conf/versions.env` | Container variable | Value or environment variable | Default | Description | Env file setting | | --- | --- | --- | --- | --- | @@ -70,7 +70,7 @@ Image: `ARLAS_SERVER_VERSION` with `gisaia/arlas-server:26.0.6` in `conf/version ### Service arlas-persistence-server Description: ARLAS Persistence is a service for storing and retrieving small ojects, such as JSON documents or image previews. -Image: `ARLAS_PERSISTENCE_VERSION` with `gisaia/arlas-persistence-server:26.0.0` in `conf/versions.env` +Image: `ARLAS_PERSISTENCE_VERSION` with `gisaia/arlas-persistence-server:26.0.2` in `conf/versions.env` | Container variable | Value or environment variable | Default | Description | Env file setting | | --- | --- | --- | --- | --- | @@ -107,7 +107,7 @@ List of volumes: ### Service arlas-permissions-server Description: ARLAS Permissions is a service for listing user's permissions -Image: `ARLAS_PERMISSIONS_VERSION` with `gisaia/arlas-permissions-server:26.0.0` in `conf/versions.env` +Image: `ARLAS_PERMISSIONS_VERSION` with `gisaia/arlas-permissions-server:26.0.2` in `conf/versions.env` | Container variable | Value or environment variable | Default | Description | Env file setting | | --- | --- | --- | --- | --- | @@ -136,7 +136,7 @@ Image: `ARLAS_PERMISSIONS_VERSION` with `gisaia/arlas-permissions-server:26.0.0` ### Service arlas-iam-server Description: ARLAS IAM is the ARLAS Identity and Access Management service. -Image: `ARLAS_IAM_SERVER_VERSION` with `gisaia/arlas-iam-server:26.0.2` in `conf/versions.env` +Image: `ARLAS_IAM_SERVER_VERSION` with `gisaia/arlas-iam-server:26.0.5` in `conf/versions.env` | Container variable | Value or environment variable | Default | Description | Env file setting | | --- | --- | --- | --- | --- | @@ -154,7 +154,7 @@ Image: `ARLAS_IAM_SERVER_VERSION` with `gisaia/arlas-iam-server:26.0.2` in `conf | `ARLAS_IAM_PORT` | `ARLAS_IAM_PORT` | `9998` | | | | `ARLAS_IAM_VERIFY_EMAIL` | `ARLAS_IAM_VERIFY_EMAIL` | `` | | `false` in `conf/arlas_iam.env` | | `ARLAS_REFRESH_TOKEN_TTL` | `600000` | `` | | | -| `ARLAS_SERVER_URL` | `"http://arlas-server:9999/arlas/"` | `` | | | +| `ARLAS_SERVER_URL` | `"http://arlas-server:9999/arlas"` | `` | | | | `ARLAS_SMTP_ACTIVATED` | `ARLAS_SMTP_ACTIVATED` | `` | | `false` in `conf/arlas_iam.env` | | `ARLAS_SMTP_FROM` | `ARLAS_SMTP_FROM` | `` | | empty value in `conf/arlas_iam.env` | | `ARLAS_SMTP_HOST` | `ARLAS_SMTP_HOST` | `` | | empty value in `conf/arlas_iam.env` | @@ -173,7 +173,7 @@ Image: `ARLAS_IAM_SERVER_VERSION` with `gisaia/arlas-iam-server:26.0.2` in `conf ### Service arlas-wui-iam Description: ARLAS IAM is the ARLAS Identity and Access Management web interface. -Image: `ARLAS_WUI_IAM_VERSION` with `gisaia/arlas-wui-iam:26.1.0` in `conf/versions.env` +Image: `ARLAS_WUI_IAM_VERSION` with `gisaia/arlas-wui-iam:26.1.1` in `conf/versions.env` | Container variable | Value or environment variable | Default | Description | Env file setting | | --- | --- | --- | --- | --- | @@ -190,7 +190,7 @@ Image: `ARLAS_WUI_IAM_VERSION` with `gisaia/arlas-wui-iam:26.1.0` in `conf/versi ### Service arlas-builder Description: ARLAS Builder is the interface for elaborating ARLAS Dashboards. -Image: `ARLAS_BUILDER_VERSION` with `gisaia/arlas-wui-builder:26.1.0` in `conf/versions.env` +Image: `ARLAS_BUILDER_VERSION` with `gisaia/arlas-wui-builder:26.1.2` in `conf/versions.env` | Container variable | Value or environment variable | Default | Description | Env file setting | | --- | --- | --- | --- | --- | @@ -222,7 +222,7 @@ Image: `ARLAS_BUILDER_VERSION` with `gisaia/arlas-wui-builder:26.1.0` in `conf/v | `ARLAS_IAM_SERVER_URL` | `ARLAS_IAM_SERVER_URL` | `/arlas_iam_server` | | | | `ARLAS_PERMISSIONS_URL` | `ARLAS_PERMISSIONS_URL` | `/arlas_permissions_server` | | | | `ARLAS_PERSISTENCE_URL` | `ARLAS_PERSISTENCE_URL` | `/arlas_persistence_server` | | `/persist` in `conf/persistence-file.env`
`https://${ARLAS_HOST}/persist` in `conf/arlas_iam.env` | -| `ARLAS_SERVER_URL` | `ARLAS_SERVER_URL` | `/arlas` | | `https://${ARLAS_HOST}/arlas` in `conf/arlas_iam.env` | +| `ARLAS_SERVER_URL` | `ARLAS_SERVER_URL` | `/arlas` | | | | `ARLAS_USE_AUTHENT` | `ARLAS_USE_AUTHENT` | `` | | `true` in `conf/arlas_iam.env` | | `ARLAS_WUI_URL` | `ARLAS_WUI_URL` | `/wui/` | | `https://${ARLAS_HOST}/wui/` in `conf/arlas_iam.env` | | `ARLAS_STATIC_LINKS` | `ARLAS_BUILDER_LINKS` | `` | | `'` in `conf/arlas.env` | @@ -231,7 +231,7 @@ Image: `ARLAS_BUILDER_VERSION` with `gisaia/arlas-wui-builder:26.1.0` in `conf/v ### Service arlas-hub Description: ARLAS Hub is the interface for discovering all the available ARLAS Dashboards -Image: `ARLAS_HUB_VERSION` with `gisaia/arlas-wui-hub:26.1.0` in `conf/versions.env` +Image: `ARLAS_HUB_VERSION` with `gisaia/arlas-wui-hub:26.1.2` in `conf/versions.env` | Container variable | Value or environment variable | Default | Description | Env file setting | | --- | --- | --- | --- | --- | @@ -267,7 +267,7 @@ Image: `ARLAS_HUB_VERSION` with `gisaia/arlas-wui-hub:26.1.0` in `conf/versions. ### Service arlas-wui Description: ARLAS WUI is ARLAS Web interface for visualising an analytic ARLAS Dashboard. -Image: `ARLAS_WUI_VERSION` with `gisaia/arlas-wui:26.1.0-no-analytics` in `conf/versions.env` +Image: `ARLAS_WUI_VERSION` with `gisaia/arlas-wui:26.1.1-no-analytics` in `conf/versions.env` | Container variable | Value or environment variable | Default | Description | Env file setting | | --- | --- | --- | --- | --- | diff --git a/docs/docs/dc_services/docker_compose_services_simple.md b/docs/docs/dc_services/docker_compose_services_simple.md index 59bc2e3..e74e0ef 100644 --- a/docs/docs/dc_services/docker_compose_services_simple.md +++ b/docs/docs/dc_services/docker_compose_services_simple.md @@ -19,7 +19,7 @@ Image: `ELASTIC_VERSION` with `docker.elastic.co/elasticsearch/elasticsearch:8.9 | `discovery.type` | `single-node` | `` | | | | `cluster.name` | `arlas-es-cluster` | `` | | | | `node.name` | `arlas-data-node-1` | `` | | | -| `ES_JAVA_OPTS` | `ES_JAVA_OPTS` | `` | | `-Xms1g -Xmx1g` in `conf/elastic.env` | +| `ES_JAVA_OPTS` | `ES_JAVA_OPTS` | `` | | `-Xms500m -Xmx500m` in `conf/elastic.env` | | `xpack.security.enabled` | `false` | `` | | | | `xpack.security.http.ssl.enabled` | `false` | `` | | | | `xpack.security.transport.ssl.enabled` | `false` | `` | | | @@ -32,7 +32,7 @@ List of volumes: ### Service arlas-server Description: ARLAS Server is the geo-analytic engine of the ARLAS Exploration Stack -Image: `ARLAS_SERVER_VERSION` with `gisaia/arlas-server:26.0.6` in `conf/versions.env` +Image: `ARLAS_SERVER_VERSION` with `gisaia/arlas-server:26.0.8` in `conf/versions.env` | Container variable | Value or environment variable | Default | Description | Env file setting | | --- | --- | --- | --- | --- | @@ -67,7 +67,7 @@ Image: `ARLAS_SERVER_VERSION` with `gisaia/arlas-server:26.0.6` in `conf/version ### Service arlas-persistence-server Description: ARLAS Persistence is a service for storing and retrieving small ojects, such as JSON documents or image previews. -Image: `ARLAS_PERSISTENCE_VERSION` with `gisaia/arlas-persistence-server:26.0.0` in `conf/versions.env` +Image: `ARLAS_PERSISTENCE_VERSION` with `gisaia/arlas-persistence-server:26.0.2` in `conf/versions.env` | Container variable | Value or environment variable | Default | Description | Env file setting | | --- | --- | --- | --- | --- | @@ -104,7 +104,7 @@ List of volumes: ### Service arlas-permissions-server Description: ARLAS Permissions is a service for listing user's permissions -Image: `ARLAS_PERMISSIONS_VERSION` with `gisaia/arlas-permissions-server:26.0.0` in `conf/versions.env` +Image: `ARLAS_PERMISSIONS_VERSION` with `gisaia/arlas-permissions-server:26.0.2` in `conf/versions.env` | Container variable | Value or environment variable | Default | Description | Env file setting | | --- | --- | --- | --- | --- | @@ -133,7 +133,7 @@ Image: `ARLAS_PERMISSIONS_VERSION` with `gisaia/arlas-permissions-server:26.0.0` ### Service arlas-builder Description: ARLAS Builder is the interface for elaborating ARLAS Dashboards. -Image: `ARLAS_BUILDER_VERSION` with `gisaia/arlas-wui-builder:26.1.0` in `conf/versions.env` +Image: `ARLAS_BUILDER_VERSION` with `gisaia/arlas-wui-builder:26.1.2` in `conf/versions.env` | Container variable | Value or environment variable | Default | Description | Env file setting | | --- | --- | --- | --- | --- | @@ -174,7 +174,7 @@ Image: `ARLAS_BUILDER_VERSION` with `gisaia/arlas-wui-builder:26.1.0` in `conf/v ### Service arlas-hub Description: ARLAS Hub is the interface for discovering all the available ARLAS Dashboards -Image: `ARLAS_HUB_VERSION` with `gisaia/arlas-wui-hub:26.1.0` in `conf/versions.env` +Image: `ARLAS_HUB_VERSION` with `gisaia/arlas-wui-hub:26.1.2` in `conf/versions.env` | Container variable | Value or environment variable | Default | Description | Env file setting | | --- | --- | --- | --- | --- | @@ -210,7 +210,7 @@ Image: `ARLAS_HUB_VERSION` with `gisaia/arlas-wui-hub:26.1.0` in `conf/versions. ### Service arlas-wui Description: ARLAS WUI is ARLAS Web interface for visualising an analytic ARLAS Dashboard. -Image: `ARLAS_WUI_VERSION` with `gisaia/arlas-wui:26.1.0-no-analytics` in `conf/versions.env` +Image: `ARLAS_WUI_VERSION` with `gisaia/arlas-wui:26.1.1-no-analytics` in `conf/versions.env` | Container variable | Value or environment variable | Default | Description | Env file setting | | --- | --- | --- | --- | --- | From a769117e34dfd4f99a721e42a9c13114d88032aa Mon Sep 17 00:00:00 2001 From: Sylvain Gaudan Date: Thu, 27 Feb 2025 09:45:42 +0100 Subject: [PATCH 2/8] upgrade to 27.0 --- conf/versions.env | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/conf/versions.env b/conf/versions.env index 2eea9c9..a6b7e0f 100644 --- a/conf/versions.env +++ b/conf/versions.env @@ -1,12 +1,12 @@ -ARLAS_WUI_VERSION=gisaia/arlas-wui:26.1.1-no-analytics -ARLAS_WUI_IAM_VERSION=gisaia/arlas-wui-iam:26.1.1 -ARLAS_BUILDER_VERSION=gisaia/arlas-wui-builder:26.1.2 -ARLAS_HUB_VERSION=gisaia/arlas-wui-hub:26.1.2 - -ARLAS_IAM_SERVER_VERSION=gisaia/arlas-iam-server:26.0.5 -ARLAS_PERMISSIONS_VERSION=gisaia/arlas-permissions-server:26.0.2 -ARLAS_PERSISTENCE_VERSION=gisaia/arlas-persistence-server:26.0.2 -ARLAS_SERVER_VERSION=gisaia/arlas-server:26.0.8 +ARLAS_WUI_VERSION=gisaia/arlas-wui:27.0.0 +ARLAS_WUI_IAM_VERSION=gisaia/arlas-wui-iam:27.0.0 +ARLAS_BUILDER_VERSION=gisaia/arlas-wui-builder:27.0.0 +ARLAS_HUB_VERSION=gisaia/arlas-wui-hub:27.0.0 + +ARLAS_IAM_SERVER_VERSION=gisaia/arlas-iam-server:27.0.1 +ARLAS_PERMISSIONS_VERSION=gisaia/arlas-permissions-server:27.0.1 +ARLAS_PERSISTENCE_VERSION=gisaia/arlas-persistence-server:27.0.1 +ARLAS_SERVER_VERSION=gisaia/arlas-server:27.0.1 ARLAS_VERSION_AIRS=gisaia/airs:0.5.8 ARLAS_VERSION_APROC_PROC=gisaia/aproc-proc:0.5.8 From a0fe6ee1d0db60c073a3d8f1573482ce94ed5864 Mon Sep 17 00:00:00 2001 From: Sylvain Gaudan Date: Thu, 27 Feb 2025 10:28:19 +0100 Subject: [PATCH 3/8] fix arlas wui port --- conf/apisix/apisix_part_arlas_services.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/apisix/apisix_part_arlas_services.yaml b/conf/apisix/apisix_part_arlas_services.yaml index 3505974..10fac77 100644 --- a/conf/apisix/apisix_part_arlas_services.yaml +++ b/conf/apisix/apisix_part_arlas_services.yaml @@ -117,7 +117,7 @@ routes: uri: /wui/* upstream: nodes: - "arlas-wui:80": 1 + "arlas-wui:8080": 1 plugins: # response-rewrite: # headers: From 827c4b09a66af8034258fe63cdb2e0821a49d33e Mon Sep 17 00:00:00 2001 From: Sylvain Gaudan Date: Thu, 27 Feb 2025 10:28:45 +0100 Subject: [PATCH 4/8] add puclish msg on release --- scripts/release.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/scripts/release.sh b/scripts/release.sh index 70514f9..6d141c5 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -2,6 +2,20 @@ [ -z "$1" ] && echo "Please provide the version" && exit 1; VERSION=$1 + +send_chat_message(){ + MESSAGE=$1 + if [ -z "$GOOGLE_CHAT_RELEASE_CHANEL" ] ; then + echo "Environement variable GOOGLE_CHAT_RELEASE_CHANEL is not definied ... skipping message publishing" + else + DATA='{"text":"'${MESSAGE}'"}' + echo $DATA + curl -X POST --header "Content-Type:application/json" $GOOGLE_CHAT_RELEASE_CHANEL -d "${DATA}" + fi +} + + + # Generate the md documentation ./mkDocs.sh @@ -10,3 +24,5 @@ git add docs/docs/dc_services/docker_compose_services_*.md git commit -m "Update docker compose services documentation" git tag -a ${VERSION} -m "ARLAS Exploration stack ${VERSION}" git push origin ${VERSION} + +send_chat_message "Release of ARLAS Exploration Stack, version ${VERSION}" From b6f6bf918cc58689bab82d68bd79cba897424eba Mon Sep 17 00:00:00 2001 From: Sylvain Gaudan Date: Thu, 27 Feb 2025 10:29:02 +0100 Subject: [PATCH 5/8] update version --- conf/stack.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/stack.env b/conf/stack.env index ec70124..6e8e622 100644 --- a/conf/stack.env +++ b/conf/stack.env @@ -1,4 +1,4 @@ -ARLAS_HOST=localhost +ARLAS_HOST=macbookair.lan PROTOMAP_DATA_DIR=$PWD/resources #DOCKER_LOGGING_DRIVER= From 9c4429f60514b2b4f41c1227e6e32271522b2aef Mon Sep 17 00:00:00 2001 From: Sylvain Gaudan Date: Thu, 27 Feb 2025 17:19:16 +0100 Subject: [PATCH 6/8] fix port --- conf/apisix/apisix_with_iam.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/apisix/apisix_with_iam.yaml b/conf/apisix/apisix_with_iam.yaml index 2af8aa2..e3f3abc 100644 --- a/conf/apisix/apisix_with_iam.yaml +++ b/conf/apisix/apisix_with_iam.yaml @@ -154,7 +154,7 @@ routes: uri: /wui/* upstream: nodes: - "arlas-wui:80": 1 + "arlas-wui:8080": 1 plugins: # response-rewrite: # headers: From 06680c3acad73844d327565373b0c4f2ad2ffff8 Mon Sep 17 00:00:00 2001 From: Sylvain Gaudan Date: Thu, 27 Feb 2025 17:25:40 +0100 Subject: [PATCH 7/8] localhost --- conf/stack.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/stack.env b/conf/stack.env index 6e8e622..ec70124 100644 --- a/conf/stack.env +++ b/conf/stack.env @@ -1,4 +1,4 @@ -ARLAS_HOST=macbookair.lan +ARLAS_HOST=localhost PROTOMAP_DATA_DIR=$PWD/resources #DOCKER_LOGGING_DRIVER= From 64622baf5bc6d38d8f5dd50fe8afe8c3eeb29823 Mon Sep 17 00:00:00 2001 From: Sylvain Gaudan Date: Thu, 27 Feb 2025 18:22:49 +0100 Subject: [PATCH 8/8] update doc --- .../dc_services/docker_compose_services_aias.md | 16 ++++++++-------- .../dc_services/docker_compose_services_iam.md | 16 ++++++++-------- .../docker_compose_services_simple.md | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/docs/docs/dc_services/docker_compose_services_aias.md b/docs/docs/dc_services/docker_compose_services_aias.md index 17f5f7c..85aef4c 100644 --- a/docs/docs/dc_services/docker_compose_services_aias.md +++ b/docs/docs/dc_services/docker_compose_services_aias.md @@ -44,7 +44,7 @@ List of volumes: ### Service arlas-server Description: ARLAS Server is the geo-analytic engine of the ARLAS Exploration Stack -Image: `ARLAS_SERVER_VERSION` with `gisaia/arlas-server:26.0.8` in `conf/versions.env` +Image: `ARLAS_SERVER_VERSION` with `gisaia/arlas-server:27.0.1` in `conf/versions.env` | Container variable | Value or environment variable | Default | Description | Env file setting | | --- | --- | --- | --- | --- | @@ -79,7 +79,7 @@ Image: `ARLAS_SERVER_VERSION` with `gisaia/arlas-server:26.0.8` in `conf/version ### Service arlas-persistence-server Description: ARLAS Persistence is a service for storing and retrieving small ojects, such as JSON documents or image previews. -Image: `ARLAS_PERSISTENCE_VERSION` with `gisaia/arlas-persistence-server:26.0.2` in `conf/versions.env` +Image: `ARLAS_PERSISTENCE_VERSION` with `gisaia/arlas-persistence-server:27.0.1` in `conf/versions.env` | Container variable | Value or environment variable | Default | Description | Env file setting | | --- | --- | --- | --- | --- | @@ -116,7 +116,7 @@ List of volumes: ### Service arlas-permissions-server Description: ARLAS Permissions is a service for listing user's permissions -Image: `ARLAS_PERMISSIONS_VERSION` with `gisaia/arlas-permissions-server:26.0.2` in `conf/versions.env` +Image: `ARLAS_PERMISSIONS_VERSION` with `gisaia/arlas-permissions-server:27.0.1` in `conf/versions.env` | Container variable | Value or environment variable | Default | Description | Env file setting | | --- | --- | --- | --- | --- | @@ -145,7 +145,7 @@ Image: `ARLAS_PERMISSIONS_VERSION` with `gisaia/arlas-permissions-server:26.0.2` ### Service arlas-iam-server Description: ARLAS IAM is the ARLAS Identity and Access Management service. -Image: `ARLAS_IAM_SERVER_VERSION` with `gisaia/arlas-iam-server:26.0.5` in `conf/versions.env` +Image: `ARLAS_IAM_SERVER_VERSION` with `gisaia/arlas-iam-server:27.0.1` in `conf/versions.env` | Container variable | Value or environment variable | Default | Description | Env file setting | | --- | --- | --- | --- | --- | @@ -182,7 +182,7 @@ Image: `ARLAS_IAM_SERVER_VERSION` with `gisaia/arlas-iam-server:26.0.5` in `conf ### Service arlas-wui-iam Description: ARLAS IAM is the ARLAS Identity and Access Management web interface. -Image: `ARLAS_WUI_IAM_VERSION` with `gisaia/arlas-wui-iam:26.1.1` in `conf/versions.env` +Image: `ARLAS_WUI_IAM_VERSION` with `gisaia/arlas-wui-iam:27.0.0` in `conf/versions.env` | Container variable | Value or environment variable | Default | Description | Env file setting | | --- | --- | --- | --- | --- | @@ -199,7 +199,7 @@ Image: `ARLAS_WUI_IAM_VERSION` with `gisaia/arlas-wui-iam:26.1.1` in `conf/versi ### Service arlas-builder Description: ARLAS Builder is the interface for elaborating ARLAS Dashboards. -Image: `ARLAS_BUILDER_VERSION` with `gisaia/arlas-wui-builder:26.1.2` in `conf/versions.env` +Image: `ARLAS_BUILDER_VERSION` with `gisaia/arlas-wui-builder:27.0.0` in `conf/versions.env` | Container variable | Value or environment variable | Default | Description | Env file setting | | --- | --- | --- | --- | --- | @@ -240,7 +240,7 @@ Image: `ARLAS_BUILDER_VERSION` with `gisaia/arlas-wui-builder:26.1.2` in `conf/v ### Service arlas-hub Description: ARLAS Hub is the interface for discovering all the available ARLAS Dashboards -Image: `ARLAS_HUB_VERSION` with `gisaia/arlas-wui-hub:26.1.2` in `conf/versions.env` +Image: `ARLAS_HUB_VERSION` with `gisaia/arlas-wui-hub:27.0.0` in `conf/versions.env` | Container variable | Value or environment variable | Default | Description | Env file setting | | --- | --- | --- | --- | --- | @@ -276,7 +276,7 @@ Image: `ARLAS_HUB_VERSION` with `gisaia/arlas-wui-hub:26.1.2` in `conf/versions. ### Service arlas-wui Description: ARLAS WUI is ARLAS Web interface for visualising an analytic ARLAS Dashboard. -Image: `ARLAS_WUI_VERSION` with `gisaia/arlas-wui:26.1.1-no-analytics` in `conf/versions.env` +Image: `ARLAS_WUI_VERSION` with `gisaia/arlas-wui:27.0.0` in `conf/versions.env` | Container variable | Value or environment variable | Default | Description | Env file setting | | --- | --- | --- | --- | --- | diff --git a/docs/docs/dc_services/docker_compose_services_iam.md b/docs/docs/dc_services/docker_compose_services_iam.md index 8637c48..2df2a7c 100644 --- a/docs/docs/dc_services/docker_compose_services_iam.md +++ b/docs/docs/dc_services/docker_compose_services_iam.md @@ -35,7 +35,7 @@ List of volumes: ### Service arlas-server Description: ARLAS Server is the geo-analytic engine of the ARLAS Exploration Stack -Image: `ARLAS_SERVER_VERSION` with `gisaia/arlas-server:26.0.8` in `conf/versions.env` +Image: `ARLAS_SERVER_VERSION` with `gisaia/arlas-server:27.0.1` in `conf/versions.env` | Container variable | Value or environment variable | Default | Description | Env file setting | | --- | --- | --- | --- | --- | @@ -70,7 +70,7 @@ Image: `ARLAS_SERVER_VERSION` with `gisaia/arlas-server:26.0.8` in `conf/version ### Service arlas-persistence-server Description: ARLAS Persistence is a service for storing and retrieving small ojects, such as JSON documents or image previews. -Image: `ARLAS_PERSISTENCE_VERSION` with `gisaia/arlas-persistence-server:26.0.2` in `conf/versions.env` +Image: `ARLAS_PERSISTENCE_VERSION` with `gisaia/arlas-persistence-server:27.0.1` in `conf/versions.env` | Container variable | Value or environment variable | Default | Description | Env file setting | | --- | --- | --- | --- | --- | @@ -107,7 +107,7 @@ List of volumes: ### Service arlas-permissions-server Description: ARLAS Permissions is a service for listing user's permissions -Image: `ARLAS_PERMISSIONS_VERSION` with `gisaia/arlas-permissions-server:26.0.2` in `conf/versions.env` +Image: `ARLAS_PERMISSIONS_VERSION` with `gisaia/arlas-permissions-server:27.0.1` in `conf/versions.env` | Container variable | Value or environment variable | Default | Description | Env file setting | | --- | --- | --- | --- | --- | @@ -136,7 +136,7 @@ Image: `ARLAS_PERMISSIONS_VERSION` with `gisaia/arlas-permissions-server:26.0.2` ### Service arlas-iam-server Description: ARLAS IAM is the ARLAS Identity and Access Management service. -Image: `ARLAS_IAM_SERVER_VERSION` with `gisaia/arlas-iam-server:26.0.5` in `conf/versions.env` +Image: `ARLAS_IAM_SERVER_VERSION` with `gisaia/arlas-iam-server:27.0.1` in `conf/versions.env` | Container variable | Value or environment variable | Default | Description | Env file setting | | --- | --- | --- | --- | --- | @@ -173,7 +173,7 @@ Image: `ARLAS_IAM_SERVER_VERSION` with `gisaia/arlas-iam-server:26.0.5` in `conf ### Service arlas-wui-iam Description: ARLAS IAM is the ARLAS Identity and Access Management web interface. -Image: `ARLAS_WUI_IAM_VERSION` with `gisaia/arlas-wui-iam:26.1.1` in `conf/versions.env` +Image: `ARLAS_WUI_IAM_VERSION` with `gisaia/arlas-wui-iam:27.0.0` in `conf/versions.env` | Container variable | Value or environment variable | Default | Description | Env file setting | | --- | --- | --- | --- | --- | @@ -190,7 +190,7 @@ Image: `ARLAS_WUI_IAM_VERSION` with `gisaia/arlas-wui-iam:26.1.1` in `conf/versi ### Service arlas-builder Description: ARLAS Builder is the interface for elaborating ARLAS Dashboards. -Image: `ARLAS_BUILDER_VERSION` with `gisaia/arlas-wui-builder:26.1.2` in `conf/versions.env` +Image: `ARLAS_BUILDER_VERSION` with `gisaia/arlas-wui-builder:27.0.0` in `conf/versions.env` | Container variable | Value or environment variable | Default | Description | Env file setting | | --- | --- | --- | --- | --- | @@ -231,7 +231,7 @@ Image: `ARLAS_BUILDER_VERSION` with `gisaia/arlas-wui-builder:26.1.2` in `conf/v ### Service arlas-hub Description: ARLAS Hub is the interface for discovering all the available ARLAS Dashboards -Image: `ARLAS_HUB_VERSION` with `gisaia/arlas-wui-hub:26.1.2` in `conf/versions.env` +Image: `ARLAS_HUB_VERSION` with `gisaia/arlas-wui-hub:27.0.0` in `conf/versions.env` | Container variable | Value or environment variable | Default | Description | Env file setting | | --- | --- | --- | --- | --- | @@ -267,7 +267,7 @@ Image: `ARLAS_HUB_VERSION` with `gisaia/arlas-wui-hub:26.1.2` in `conf/versions. ### Service arlas-wui Description: ARLAS WUI is ARLAS Web interface for visualising an analytic ARLAS Dashboard. -Image: `ARLAS_WUI_VERSION` with `gisaia/arlas-wui:26.1.1-no-analytics` in `conf/versions.env` +Image: `ARLAS_WUI_VERSION` with `gisaia/arlas-wui:27.0.0` in `conf/versions.env` | Container variable | Value or environment variable | Default | Description | Env file setting | | --- | --- | --- | --- | --- | diff --git a/docs/docs/dc_services/docker_compose_services_simple.md b/docs/docs/dc_services/docker_compose_services_simple.md index e74e0ef..c05c72f 100644 --- a/docs/docs/dc_services/docker_compose_services_simple.md +++ b/docs/docs/dc_services/docker_compose_services_simple.md @@ -32,7 +32,7 @@ List of volumes: ### Service arlas-server Description: ARLAS Server is the geo-analytic engine of the ARLAS Exploration Stack -Image: `ARLAS_SERVER_VERSION` with `gisaia/arlas-server:26.0.8` in `conf/versions.env` +Image: `ARLAS_SERVER_VERSION` with `gisaia/arlas-server:27.0.1` in `conf/versions.env` | Container variable | Value or environment variable | Default | Description | Env file setting | | --- | --- | --- | --- | --- | @@ -67,7 +67,7 @@ Image: `ARLAS_SERVER_VERSION` with `gisaia/arlas-server:26.0.8` in `conf/version ### Service arlas-persistence-server Description: ARLAS Persistence is a service for storing and retrieving small ojects, such as JSON documents or image previews. -Image: `ARLAS_PERSISTENCE_VERSION` with `gisaia/arlas-persistence-server:26.0.2` in `conf/versions.env` +Image: `ARLAS_PERSISTENCE_VERSION` with `gisaia/arlas-persistence-server:27.0.1` in `conf/versions.env` | Container variable | Value or environment variable | Default | Description | Env file setting | | --- | --- | --- | --- | --- | @@ -104,7 +104,7 @@ List of volumes: ### Service arlas-permissions-server Description: ARLAS Permissions is a service for listing user's permissions -Image: `ARLAS_PERMISSIONS_VERSION` with `gisaia/arlas-permissions-server:26.0.2` in `conf/versions.env` +Image: `ARLAS_PERMISSIONS_VERSION` with `gisaia/arlas-permissions-server:27.0.1` in `conf/versions.env` | Container variable | Value or environment variable | Default | Description | Env file setting | | --- | --- | --- | --- | --- | @@ -133,7 +133,7 @@ Image: `ARLAS_PERMISSIONS_VERSION` with `gisaia/arlas-permissions-server:26.0.2` ### Service arlas-builder Description: ARLAS Builder is the interface for elaborating ARLAS Dashboards. -Image: `ARLAS_BUILDER_VERSION` with `gisaia/arlas-wui-builder:26.1.2` in `conf/versions.env` +Image: `ARLAS_BUILDER_VERSION` with `gisaia/arlas-wui-builder:27.0.0` in `conf/versions.env` | Container variable | Value or environment variable | Default | Description | Env file setting | | --- | --- | --- | --- | --- | @@ -174,7 +174,7 @@ Image: `ARLAS_BUILDER_VERSION` with `gisaia/arlas-wui-builder:26.1.2` in `conf/v ### Service arlas-hub Description: ARLAS Hub is the interface for discovering all the available ARLAS Dashboards -Image: `ARLAS_HUB_VERSION` with `gisaia/arlas-wui-hub:26.1.2` in `conf/versions.env` +Image: `ARLAS_HUB_VERSION` with `gisaia/arlas-wui-hub:27.0.0` in `conf/versions.env` | Container variable | Value or environment variable | Default | Description | Env file setting | | --- | --- | --- | --- | --- | @@ -210,7 +210,7 @@ Image: `ARLAS_HUB_VERSION` with `gisaia/arlas-wui-hub:26.1.2` in `conf/versions. ### Service arlas-wui Description: ARLAS WUI is ARLAS Web interface for visualising an analytic ARLAS Dashboard. -Image: `ARLAS_WUI_VERSION` with `gisaia/arlas-wui:26.1.1-no-analytics` in `conf/versions.env` +Image: `ARLAS_WUI_VERSION` with `gisaia/arlas-wui:27.0.0` in `conf/versions.env` | Container variable | Value or environment variable | Default | Description | Env file setting | | --- | --- | --- | --- | --- |