update example

Author: kwibus

examples/docker/docker-compose.yml

@@ -1,14 +1,14 @@
-version: "3"
+---
 services:
 
   guacd:
     container_name: guacd
-    image: guacamole/guacd:1.5.2
+    image: guacamole/guacd:1.6.0
     networks:
       - guacamole
 
     environment:
-      GUACD_LOG_LEVEL: debug
+      LOG_LEVEL: debug
     volumes:
       - /etc/localtime:/etc/localtime:ro
 
@@ -18,19 +18,16 @@ services:
     environment:
       GUACD_HOSTNAME: guacd
       GUACAMOLE_HOME: /etc/guacamole
+      # CONSOLE_TITLE: test title
       ENABLE_WEBSOCKET: "true"
       # START_COMMAND: "docker run --rm --network  docker_guacamole --name $$hostname -e 'VNC_PW=test' consol/centos-xfce-vnc || true"
       START_COMMAND: extensions/start.sh
       # STOP_COMMAND: "docker stop -t 120  $$hostname && echo stopping && sleep  60"
       STOP_COMMAND: "extensions/stop.sh $$hostname"
       SHUTDOWN_DELAY: 90
-      COMMAND_TIMEOUT: 600
+      COMMAND_TIMEOUT: 6000
       IDLE_TIME: 20
-      DISCONNECT_TIME: 120
-      # API_SESSION_TIMEOUT: 1
-
-      SECRET_KEY: test
-      JSON_SECRET_KEY: 4C0B569E4C96DF157EEE1B65DD0E4D41
+      DISCONNECT_TIME: 1200
     volumes:
       - ./extensions/:/etc/guacamole/extensions/:z
       - ./user-mapping.xml:/etc/guacamole/user-mapping.xml:z

examples/docker/extensions/start.sh

@@ -1,11 +1,17 @@
 #! /bin/bash
-env
-echo "$(tput  -T xterm setaf 1 ) test" # test make red
-for i in {1..20}; do
-    echo "$i"
-    sleep 1
-done;
-# false
+cat << EOF
+
+You custom script running here:
+
+You could use it to start Host $hostaname
+
+For a user: $guacamoleUsername
+
+guacamole will automaticly connect to $hostname via $protocol on port $port
+
+EOF
+
+sleep 10
 docker run --rm  -d --network  docker_guacamole --name "$hostname" -e 'VNC_PW=test' consol/rocky-xfce-vnc
 timeout 20 docker logs -f "$hostname"
 true

examples/docker/guacamole/Dockerfile

@@ -1,6 +1,6 @@
-FROM guacamole/guacamole:1.5.2
+FROM guacamole/guacamole:1.6.0
 USER root
-RUN ln -sf /opt/guacamole/guacamole.war /usr/local/tomcat/webapps/
+RUN ln -sf  /opt/guacamole/webapp/guacamole.war  /usr/local/tomcat/webapps/
 RUN mkdir -p /etc/guacamole
 RUN echo enable-environment-properties: true > /etc/guacamole/guacamole.properties
 RUN apt-get update && apt-get install -y \
@@ -13,5 +13,11 @@ RUN curl -fsSL  https://download.docker.com/linux/ubuntu/gpg  | apt-key add -
 RUN add-apt-repository "deb [arch=$(dpkg --print-architecture)] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
 RUN apt-get  update && apt-get install -y docker-ce-cli
 # TODO switch back to root
+
+RUN chown guacamole:guacamole -R  /usr/local/tomcat/webapps/ \
+    && mkdir -p /usr/local/tomcat/conf/Catalina/ \
+    && chmod -R a+rwx /usr/local/tomcat/conf/Catalina
+
+USER guacamole
 WORKDIR /usr/local/tomcat
 ENTRYPOINT ["catalina.sh","run"]