diff --git a/docker-configs/Dockerfile-ci b/docker-configs/Dockerfile-ci index e40c21c..c70954f 100644 --- a/docker-configs/Dockerfile-ci +++ b/docker-configs/Dockerfile-ci @@ -18,7 +18,7 @@ FROM python:3.11-alpine #ENTRYPOINT [ "/entrypoint" ] -ENTRYPOINT ["/sbin/tini", "-g", "--", "/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"] +ENTRYPOINT ["/sbin/tini", "-g", "--", "/entrypoint"] COPY . /opt/freedmr diff --git a/docker-configs/entrypoint-proxy b/docker-configs/entrypoint-proxy index daefdb6..3f84ba6 100755 --- a/docker-configs/entrypoint-proxy +++ b/docker-configs/entrypoint-proxy @@ -25,7 +25,8 @@ then exec python /opt/freedmr/bridge.py -c freedmr.cfg -r rules.py else echo 'Starting in FreeDMR mode...' - python /opt/freedmr/hotspot_proxy_v2.py & - python /opt/freedmr/playback.py -c loro.cfg & - exec python /opt/freedmr/bridge_master.py -c freedmr.cfg + /usr/bin/supervisord -c /etc/supervisor/conf.d/supervisord.conf + #python /opt/freedmr/hotspot_proxy_v2.py & + #python /opt/freedmr/playback.py -c loro.cfg & + #exec python /opt/freedmr/bridge_master.py -c freedmr.cfg fi diff --git a/docker-configs/supervisord.conf b/docker-configs/supervisord.conf index bfccc52..a7b9dea 100644 --- a/docker-configs/supervisord.conf +++ b/docker-configs/supervisord.conf @@ -3,7 +3,6 @@ nodaemon=true logfile=/dev/null logfile_maxbytes=0 pidfile=/tmp/supervisord.pid -nodaemon [program:freedmr] stdout_logfile=/dev/fd/1 diff --git a/hotspot_proxy_v2.py b/hotspot_proxy_v2.py index 03ce5c0..e840530 100644 --- a/hotspot_proxy_v2.py +++ b/hotspot_proxy_v2.py @@ -345,7 +345,7 @@ if __name__ == '__main__': Timeout = 30 Stats = False Debug = False - ClientInfo = False + ClientInfo = True BlackList = [1234567] #e.g. {10.0.0.1: 0, 10.0.0.2: 0} IPBlackList = {}