Update compose files so that containers can find each other

aercamti · Sep 1, 2024 · f946003 · f946003
1 parent c4c01a0
commit f946003
Show file tree

Hide file tree

Showing 2 changed files with 62 additions and 39 deletions.
diff --git a/containers/devel-compose.yaml b/containers/devel-compose.yaml
@@ -1,7 +1,10 @@
 services:
-  free-tak-server:
+  freetakserver:
     # if you want a specific branch, change master to your branch name
-    image: ghcr.io/freetakteam/freetakserver:container_build_fixes
+    image: ghcr.io/freetakteam/freetakserver:master
+    hostname: freetakserver
+    networks:
+        - taknet
     volumes:
       - free-tak-core-db:/opt/fts/
     ports:
@@ -14,16 +17,17 @@ services:
       # SSLDataPackagePort
       - 8443:8443
       # FederationPort
-      #- 9000:9000
+      - 9000:9000
       # APIPort - Don't expose by default
-      #- 19023:19023
+      - 19023:19023
 
     environment:
         # The ChangeMe section
         FTS_FED_PASSWORD: "defaultpass"
-        FTS_CLIENT_CERT_PASSWORD: "password"
+        FTS_CLIENT_CERT_PASSWORD: "supersecret"
+        FTS_WEBSOCKET_KEY: "YourWebsocketKey"
         FTS_SECRET_KEY: "vnkdjnfjknfl1232#"
-        FTS_NODE_ID: "fl5m8j5txlgdtfv8wi96zf8tt0howddo"
+        #FTS_NODE_ID: "SOMESTRING"
         FTS_CONNECTION_MESSAGE: "Welcome to FreeTAKServer. The Parrot is not dead. It’s just resting"
 
         # Networking
@@ -32,24 +36,24 @@ services:
         FTS_API_PORT: 19023
         FTS_FED_PORT: 9000
 
-        FTS_DP_ADDRESS: 127.0.0.1
-        FTS_USER_ADDRESS: 127.0.0.1
-        FTS_API_ADDRESS: 0.0.0.0
+        FTS_DP_ADDRESS: 'freetakserver'
+        FTS_USER_ADDRESS: 'freetakserver'
+        FTS_API_ADDRESS: 'freetakserver'
 
         FTS_ROUTING_PROXY_SUBSCRIBE_PORT: 19030
-        FTS_ROUTING_PROXY_SUBSCRIBE_IP: 127.0.0.1
+        FTS_ROUTING_PROXY_SUBSCRIBE_IP: 'freetakserver'
 
         FTS_ROUTING_PROXY_PUBLISHER_PORT: 19032
-        FTS_ROUTING_PROXY_PUBLISHER_IP: 127.0.0.1
+        FTS_ROUTING_PROXY_PUBLISHER_IP: 'freetakserver'
 
         FTS_ROUTING_PROXY_SERVER_PORT: 19031
-        FTS_ROUTING_PROXY_SERVER_IP: 127.0.0.1
+        FTS_ROUTING_PROXY_SERVER_IP: 'freetakserver'
 
         FTS_INTEGRATION_MANAGER_PULLER_PORT: 19033 # port to receive worker responses by the integration manager
-        FTS_INTEGRATION_MANAGER_PULLER_ADDRESS: 127.0.0.1 # address to receive worker responses by the integration manager
+        FTS_INTEGRATION_MANAGER_PULLER_ADDRESS: 'freetakserver' # address to receive worker responses by the integration manager
 
         FTS_INTEGRATION_MANAGER_PUBLISHER_PORT: 19034 # port from which to publish messages by the integration manager
-        FTS_INTEGRATION_MANAGER_PUBLISHER_ADDRESS: 127.0.0.1 # address from which to publish messages by the integration manager
+        FTS_INTEGRATION_MANAGER_PUBLISHER_ADDRESS: 'freetakserver' # address from which to publish messages by the integration manager
 
         # Misc Settings
         FTS_OPTIMIZE_API: True
@@ -64,26 +68,34 @@ services:
         FTS_EMERGENCY_RADIUS: 0 # radius of emergency within-which users will receive it
         FTS_LOG_LEVEL: "info"
 
-  free-tak-server-ui:
+  freetakserver-ui:
     # if you want a specific branch, change master to your branch name
-    image: ghcr.io/freetakteam/ui:master
+    #image: ghcr.io/freetakteam/ui:master
+    image: localhost/freetakserver-ui:latest
+    hostname: freetakserver-ui
+    networks:
+        - taknet
     ports:
       - 5000:5000
     volumes:
-      - free-tak-ui-db:/home/freetak/data/
+      - free-tak-ui-db:/home/freetak/:Z,rw
     environment:
-      FTS_IP: 'free-tak-server'
+      FTS_IP: YOUR EXTERNAL URL HERE
       FTS_API_PORT: 19023
       FTS_API_PROTO: 'http'
-      FTS_UI_EXPOSED_IP: 'free-tak-server-ui'
-      FTS_MAP_EXPOSED_IP: 'localhost'
+      FTS_UI_EXPOSED_IP: 'freetakserver-ui'
+      FTS_MAP_EXPOSED_IP: '127.0.0.1'
       FTS_MAP_PORT: 8000
       FTS_MAP_PROTO: 'http'
       FTS_UI_PORT: 5000
