This commit is contained in:
Dread
2022-09-09 14:47:26 -04:00
parent 284a403b08
commit fd81846caf
3 changed files with 4 additions and 25 deletions

View File

@ -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 tar xz && mv yq_linux_arm /usr/bin/yq
ENV APP_HOST robosats.embassy ENV APP_HOST robosats.embassy
ENV APP_PORT 9000 ENV APP_PORT 12596
ENV TOR_PROXY_IP robosats.embassy ENV TOR_PROXY_IP embassy
ENV TOR_PROXY_PORT 9050 ENV TOR_PROXY_PORT 9050
ADD ./docker_entrypoint.sh /usr/local/bin/docker_entrypoint.sh ADD ./docker_entrypoint.sh /usr/local/bin/docker_entrypoint.sh
ADD check-web.sh /usr/local/bin/check-web.sh ADD check-web.sh /usr/local/bin/check-web.sh
RUN chmod a+x /usr/local/bin/*.sh RUN chmod a+x /usr/local/bin/*.sh
RUN chmod a+x *.sh RUN chmod a+x *.sh
EXPOSE 12596
ENTRYPOINT ["/usr/local/bin/docker_entrypoint.sh"]

View File

@ -1,15 +1,6 @@
#!/bin/bash #!/bin/bash
set -e set -ea
# 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}"
echo "Starting RoboSats..." echo "Starting RoboSats..."
exec tini $client_server & $backend_tor_bridge & nginx -g "daemon off;" exec tini -s ./robosats-client.sh

View File

@ -86,19 +86,11 @@ interfaces:
# Port mappings are from the external port to the internal container port # Port mappings are from the external port to the internal container port
port-mapping: port-mapping:
80: "12596" 80: "12596"
9000: "9000"
81: "81"
# Port mappings are from the external port to the internal container port # Port mappings are from the external port to the internal container port
lan-config: lan-config:
443: 443:
ssl: true ssl: true
internal: 12596 internal: 12596
9000:
ssl: true
internal: 9000
81:
ssl: true
internal: 81
# Denotes if the service has a user interface to display # Denotes if the service has a user interface to display
ui: true ui: true
# Denotes the protocol specifications used by this interface # Denotes the protocol specifications used by this interface