fix: update tor/yggdrasil runtime configuration
This commit is contained in:
+8
-1
@@ -2,8 +2,11 @@
|
|||||||
ARG UBUNTU_VERSION=24.04
|
ARG UBUNTU_VERSION=24.04
|
||||||
|
|
||||||
# === STAGE 1: Build Yggdrasil from source ===
|
# === STAGE 1: Build Yggdrasil from source ===
|
||||||
FROM ubuntu:${UBUNTU_VERSION} as builder_yggdrasil
|
FROM --platform=$BUILDPLATFORM ubuntu:${UBUNTU_VERSION} as builder_yggdrasil
|
||||||
ARG YGGDRASIL_VERSION=v0.5.12
|
ARG YGGDRASIL_VERSION=v0.5.12
|
||||||
|
ARG BUILDPLATFORM
|
||||||
|
ARG TARGETPLATFORM
|
||||||
|
ARG TARGETARCH
|
||||||
|
|
||||||
# Install build dependencies
|
# Install build dependencies
|
||||||
RUN DEBIAN_FRONTEND=noninteractive \
|
RUN DEBIAN_FRONTEND=noninteractive \
|
||||||
@@ -27,6 +30,8 @@ RUN ./build
|
|||||||
# === STAGE 2: Runtime environment ===
|
# === STAGE 2: Runtime environment ===
|
||||||
FROM ubuntu:${UBUNTU_VERSION}
|
FROM ubuntu:${UBUNTU_VERSION}
|
||||||
|
|
||||||
|
ARG TARGETARCH
|
||||||
|
|
||||||
# Install runtime dependencies
|
# Install runtime dependencies
|
||||||
RUN DEBIAN_FRONTEND=noninteractive \
|
RUN DEBIAN_FRONTEND=noninteractive \
|
||||||
apt-get update && \
|
apt-get update && \
|
||||||
@@ -74,6 +79,8 @@ COPY --from=builder_yggdrasil /BUILD_YGGDRASIL/yggdrasil-go/genkeys .
|
|||||||
COPY ./yggdrasil.conf .
|
COPY ./yggdrasil.conf .
|
||||||
|
|
||||||
# === TOR PROXY SETUP ===
|
# === TOR PROXY SETUP ===
|
||||||
|
# DNSPort
|
||||||
|
EXPOSE 9053
|
||||||
# SOCKS5 proxy port
|
# SOCKS5 proxy port
|
||||||
EXPOSE 9050
|
EXPOSE 9050
|
||||||
EXPOSE 8118
|
EXPOSE 8118
|
||||||
|
|||||||
+1
-3
@@ -1,5 +1,3 @@
|
|||||||
version: "3.8"
|
|
||||||
|
|
||||||
services:
|
services:
|
||||||
tor_yggdrasil:
|
tor_yggdrasil:
|
||||||
image: tor_yggdrasil:latest
|
image: tor_yggdrasil:latest
|
||||||
@@ -12,7 +10,7 @@ services:
|
|||||||
- /dev/net/tun:/dev/net/tun # TUN device for Yggdrasil network interface
|
- /dev/net/tun:/dev/net/tun # TUN device for Yggdrasil network interface
|
||||||
ports:
|
ports:
|
||||||
- "127.0.0.1:9050:9050/tcp" # SOCKS5 proxy port (Tor) for application-level traffic
|
- "127.0.0.1:9050:9050/tcp" # SOCKS5 proxy port (Tor) for application-level traffic
|
||||||
- "10654:10654/tcp" # Yggdrasil peer connections
|
- "10655:10655/tcp" # Yggdrasil peer connections
|
||||||
environment:
|
environment:
|
||||||
- YGGDRASIL_GENERATE_KEYS=true # Generate new Yggdrasil keys on startup
|
- YGGDRASIL_GENERATE_KEYS=true # Generate new Yggdrasil keys on startup
|
||||||
restart: unless-stopped # Auto-restart unless manually stopped
|
restart: unless-stopped # Auto-restart unless manually stopped
|
||||||
@@ -1,3 +1,5 @@
|
|||||||
|
# Listen on all interfaces so other containers can reach us
|
||||||
|
DNSPort 0.0.0.0:9053
|
||||||
SocksPort 0.0.0.0:9050
|
SocksPort 0.0.0.0:9050
|
||||||
|
|
||||||
ClientTransportPlugin obfs4 exec /usr/bin/obfs4proxy
|
ClientTransportPlugin obfs4 exec /usr/bin/obfs4proxy
|
||||||
|
|||||||
+1
-1
@@ -17,7 +17,7 @@
|
|||||||
# here. Each listener should be specified in URI format as above, e.g.
|
# here. Each listener should be specified in URI format as above, e.g.
|
||||||
# tls://0.0.0.0:0 or tls://[::]:0 to listen on all interfaces.
|
# tls://0.0.0.0:0 or tls://[::]:0 to listen on all interfaces.
|
||||||
Listen: [
|
Listen: [
|
||||||
tls://[::]:10654
|
tls://[::]:10655
|
||||||
]
|
]
|
||||||
|
|
||||||
# Listen address for admin connections. Default is to listen for local
|
# Listen address for admin connections. Default is to listen for local
|
||||||
|
|||||||
Reference in New Issue
Block a user