Compare commits

..

11 Commits

Author SHA1 Message Date
Fabian Peter Hammerle afcf2b4cc1 release v4.5.1 2022-02-27 16:29:08 +01:00
Fabian Peter Hammerle eb23db5412 adapt entrypoint script to fix "sed: write error" for large values of EXIT_NODES and EXCLUDE_EXIT_NODES 2022-02-27 16:27:14 +01:00
dependabot[bot] 9e41750ca9 build(deps): bump docker/build-push-action from 2.8.0 to 2.9.0
Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 2.8.0 to 2.9.0.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](https://github.com/docker/build-push-action/compare/v2.8.0...v2.9.0)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-04 08:07:56 +00:00
dependabot[bot] 6a1098af3d build(deps): bump docker/build-push-action from 2.7.0 to 2.8.0
Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 2.7.0 to 2.8.0.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](https://github.com/docker/build-push-action/compare/v2.7.0...v2.8.0)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-21 08:06:14 +00:00
Fabian Peter Hammerle 7fc341fb34 make docker-push: add image tag to suggested git tag message
https://github.com/fphammerle/docker-onion-service/commit/ef034c6f61d63a72e25309449bbc19496f4f2ad7
2021-12-28 12:59:06 +01:00
Fabian Peter Hammerle 4b287edbd4 upgrade tor package to v0.4.6.9-r0 (see below)
https://web.archive.org/web/20211228082801/https://gitweb.torproject.org/tor.git/plain/ChangeLog
https://git.alpinelinux.org/aports/commit/community/tor?h=3.15-stable&id=cacb3a44facfe85ca04ca1868ecf0f0fbaeae190

https://github.com/fphammerle/docker-tor-obfs4-bridge/commit/127af8a9b1235120bba8dc40b609dc3bf20b4566
2021-12-28 09:47:26 +01:00
Fabian Peter Hammerle 1eb9583069 upgrade tor package to v0.4.6.8-r0 (see below)
https://web.archive.org/web/20211219210312/https://gitweb.torproject.org/tor.git/plain/ChangeLog
https://git.alpinelinux.org/aports/commit/community/tor?h=3.15-stable&id=178008f6bd3a8c810e17902277ffa30bb59933a1

https://github.com/fphammerle/docker-tor-obfs4-bridge/commit/f76e89e788260385778d0692741bfa23c9ec16ac
2021-12-19 22:11:42 +01:00
Fabian Peter Hammerle 946bc9db19 upgrade alpine base image to v3.15.0 including upgrade of tor package from v0.4.5.10-r0 to v0.4.6.7-r1 and nftables package (see below)
https://web.archive.org/web/20211204112320/https://gitweb.torproject.org/tor.git/plain/ChangeLog
https://git.alpinelinux.org/aports/commit/community/tor?h=3.15-stable&id=01351ec5162a1c190361b3799c63862a4c94d935
https://git.alpinelinux.org/aports/commit/community/tor?h=3.15-stable&id=7d4f77837c3a2f1cecfbfbe9224552b3614e3664
https://git.alpinelinux.org/aports/commit/community/tor?h=3.15-stable&id=8c36ff0a65aac9960da5cfce6694eedd8d869da6
https://git.alpinelinux.org/aports/commit/community/tor?h=3.15-stable&id=82d7315dd0e5b8d8fca73c175c95c280d24707b1

https://github.com/fphammerle/docker-tor-obfs4-bridge/commit/ebf4ab28c1c9a3b481334feff9826e2f0e2b5cc1

https://web.archive.org/web/20211204163111/https://lwn.net/Articles/866923/
https://web.archive.org/web/20211204162830/https://marc.info/?l=netfilter&m=163724233607275&w=2
https://git.alpinelinux.org/aports/commit/main/nftables?h=3.15-stable&id=e6af0bc07e922da5464d954686ffa1b144147289
https://git.alpinelinux.org/aports/commit/main/nftables?h=3.15-stable&id=bff049102a3177352d3caff2aa4aecf8a2993740
https://git.alpinelinux.org/aports/commit/main/nftables?h=3.15-stable&id=d69dc1a17026ff1844636db10fa77c7b546ac45a
2021-12-04 17:25:28 +01:00
dependabot[bot] ce0fce96e0 build(deps): bump alpine from 3.14.3 to 3.15.0
Bumps alpine from 3.14.3 to 3.15.0.

---
updated-dependencies:
- dependency-name: alpine
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-26 08:02:54 +00:00
dependabot[bot] d7d5518a21 build(deps): bump alpine from 3.14.2 to 3.14.3
Bumps alpine from 3.14.2 to 3.14.3.

---
updated-dependencies:
- dependency-name: alpine
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-19 08:02:58 +00:00
dependabot[bot] 5db662d486 build(deps): bump docker/setup-buildx-action from 1.5.1 to 1.6.0
Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 1.5.1 to 1.6.0.
- [Release notes](https://github.com/docker/setup-buildx-action/releases)
- [Commits](https://github.com/docker/setup-buildx-action/compare/v1.5.1...v1.6.0)

---
updated-dependencies:
- dependency-name: docker/setup-buildx-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-10 11:55:05 +00:00
8 changed files with 21 additions and 20 deletions
+2 -2
View File
@@ -13,13 +13,13 @@ jobs:
runs-on: ubuntu-20.04
steps:
- uses: docker/setup-qemu-action@v1.2.0
- uses: docker/setup-buildx-action@v1.5.1
- uses: docker/setup-buildx-action@v1.6.0
# > By default, this action uses the Git context so you don't need to use
# > the actions/checkout action to checkout the repository because this
# > will be done directly by buildkit. [...]
# > any file mutation in the steps that precede [...] will be ignored
# https://github.com/marketplace/actions/build-and-push-docker-images
- uses: docker/build-push-action@v2.7.0
- uses: docker/build-push-action@v2.9.0
with:
platforms: |
linux/amd64
+6 -1
View File
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]
## [4.5.1] - 2022-02-27
### Fixed
- "sed: write error" for large values of `EXIT_NODES` and `EXCLUDE_EXIT_NODES`
## [4.5.0] - 2021-09-06
### Added
- added ability to select exit nodes explicitly via `EXIT_NODES` environment variable
@@ -87,7 +91,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/v4.5.0...HEAD
[Unreleased]: https://github.com/fphammerle/docker-tor-proxy/compare/v4.5.1...HEAD
[4.5.1]: https://github.com/fphammerle/docker-tor-proxy/compare/v4.5.0...v4.5.1
[4.5.0]: https://github.com/fphammerle/docker-tor-proxy/compare/v4.4.0...v4.5.0
[4.4.0]: https://github.com/fphammerle/docker-tor-proxy/compare/v4.3.1...v4.4.0
[4.3.1]: https://github.com/fphammerle/docker-tor-proxy/compare/v4.3.0...v4.3.1
+3 -3
View File
@@ -1,8 +1,8 @@
FROM docker.io/alpine:3.14.2
FROM docker.io/alpine:3.15.0
# nftables + dependencies add 2.3MB to image
ARG TOR_PACKAGE_VERSION=0.4.5.10-r0
ARG NFTABLES_PACKAGE_VERSION=0.9.9-r0
ARG TOR_PACKAGE_VERSION=0.4.6.9-r0
ARG NFTABLES_PACKAGE_VERSION=1.0.1-r0
RUN apk add --no-cache \
nftables=$NFTABLES_PACKAGE_VERSION \
tor=$TOR_PACKAGE_VERSION
+1 -1
View File
@@ -29,4 +29,4 @@ podman-build: worktree-clean
docker-push: docker-build
sudo docker push "${IMAGE_NAME}:${IMAGE_TAG}"
@echo git tag --sign --message '$(shell sudo docker image inspect --format '{{join .RepoDigests "\n"}}' "${IMAGE_NAME}:${IMAGE_TAG}")' docker/${IMAGE_TAG} $(shell git rev-parse HEAD)
@echo git tag --sign --message '$(shell sudo docker image inspect --format '{{join .RepoDigests "\n"}}' "${IMAGE_NAME}:${IMAGE_TAG}" | sed "s/@/:${IMAGE_TAG}@/")' docker/${IMAGE_TAG} $(shell git rev-parse HEAD)
+7 -8
View File
@@ -20,15 +20,14 @@ else
sed -e "s/{socks_timeout_seconds}/$SOCKS_TIMEOUT_SECONDS/" /torrc.template > /tmp/torrc
fi
if [ -z "$EXIT_NODES" ]; then
sed --in-place -e '/{exit_nodes}/d' /tmp/torrc
else
sed --in-place -e "s#{exit_nodes}#$EXIT_NODES#" /tmp/torrc
# > list of identity fingerprints, country codes, and address patterns
if [ ! -z "$EXIT_NODES" ]; then
echo -n 'ExitNodes ' >> /tmp/torrc
printenv EXIT_NODES >> /tmp/torrc
fi
if [ -z "$EXCLUDE_EXIT_NODES" ]; then
sed --in-place -e '/{exclude_exit_nodes}/d' /tmp/torrc
else
sed --in-place -e "s#{exclude_exit_nodes}#$EXCLUDE_EXIT_NODES#" /tmp/torrc
if [ ! -z "$EXCLUDE_EXIT_NODES" ]; then
echo -n 'ExcludeExitNodes ' >> /tmp/torrc
printenv EXCLUDE_EXIT_NODES >> /tmp/torrc
fi
exec "$@"
+1
View File
@@ -0,0 +1 @@
https://git.alpinelinux.org/aports/log/main/nftables?h=3.15-stable
+1 -1
View File
@@ -1 +1 @@
https://git.alpinelinux.org/aports/log/community/tor
https://git.alpinelinux.org/aports/log/community/tor?h=3.15-stable
-4
View File
@@ -26,9 +26,5 @@ SocksTimeout {socks_timeout_seconds}
# https://github.com/mitmproxy/mitmproxy/blob/v6.0.2/mitmproxy/platform/linux.py#L27
TransPort 0.0.0.0:9040 IsolateClientAddr IsolateClientProtocol
# > list of identity fingerprints, country codes, and address patterns
ExitNodes {exit_nodes}
ExcludeExitNodes {exclude_exit_nodes}
# try to
HardwareAccel 1