diff --git a/tor/Dockerfile b/tor/Dockerfile index 6f46b6296..84d5abba9 100644 --- a/tor/Dockerfile +++ b/tor/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=ghcr.io/hassio-addons/base:16.2.0 +ARG BUILD_FROM=ghcr.io/hassio-addons/base:17.1.3 # hadolint ignore=DL3006 FROM ${BUILD_FROM} @@ -11,22 +11,22 @@ COPY rootfs / # Setup base RUN \ apk add --no-cache \ - coreutils=9.5-r1 \ - openssl=3.3.1-r3 \ - tor=0.4.8.12-r0 \ - go=1.22.6-r0 \ - git=2.45.2-r0 \ - ca-certificates=20240705-r0 \ - libcap=2.70-r0 + coreutils=9.5-r2 \ + openssl=3.3.2-r6 \ + tor=0.4.8.14-r1 \ + go=1.23.6-r0 \ + git=2.47.2-r0 \ + ca-certificates=20241121-r1 \ + libcap=2.71-r0 # Download pluggable-transports sources WORKDIR /go ARG OBFS_VERSION=obfs4proxy-0.0.14 -ARG SNOWFLAKE_VERSION=v2.9.2 -ARG WEBTUNNEL_VERSION=e64b1b3562f3ab50d06141ecd513a21ec74fe8c6 +ARG SNOWFLAKE_VERSION=v2.10.1 +ARG WEBTUNNEL_VERSION=v0.0.2 RUN git clone -b ${OBFS_VERSION} --single-branch --depth 1 https://github.com/Yawning/obfs4.git \ && git clone -b ${SNOWFLAKE_VERSION} --single-branch --depth 1 https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake.git \ - && git clone --single-branch --depth 1 https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/webtunnel.git + && git clone -b ${WEBTUNNEL_VERSION} --single-branch --depth 1 https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/webtunnel.git # Build obfs4proxy WORKDIR /go/obfs4 @@ -56,11 +56,11 @@ HEALTHCHECK \ --interval=60s \ --timeout=30s \ CMD curl \ - --silent \ - --location \ - --socks5-hostname localhost:9050 \ - https://check.torproject.org/?lang=en_US \ - | grep -qm1 Congratulations + --silent \ + --location \ + --socks5-hostname localhost:9050 \ + https://check.torproject.org/?lang=en_US \ + | grep -qm1 Congratulations # Build arguments ARG BUILD_ARCH