From 8cdc56a9563aacbe190637258013ce104053b4c8 Mon Sep 17 00:00:00 2001 From: romer8 Date: Mon, 20 May 2024 21:48:45 -0600 Subject: [PATCH 1/2] added own version of geoserver for multi architectures --- viewOnTethys.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/viewOnTethys.sh b/viewOnTethys.sh index 58f002a..e7c918f 100755 --- a/viewOnTethys.sh +++ b/viewOnTethys.sh @@ -15,7 +15,9 @@ RESET='\e[0m' # run the geoserver docker container _run_geoserver(){ - _execute_command_geoserver docker run -it --rm -d -p $GEOSERVER_PORT_HOST:$GEOSERVER_PORT_CONTAINER \ + _execute_command_geoserver docker run -it --rm -d \ + --platform $PLATFORM \ + -p $GEOSERVER_PORT_HOST:$GEOSERVER_PORT_CONTAINER \ --env CORS_ENABLED=true \ --env SKIP_DEMO_DATA=true \ --network $DOCKER_NETWORK \ @@ -545,7 +547,7 @@ GEOSERVER_PORT_HOST="8181" DOCKER_NETWORK="tethys-network" APP_WORKSPACE_PATH="/usr/lib/tethys/apps/ngiab/tethysapp/ngiab/workspaces/app_workspace" TETHYS_IMAGE_NAME=awiciroh/tethys-ngiab:main -GEOSERVER_IMAGE_NAME=docker.osgeo.org/geoserver:2.25.x +GEOSERVER_IMAGE_NAME=gioelkin/geoserver:2.25.x DATA_FOLDER_PATH="$1" TETHYS_PERSIST_PATH="/var/lib/tethys_persist" CONFIG_FILE="$HOME/.host_data_path.conf" From af3202cebee6e403ec422117341da487fffec56b Mon Sep 17 00:00:00 2001 From: romer8 Date: Tue, 21 May 2024 22:00:22 -0600 Subject: [PATCH 2/2] changing healthcheck and image --- viewOnTethys.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/viewOnTethys.sh b/viewOnTethys.sh index e7c918f..84839b4 100755 --- a/viewOnTethys.sh +++ b/viewOnTethys.sh @@ -546,7 +546,7 @@ GEOSERVER_PORT_CONTAINER="8080" GEOSERVER_PORT_HOST="8181" DOCKER_NETWORK="tethys-network" APP_WORKSPACE_PATH="/usr/lib/tethys/apps/ngiab/tethysapp/ngiab/workspaces/app_workspace" -TETHYS_IMAGE_NAME=awiciroh/tethys-ngiab:main +TETHYS_IMAGE_NAME=awiciroh/tethys-ngiab:dev-r1 GEOSERVER_IMAGE_NAME=gioelkin/geoserver:2.25.x DATA_FOLDER_PATH="$1" TETHYS_PERSIST_PATH="/var/lib/tethys_persist" @@ -562,6 +562,5 @@ fi check_last_path "$@" - create_tethys_portal