-      FTS_UI_WSKEY: 'vnkdjnfjknfl1232#'
-      FTS_API_KEY: 'vnkdjnfjknfl1232#'
+      FTS_UI_WSKEY: 'YourWebsocketKey'
+      FTS_API_KEY: 'Bearer token'
       FTS_UI_SQLALCHEMY_DATABASE_URI: 'sqlite:////home/freetak/data/FTSServer-UI.db'
 
 volumes:
   free-tak-core-db:
   free-tak-ui-db:
+
+networks:
+    taknet:
+        driver: bridge
diff --git a/containers/example-compose.yaml b/containers/example-compose.yaml
@@ -1,6 +1,9 @@
 services:
   freetakserver:
     image: ghcr.io/freetakteam/freetakserver:latest
+    hostname: freetakserver
+    networks:
+        - taknet
     volumes:
       - free-tak-core-db:/opt/fts/
     ports:
@@ -13,16 +16,17 @@ services:
       # SSLDataPackagePort
       - 8443:8443
       # FederationPort
-      #- 9000:9000
+      - 9000:9000
       # APIPort - Don't expose by default
-      #- 19023:19023
+      - 19023:19023
 
     environment:
         # The ChangeMe section
         FTS_FED_PASSWORD: "defaultpass"
-        FTS_CLIENT_CERT_PASSWORD: "password"
+        FTS_CLIENT_CERT_PASSWORD: "supersecret"
+        FTS_WEBSOCKET_KEY: "YourWebsocketKey"
         FTS_SECRET_KEY: "vnkdjnfjknfl1232#"
-        FTS_NODE_ID: "fl5m8j5txlgdtfv8wi96zf8tt0howddo"
+        #FTS_NODE_ID: "SOMESTRING"
         FTS_CONNECTION_MESSAGE: "Welcome to FreeTAKServer. The Parrot is not dead. It’s just resting"
 
         # Networking
@@ -31,24 +35,24 @@ services:
         FTS_API_PORT: 19023
         FTS_FED_PORT: 9000
 
-        FTS_DP_ADDRESS: 127.0.0.1
-        FTS_USER_ADDRESS: 127.0.0.1
-        FTS_API_ADDRESS: 0.0.0.0
+        FTS_DP_ADDRESS: 'freetakserver'
+        FTS_USER_ADDRESS: 'freetakserver'
+        FTS_API_ADDRESS: 'freetakserver'
 
         FTS_ROUTING_PROXY_SUBSCRIBE_PORT: 19030
-        FTS_ROUTING_PROXY_SUBSCRIBE_IP: 127.0.0.1
+        FTS_ROUTING_PROXY_SUBSCRIBE_IP: 'freetakserver'
 
         FTS_ROUTING_PROXY_PUBLISHER_PORT: 19032
-        FTS_ROUTING_PROXY_PUBLISHER_IP: 127.0.0.1
+        FTS_ROUTING_PROXY_PUBLISHER_IP: 'freetakserver'
 
         FTS_ROUTING_PROXY_SERVER_PORT: 19031
-        FTS_ROUTING_PROXY_SERVER_IP: 127.0.0.1
+        FTS_ROUTING_PROXY_SERVER_IP: 'freetakserver'
 
         FTS_INTEGRATION_MANAGER_PULLER_PORT: 19033 # port to receive worker responses by the integration manager
-        FTS_INTEGRATION_MANAGER_PULLER_ADDRESS: 127.0.0.1 # address to receive worker responses by the integration manager
+        FTS_INTEGRATION_MANAGER_PULLER_ADDRESS: 'freetakserver' # address to receive worker responses by the integration manager
 
         FTS_INTEGRATION_MANAGER_PUBLISHER_PORT: 19034 # port from which to publish messages by the integration manager
-        FTS_INTEGRATION_MANAGER_PUBLISHER_ADDRESS: 127.0.0.1 # address from which to publish messages by the integration manager
+        FTS_INTEGRATION_MANAGER_PUBLISHER_ADDRESS: 'freetakserver' # address from which to publish messages by the integration manager
 
         # Misc Settings
         FTS_OPTIMIZE_API: True
@@ -63,18 +67,21 @@ services:
         FTS_EMERGENCY_RADIUS: 0 # radius of emergency within-which users will receive it
         FTS_LOG_LEVEL: "info"
 
-  free-tak-server-ui:
+  freetakserver-ui:
     image: ghcr.io/freetakteam/ui:latest
+    hostname: freetakserver-ui
+    networks:
+        - taknet
     ports:
       - 5000:5000
     volumes:
-      - free-tak-ui-db:/home/freetak/data/
+      - free-tak-ui-db:/home/freetak/:Z,rw
     environment:
-      FTS_IP: 'free-tak-server'
+      FTS_IP: YOUR EXTERNAL URL HERE
       FTS_API_PORT: 19023
       FTS_API_PROTO: 'http'
-      FTS_UI_EXPOSED_IP: 'free-tak-server-ui'
-      FTS_MAP_EXPOSED_IP: 'free-tak-server-ui'
+      FTS_UI_EXPOSED_IP: 'freetakserver-ui'
+      FTS_MAP_EXPOSED_IP: '127.0.0.1'
       FTS_MAP_PORT: 8000
       FTS_MAP_PROTO: 'http'
       FTS_UI_PORT: 5000
@@ -85,3 +92,7 @@ services:
 volumes:
   free-tak-core-db:
   free-tak-ui-db:
+
+networks:
+    taknet:
+        driver: bridge