fphammerle/docker-tor-proxy
1
0
Fork 0
mirror of https://github.com/fphammerle/docker-tor-proxy.git synced 2025-10-27 02:43:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

makefile: added "podman-build" target

Browse Source 
https://github.com/fphammerle/docker-onion-service/commit/77a062c4afcd96abe1ba7663a2914a94e01b9c24
https://github.com/fphammerle/docker-onion-service/commit/4c673eef480af3bb9498c0364a55dc3d8f8a5afc
https://github.com/fphammerle/docker-onion-service/commit/a3e89529767a7eb52c4bce52277715d388f6935a
https://github.com/fphammerle/docker-onion-service/commit/e8dfe51bb831c54d9a87be7c70f3f79e2f45d9ce
This commit is contained in:
Fabian Peter Hammerle
2021-03-03 13:46:08 +01:00
parent 1951c1f3a9
commit 8ae9e9e5b7
2 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+26 -14
View File
@@ -1,20 +1,32 @@
DOCKER_IMAGE_NAME := docker.io/fphammerle/tor-proxy
DOCKER_TAG_VERSION := $(shell git describe --match=v* --dirty | sed -e 's/^v//')
TOR_PACKAGE_VERSION := $(shell grep -Po 'TOR_PACKAGE_VERSION=\K.+' Dockerfile | tr -d -)
ARCH := $(shell arch)
DOCKER_TAG_ARCH_SUFFIX_armv6l := armv6
DOCKER_TAG_ARCH_SUFFIX_x86_64 := amd64
DOCKER_TAG_ARCH_SUFFIX = ${DOCKER_TAG_ARCH_SUFFIX_${ARCH}}
DOCKER_TAG = ${DOCKER_TAG_VERSION}-tor${TOR_PACKAGE_VERSION}-${DOCKER_TAG_ARCH_SUFFIX}
IMAGE_NAME := docker.io/fphammerle/tor-proxy
PROJECT_VERSION = $(shell git describe --match=v* --abbrev=0 --dirty | sed -e 's/^v//')
TOR_PACKAGE_VERSION = $(shell grep -Po 'TOR_PACKAGE_VERSION=\K.+' Dockerfile | tr -d -)
ARCH = $(shell arch)
# architecture[arm_variant]
# https://github.com/opencontainers/image-spec/blob/v1.0.1/image-index.md#image-index-property-descriptions
IMAGE_TAG_ARCH_aarch64 = arm64
IMAGE_TAG_ARCH_armv6l = armv6
IMAGE_TAG_ARCH_armv7l = armv7
IMAGE_TAG_ARCH_x86_64 = amd64
IMAGE_TAG_ARCH = ${IMAGE_TAG_ARCH_${ARCH}}
IMAGE_TAG = ${PROJECT_VERSION}-tor${TOR_PACKAGE_VERSION}-${IMAGE_TAG_ARCH}
BUILD_PARAMS = --tag="${IMAGE_NAME}:${IMAGE_TAG}" \
--build-arg=REVISION="$(shell git rev-parse HEAD)"
.PHONY: docker-build docker-push
.PHONY: worktree-clean docker-build podman-build docker-push
docker-build:
worktree-clean:
git diff --exit-code
git diff --staged --exit-code
sudo docker build -t "${DOCKER_IMAGE_NAME}:${DOCKER_TAG}" .
docker-build: worktree-clean
sudo docker build ${BUILD_PARAMS} .
podman-build: worktree-clean
# --format=oci (default) not fully supported by hub.docker.com
# https://github.com/docker/hub-feedback/issues/1871#issuecomment-748924149
podman build --format=docker ${BUILD_PARAMS} .
docker-push: docker-build
sudo docker push "${DOCKER_IMAGE_NAME}:${DOCKER_TAG}"
sleep 2 # wait for repo digest
@echo git tag --sign --message '$(shell sudo docker image inspect --format '{{join .RepoDigests "\n"}}' "${DOCKER_IMAGE_NAME}:${DOCKER_TAG}")' docker/${DOCKER_TAG} $(shell git rev-parse HEAD)
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)
torrc.template
+1
View File
@@ -22,6 +22,7 @@ SocksTimeout {socks_timeout_seconds}
# https://gitlab.torproject.org/legacy/trac/-/wikis/doc/TransparentProxy
# https://github.com/epidemics-scepticism/writing/blob/b6733379d653b30771d578ace04c262600345122/misconception.md#transparent-proxying-lacks-context
# https://lists.torproject.org/pipermail/tor-talk/2014-March/032507.html
# https://gitweb.torproject.org/tor.git/tree/src/or/connection_edge.c?id=6285d9bdcf7f210c56abd25f75133e30d05a7473#n1423
# https://github.com/mitmproxy/mitmproxy/blob/v6.0.2/mitmproxy/platform/linux.py#L27
TransPort 0.0.0.0:9040 IsolateClientAddr IsolateClientProtocol