release v4.0.0

healthcheck: replace dig with pre-installed nslookup
healthcheck: restore dns request as network-liveness is too optimistic
2025-10-27 02:43:35 +01:00 · 2021-01-01 17:20:14 +01:00 · 2021-01-01 16:38:41 +01:00 · 2021-01-01 16:36:24 +01:00 · 2021-01-01 13:59:50 +01:00 · 2021-01-01 12:50:11 +01:00
5 changed files with 40 additions and 14 deletions
@@ -0,0 +1,10 @@
+version: 2
+
+updates:
+- package-ecosystem: docker
+  directory: /
+  schedule:
+    interval: weekly
+    day: friday
+
+# https://docs.github.com/en/free-pro-team@latest/github/administering-a-repository/configuration-options-for-dependency-updates
@@ -6,6 +6,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

 ## [Unreleased]

+## [4.0.0] - 2021-01-01
+### Changed
+- healthcheck: replace periodic http requests with probing
+  [network-liveness](https://gitweb.torproject.org/torspec.git/tree/control-spec.txt)
+  to improve privacy (keeping dns requests for faster updates)
+- changed log level of `control` domain to `warn`
+  (to avoid log spam by healthcheck connecting to control listener)
+- added message domains to log messages
+
+### Removed
+- `curl`
+- `bind-tools` package including `dig`
+
 ## [3.0.0] - 2020-10-03
 ### Added
 - create mount point at `/var/lib/tor`
@@ -42,7 +55,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - tor socks5 & DNS proxy

-[Unreleased]: https://github.com/fphammerle/docker-tor-proxy/compare/v3.0.0...HEAD
+[Unreleased]: https://github.com/fphammerle/docker-tor-proxy/compare/v4.0.0...HEAD
+[4.0.0]: https://github.com/fphammerle/docker-tor-proxy/compare/v3.0.0...v4.0.0
 [3.0.0]: https://github.com/fphammerle/docker-tor-proxy/compare/v2.1.0...v3.0.0
 [2.1.0]: https://github.com/fphammerle/docker-tor-proxy/compare/v2.0.0...v2.1.0
 [2.0.0]: https://github.com/fphammerle/docker-tor-proxy/compare/v1.1.1...v2.0.0
@@ -1,12 +1,7 @@
-FROM alpine:3.12
+FROM alpine:3.12.3

-ARG CURL_PACKAGE_VERSION=7.69.1-r1
-ARG BIND_TOOLS_PACKAGE_VERSION=9.16.6-r0
-ARG TOR_PACKAGE_VERSION=0.4.3.5-r0
-RUN apk add --no-cache \
-        curl=$CURL_PACKAGE_VERSION \
-        bind-tools=$BIND_TOOLS_PACKAGE_VERSION `# dig` \
-        tor=$TOR_PACKAGE_VERSION
+ARG TOR_PACKAGE_VERSION=0.4.3.7-r0
+RUN apk add --no-cache tor=$TOR_PACKAGE_VERSION
 VOLUME /var/lib/tor

 #RUN apk add --no-cache \
@@ -25,7 +20,10 @@ ENTRYPOINT ["/entrypoint.sh"]
 USER tor
 CMD ["tor", "-f", "/tmp/torrc"]

+# keeping dns requests as network-liveness is too optimistic
+# https://gitweb.torproject.org/torspec.git/tree/control-spec.txt
 HEALTHCHECK CMD \
-    curl --silent --socks5 localhost:9050 https://google.com > /dev/null \
-    && [ ! -z "$(dig -p 9053 +notcp +short one.one.one.one @localhost)" ] \
+    printf "AUTHENTICATE\nGETINFO network-liveness\nQUIT\n" | nc localhost 9051 \
+        | grep -q network-liveness=up \
+    && nslookup -port=9053 google.com localhost | grep -v NXDOMAIN | grep -q google \
    || exit 1
@@ -7,8 +7,9 @@
        com.docker.network.bridge.name: tor
  - docker_container:
      name: tor_proxy
-      # TODO use fingerprint
-      image: fphammerle/tor-proxy:3.0.0-tor0.4.3.5-amd64
+      # object 9d8903fbee049c379537c5e291cfa88f57b049f2
+      # tag docker/3.0.0-tor0.4.3.5-amd64
+      image: docker.io/fphammerle/tor-proxy@sha256:501c5b5432156f25ecfce9e48ebfe0827f7702a1d32206af79f256cc94487a0f
      mounts:
      - type: volume
        source: tor_proxy_data
@@ -1,4 +1,7 @@
-Log notice stdout
+# hide healthchecks:
+# > [notice] {CONTROL} New control connection opened from 127.0.0.1.
+Log [~control]notice warn stdout
+LogMessageDomains 1

 # default: ~/.tor
 DataDirectory /var/lib/tor
Author	SHA1	Message	Date
Fabian Peter Hammerle	7cbef67a3f	release v4.0.0	2021-01-01 17:20:14 +01:00
Fabian Peter Hammerle	dfe104eb09	healthcheck: replace `dig` with pre-installed `nslookup`	2021-01-01 16:38:41 +01:00
Fabian Peter Hammerle	6a9e7a1f42	healthcheck: restore dns request as network-liveness is too optimistic partial revert of commit `8d1a635ddc`.	2021-01-01 16:36:24 +01:00
Fabian Peter Hammerle	8d1a635ddc	healthcheck: improve privacy by probing network-liveness instead of periodic http and dns requests	2021-01-01 13:59:50 +01:00
Fabian Peter Hammerle	d573073454	upgrade tor v0.4.3.5 -> v0.4.3.7 (diff links below) https://gitweb.torproject.org/tor.git/plain/ChangeLog https://git.alpinelinux.org/aports/commit/community/tor?id=3a247b9dbce3988d52b1a17a3d0bb5f1dc9b4863 removes support for zstd-compressed directory traffic from armhf builds: https://git.alpinelinux.org/aports/commit/?id=2849fa38b9a76d1ef0a9df10aa70bafa00a5ab27 adds patches to curl for irrelevant CVE-2020-8286, CVE-2020-82850 & CVE-2020-8231 https://git.alpinelinux.org/aports/commit/?id=90e58b3d833e1a1e51c524cdaa5091dbcd80c0f0 https://git.alpinelinux.org/aports/commit/main/curl?id=52697341e47e456d2ee900a53c8ef65ce8a75c23	2021-01-01 12:50:11 +01:00
Fabian Peter Hammerle	ccb9eb52a1	configure github's dependabot to keep base image up-to-date https://github.com/fphammerle/docker-postfix/commit/b273cbb38193eaa52562688522475c7e6e7df6b7	2021-01-01 12:42:38 +01:00
Fabian Peter Hammerle	b85bfc4d53	ansible-playbook: select image via fingerprint	2020-10-03 17:32:38 +02:00