diff --git a/backend/docker-entrypoint.sh b/backend/docker-entrypoint.sh index 3db67b8..634543f 100644 --- a/backend/docker-entrypoint.sh +++ b/backend/docker-entrypoint.sh @@ -2,5 +2,21 @@ chown nobody -R /execute/ -exec capsh --caps="cap_net_admin,cap_setpcap,cap_setuid,cap_setgid,cap_sys_nice+eip" \ - --keep=1 --user=nobody --addamb=cap_net_admin,cap_sys_nice -- -c "python3 /execute/app.py DOCKER" +echo "[*] Attempting to start with capabilities..." + +if capsh --caps="cap_net_admin,cap_setpcap,cap_setuid,cap_setgid,cap_sys_nice+eip" \ + --keep=1 \ + --user=nobody \ + --addamb=cap_net_admin,cap_sys_nice \ + -- -c "exit 0" +then + exec capsh --caps="cap_net_admin,cap_setpcap,cap_setuid,cap_setgid,cap_sys_nice+eip" \ + --keep=1 \ + --user=nobody \ + --addamb=cap_net_admin,cap_sys_nice \ + -- -c "python3 /execute/app.py DOCKER" +else + echo "[!] capsh failed, running with root user" + exec python3 /execute/app.py DOCKER +fi + diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx index 375cdcd..d346485 100644 --- a/frontend/src/App.tsx +++ b/frontend/src/App.tsx @@ -142,8 +142,9 @@ const PageRouting = ({ getStatus }:{ getStatus:()=>void }) => { const queryClient = useQueryClient() - useEffect(()=>{ + socketio.auth = { token: localStorage.getItem("access_token") } + socketio.connect() getStatus() socketio.on("update", (data) => { queryClient.invalidateQueries({ queryKey: data }) @@ -155,6 +156,7 @@ const PageRouting = ({ getStatus }:{ getStatus:()=>void }) => { return () => { socketio.off("update") socketio.off("connect_error") + socketio.disconnect() } },[])