docker fixes

Author: chc

.env-local

@@ -1,6 +1,18 @@
-REDIS_ADDRESS=172.17.0.1:6379
-RABBITMQ_ADDRESS=172.17.0.1:5672
-RABBITMQ_USER=rabbitmq
-RABBITMQ_PASSWORD=rabbitmq
-WEBSERVICES_URL=http://172.17.0.1:8080
-WEBSERVICES_APIKEY=ELGAoKHyFPfsWhmWF5F/8uNz2YcdTrojCZbRfvlFwBKJIhDUdvMwM4bmljSsEBq57riyXRij8FoqmxWR8C2BQIEaGG68uFJKcQmJlLY2ntAFOYUloccRCr/eBW8sJZsTIGaIdVdsDeDOrRJR487tfFGNHW2Ezp+oVrZVsd3C9e0VobSE1fXdSFz3R5MIqH3bLprfcDLJL/U8gtvUBegOQI22Vviha24W0/76SQSo72Z7i6GrpU/OnrsjcHQSwyC6VeCTv5JjCP/BSsaCK0Zxw3OlzQsPAprQug9Pwm5MrH/pkkxhqLKcCxjsU25Zj+ipkKOzsO+rmqaIMsK6ILke6w==
+OPENSPY_REDIS_ADDRESS=redis
+OPENSPY_REDIS_PORT=6379
+OPENSPY_REDIS_SSL=0
+OPENSPY_REDIS_SSL_NO_VERIFY=1
+OPENSPY_AMQP_ADDRESS=rabbit
+OPENSPY_AMQP_PORT=5672
+OPENSPY_AMQP_USER=openspy
+OPENSPY_AMQP_PASSWORD=openspy
+OPENSPY_WEBSERVICES_URL=http://core-web:8080
+OPENSPY_API_KEY=ELGAoKHyFPfsWhmWF5F/8uNz2YcdTrojCZbRfvlFwBKJIhDUdvMwM4bmljSsEBq57riyXRij8FoqmxWR8C2BQIEaGG68uFJKcQmJlLY2ntAFOYUloccRCr/eBW8sJZsTIGaIdVdsDeDOrRJR487tfFGNHW2Ezp+oVrZVsd3C9e0VobSE1fXdSFz3R5MIqH3bLprfcDLJL/U8gtvUBegOQI22Vviha24W0/76SQSo72Z7i6GrpU/OnrsjcHQSwyC6VeCTv5JjCP/BSsaCK0Zxw3OlzQsPAprQug9Pwm5MrH/pkkxhqLKcCxjsU25Zj+ipkKOzsO+rmqaIMsK6ILke6w==
+OPENSPY_NATNEG_BIND_ADDR=0.0.0.0
+OPENSPY_QR_BIND_ADDR=0.0.0.0
+OPENSPY_SBV1_BIND_ADDR=0.0.0.0
+OPENSPY_SBV2_BIND_ADDR=0.0.0.0
+OPENSPY_CDKEY_BIND_ADDR=0.0.0.0
+OPENSPY_GP_BIND_ADDR=0.0.0.0
+OPENSPY_GSTATS_BIND_ADDR=0.0.0.0
+OPENSPY_SM_BIND_ADDR=0.0.0.0

docker-compose.yaml

@@ -3,43 +3,51 @@ services:
   serverbrowsing:
     ports:
       - "28910:30693"
-    command: /opt/openspy/bin/serverbrowsing
     env_file: .env-local
-    image: os-core
+    environment:
+      RUN_FILE: serverbrowsing
+    image: chcniz/openspy-core
   qr:
     ports:
-      - "27900:30694"
-    command: /opt/openspy/bin/qr
+      - "27900:30694/udp"
     env_file: .env-local
-    image: os-core
+    environment:
+      RUN_FILE: qr
+    image: chcniz/openspy-core
   natneg:
     ports:
-      - "27901:30695"
-    command: /opt/openspy/bin/qr
+      - "27901:30695/udp"
+    environment:
+      RUN_FILE: natneg
     env_file: .env-local
-    image: os-core
+    image: chcniz/openspy-core
   GP:
     ports:
       - "29900:30974"
-    command: /opt/openspy/bin/GP
+    environment:
+      RUN_FILE: GP
     env_file: .env-local
-    image: os-core
+    image: chcniz/openspy-core
   SM:
     ports:
       - "29901:30734"
-    command: /opt/openspy/bin/SM
+    environment:
+      RUN_FILE: SM
     env_file: .env-local
-    image: os-core
+    image: chcniz/openspy-core
   gstats:
     ports:
       - "29920:30836"
     command: /opt/openspy/bin/gstats
+    environment:
+      RUN_FILE: gstats
     env_file: .env-local
-    image: os-core
+    image: chcniz/openspy-core
   FESL-bf2142:
     ports:
       - "18300:30837"
-    command: /opt/openspy/bin/FESL
+    environment:
+      RUN_FILE: FESL      
     env_file: .env-local
-    image: os-core
+    image: chcniz/openspy-core