diff --git a/Dockerfile b/Dockerfile index 4f16ae2..22e2329 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,15 +4,11 @@ RUN apt-get update && apt-get install wget curl sudo bash tini -y \ tar xz && mv yq_linux_arm /usr/bin/yq ENV APP_HOST robosats.embassy -ENV APP_PORT 9000 -ENV TOR_PROXY_IP robosats.embassy +ENV APP_PORT 12596 +ENV TOR_PROXY_IP embassy ENV TOR_PROXY_PORT 9050 ADD ./docker_entrypoint.sh /usr/local/bin/docker_entrypoint.sh ADD check-web.sh /usr/local/bin/check-web.sh RUN chmod a+x /usr/local/bin/*.sh RUN chmod a+x *.sh - -EXPOSE 12596 - -ENTRYPOINT ["/usr/local/bin/docker_entrypoint.sh"] \ No newline at end of file diff --git a/docker_entrypoint.sh b/docker_entrypoint.sh index 5fc2cfb..cccd657 100755 --- a/docker_entrypoint.sh +++ b/docker_entrypoint.sh @@ -1,15 +1,6 @@ #!/bin/bash -set -e - -# Setting env-vars from config page -echo "Setting environment variables..." -export ROBOSATS_ONION=$(yq e '.tor-address' /root/start9/config.yaml) -export LAN_HOST=$(yq e '.lan-address' /root/start9/config.yaml) -# export TOR_PROXY_IP=$(yq e '.tor-address' /root/start9/config.yaml) -client_server="npm exec http-server -- . -p 12596 -P http://127.18.0.1:9050 --cors -i false -d false" -backend_tor_bridge="socat tcp4-LISTEN:81,reuseaddr,fork,keepalive,bind=127.0.0.1 SOCKS4A:${TOR_PROXY_IP:-127.18.0.1}:${ROBOSATS_ONION:-robosats6tkf3eva7x2voqso3a5wcorsnw34jveyxfqi2fu7oyheasid.onion}:80,socksport=${TOR_PROXY_PORT:-9050}" +set -ea echo "Starting RoboSats..." -exec tini $client_server & $backend_tor_bridge & nginx -g "daemon off;" - +exec tini -s ./robosats-client.sh diff --git a/manifest.yaml b/manifest.yaml index fab1916..f398173 100644 --- a/manifest.yaml +++ b/manifest.yaml @@ -86,19 +86,11 @@ interfaces: # Port mappings are from the external port to the internal container port port-mapping: 80: "12596" - 9000: "9000" - 81: "81" # Port mappings are from the external port to the internal container port lan-config: 443: ssl: true internal: 12596 - 9000: - ssl: true - internal: 9000 - 81: - ssl: true - internal: 81 # Denotes if the service has a user interface to display ui: true # Denotes the protocol specifications used by this interface