From 3a2cd0954f9d0a3897cf67ea2f101ef27ede5aef Mon Sep 17 00:00:00 2001 From: MaxWaldorf Date: Tue, 2 May 2023 16:49:59 +0200 Subject: [PATCH 1/3] solve issues with modules not updated --- filefs/usr/local/bin/_startup.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/filefs/usr/local/bin/_startup.sh b/filefs/usr/local/bin/_startup.sh index 90af3fa..e274081 100644 --- a/filefs/usr/local/bin/_startup.sh +++ b/filefs/usr/local/bin/_startup.sh @@ -1,8 +1,15 @@ #!/bin/sh echo "Preparing Config Folder" +if [ -d "/config/" ]; then + rm -r /config/extensions + rm -r /config/extensions-available + rm -r /config/lib + rm -r /config/schema +fi cp -rn /app/guacamole /config mkdir -p /root/.config/freerdp/known_hosts chown -R tomcat:tomcat /config/guacamole +chown -R tomcat:tomcat /opt/tomcat # Might help to fix issues with bug on tomcat logs # Own postgres folder if exist (change to alpine) if [ -d "/config/postgres/" ]; then From 8cb4b5e349494871d6f474cda7e8cc82da8d951c Mon Sep 17 00:00:00 2001 From: MaxWaldorf Date: Tue, 2 May 2023 17:00:36 +0200 Subject: [PATCH 2/3] correct guacamole directory check --- filefs/usr/local/bin/_startup.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/filefs/usr/local/bin/_startup.sh b/filefs/usr/local/bin/_startup.sh index e274081..ee9a973 100644 --- a/filefs/usr/local/bin/_startup.sh +++ b/filefs/usr/local/bin/_startup.sh @@ -1,10 +1,10 @@ #!/bin/sh echo "Preparing Config Folder" -if [ -d "/config/" ]; then - rm -r /config/extensions - rm -r /config/extensions-available - rm -r /config/lib - rm -r /config/schema +if [ -d "/config/guacamole/" ]; then + rm -r /config/guacamole/extensions + rm -r /config/guacamole/extensions-available + rm -r /config/guacamole/lib + rm -r /config/guacamole/schema fi cp -rn /app/guacamole /config mkdir -p /root/.config/freerdp/known_hosts From 0047a0ce78b973abfe2a0cb8413067acb897bddf Mon Sep 17 00:00:00 2001 From: MaxWaldorf Date: Tue, 2 May 2023 18:41:38 +0200 Subject: [PATCH 3/3] fix _startup.sh missing folders --- filefs/usr/local/bin/_startup.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/filefs/usr/local/bin/_startup.sh b/filefs/usr/local/bin/_startup.sh index ee9a973..7ac3da6 100644 --- a/filefs/usr/local/bin/_startup.sh +++ b/filefs/usr/local/bin/_startup.sh @@ -5,6 +5,10 @@ if [ -d "/config/guacamole/" ]; then rm -r /config/guacamole/extensions-available rm -r /config/guacamole/lib rm -r /config/guacamole/schema + cp -r /app/guacamole/extensions /config/guacamole + cp -r /app/guacamole/extensions-available /config/guacamole + cp -r /app/guacamole/lib /config/guacamole + cp -r /app/guacamole/schema /config/guacamole fi cp -rn /app/guacamole /config mkdir -p /root/.config/freerdp/known_hosts @@ -38,4 +42,4 @@ fi # enable extensions for i in $(echo "$EXTENSIONS" | tr "," " "); do cp ${GUACAMOLE_HOME}/extensions-available/guacamole-${i}-${GUAC_VER}.jar ${GUACAMOLE_HOME}/extensions -done \ No newline at end of file +done