diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index 7d59e6e..db6bc26 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -1,17 +1,13 @@ version: '2' networks: - network: - ipam: - driver: default - config: - - subnet: 172.254.0.0/16 - + teamspeak: + external: false services: app: container_name: teamspeak_app image: teamspeak:latest volumes: - - ./teamspeak:/var/ts3server + - ./app:/var/ts3server - ./whitelist.txt:/whitelist.txt ports: - 10011:10011 @@ -21,17 +17,16 @@ services: - TS3SERVER_LICENSE=accept - TS3SERVER_IP_WHITELIST=/whitelist.txt restart: always - networks: - - network + network_mode: "host" web: container_name: teamspeak_web image: teamspeak_web:latest volumes: - ./env:/var/www/html/application/config/env ports: - - 8181:80 + - 127.0.0.1:8181:80 depends_on: - app restart: always networks: - - network \ No newline at end of file + - teamspeak \ No newline at end of file diff --git a/docker-compose/env b/docker-compose/env index b53b44e..11a2817 100644 --- a/docker-compose/env +++ b/docker-compose/env @@ -8,7 +8,7 @@ theme="bootstrap4" # values: bootstrap4 (foldernames are used to determine theme theme_cache=false # values: true|false (cache view/twig. makes it faster, disable for debug) # teamspeak -teamspeak_host="teamspeak_app" # 'localhost' or 'name_of_docker_container' if running locally +teamspeak_host="localhost" # 'localhost' or 'name_of_docker_container' if running locally or IP teamspeak_query_port=10011 teamspeak_user="serveradmin" diff --git a/docker-compose/whitelist.txt b/docker-compose/whitelist.txt index 4a3c7bb..e56ea71 100644 --- a/docker-compose/whitelist.txt +++ b/docker-compose/whitelist.txt @@ -1 +1 @@ -172.254.0.0/16 \ No newline at end of file +127.0.0.1 \ No newline at end of file