modify the project to adapt the docker compose

jimmy201602 · Mar 30, 2021 · 1dc0d01 · 1dc0d01
1 parent 4898ca3
commit 1dc0d01
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 7 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -8,18 +8,32 @@ volumes:
 services:
   guacd:
     image: guacamole/guacd:0.9.14
-    network_mode: "host"
+    networks:
+      - new
+    environment:
+      GUACDHOST: guacd
+      REDISHOST: redis
+      WEBTERMINALHOST: webterminal
     volumes:
       - recording_data:/opt/webterminal/media/
+    ports:
+      - "4822:4822"
   redis:
     image: redis:6.0-alpine
-    network_mode: "host"
+    networks:
+      - new
+    ports:
+      - "6379:6379"
   webterminal:
     image: webterminal/webterminal:beta
-    network_mode: "host"
+    networks:
+      - new
+    environment:
+      GUACDHOST: guacd
+      REDISHOST: redis
     volumes:
       - recording_data:/opt/webterminal/media/
       - db_data:/opt/webterminal/db/
     ports:
-      - 80:80
-      - 2100:2100
+      - "80:80"
+      - "2100:2100"
diff --git a/plugins/backend.so b/plugins/backend.so
diff --git a/plugins/server.so b/plugins/server.so
diff --git a/webterminal/settings.py b/webterminal/settings.py
@@ -155,7 +155,7 @@
     "default": {
         "BACKEND": "channels_redis.core.RedisChannelLayer",  # use redis backend
         "CONFIG": {
-            "hosts": [("localhost", 6379)],  # set redis address
+            "hosts": [(os.environ.get('REDISHOST','localhost'), 6379)],  # set redis address
             "channel_capacity": {
                 "http.request": 1000,
                 "websocket.send*": 10000,
@@ -328,7 +328,7 @@
 CHANNELS_WS_PROTOCOLS = ["guacamole"]
 
 # guacd daemon host address and port
-GUACD_HOST = '127.0.0.1'
+GUACD_HOST = os.environ.get('GUACDHOST','127.0.0.1')
 GUACD_PORT = '4822'
 
 # session will expire when user close browser