Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Patch geoserver #179

Merged
merged 4 commits into from
May 30, 2024
Merged

Patch geoserver #179

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8cdc56a
added own version of geoserver for multi architectures
May 21, 2024
af3202c
changing healthcheck and image
May 22, 2024
5437067
Merge remote-tracking branch 'upstream/main' into patch_geoserver
May 24, 2024
b6516e0
now persist the prompt if no correct output is given
May 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 24 additions & 8 deletions viewOnTethys.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -499,8 +501,23 @@ _run_tethys(){

# Create tethys portal
create_tethys_portal(){
echo -e "${YELLOW}Visualize outputs using the Tethys Platform (https://www.tethysplatform.org/)? (y/N, default: y):${RESET}"
read -r visualization_choice
while true; do
echo -e "${YELLOW}Visualize outputs using the Tethys Platform (https://www.tethysplatform.org/)? (y/N, default: y):${RESET}"
read -r visualization_choice

# Default to 'y' if input is empty
if [[ -z "$visualization_choice" ]]; then
visualization_choice="y"
fi

# Check for valid input
if [[ "$visualization_choice" == [YyNn]* ]]; then
break
else
echo -e "${RED}Invalid choice. Please enter 'y' for yes, 'n' for no, or press Enter for default (yes).${RESET}"
fi
done

# Execute the command
if [[ "$visualization_choice" == [Yy]* ]]; then
echo -e "${GREEN}Setup Tethys Portal image...${RESET}"
Expand All @@ -521,10 +538,10 @@ create_tethys_portal(){
_open_browser
_pause_script_execution
else
printf "${RED}Failed to prepare Tethys portal.${RESET}\n"
echo -e "${RED}Failed to prepare Tethys portal.${RESET}\n"
fi
else
printf "${CYAN}Skipping Tethys visualization setup.${RESET}\n"
echo -e "${CYAN}Skipping Tethys visualization setup.${RESET}\n"
fi
}

Expand All @@ -544,8 +561,8 @@ 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
GEOSERVER_IMAGE_NAME=docker.osgeo.org/geoserver:2.25.x
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"
CONFIG_FILE="$HOME/.host_data_path.conf"
Expand All @@ -560,6 +577,5 @@ fi

check_last_path "$@"


create_tethys_portal

Loading