jake/docker-tor
1
Fork 0
mirror of https://github.com/jakejarvis/docker-tor.git synced 2025-04-28 08:00:28 -04:00
Code Issues Releases Activity

fixes

Browse Source
This commit is contained in:
Jake Jarvis 2022-12-29 11:54:34 -05:00
parent aa5b5c006a
commit f2e9dec181
Signed by: jake
GPG Key ID: 2B0C9CF251E69A39
2 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.github/workflows/build-and-push.yml vendored
View File

@ -13,7 +13,7 @@ on:
permissions: permissions:
contents: read contents: read
# packages: write packages: write
jobs: jobs:
build-image: build-image:
@ -27,18 +27,18 @@ jobs:
with: with:
username: ${{ secrets.DOCKERHUB_USERNAME }} username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }} password: ${{ secrets.DOCKERHUB_TOKEN }}
# - uses: docker/login-action@v2 - uses: docker/login-action@v2
# if: github.event_name != 'pull_request' if: github.event_name != 'pull_request'
# with: with:
# registry: ghcr.io registry: ghcr.io
# username: ${{ github.actor }} username: ${{ github.actor }}
# password: ${{ secrets.GITHUB_TOKEN }} password: ${{ secrets.GITHUB_TOKEN }}
- uses: docker/metadata-action@v4 - uses: docker/metadata-action@v4
id: meta id: meta
with: with:
images: | images: |
jakejarvis/tor jakejarvis/tor
# ghcr.io/jakejarvis/tor ghcr.io/jakejarvis/tor
flavor: | flavor: |
latest=auto latest=auto
tags: | tags: |

20
Dockerfile
View File

@ -1,5 +1,8 @@
FROM ubuntu:22.04 FROM ubuntu:22.04
LABEL maintainer "Jake Jarvis <jake@jarv.is>" LABEL maintainer "Jake Jarvis <jake@jarv.is>" \
repository="https://github.com/jakejarvis/tor-docker" \
# https://docs.github.com/en/free-pro-team@latest/packages/managing-container-images-with-github-container-registry/connecting-a-repository-to-a-container-image#connecting-a-repository-to-a-container-image-on-the-command-line
org.opencontainers.image.source="https://github.com/jakejarvis/tor-docker"
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive
@ -7,34 +10,37 @@ RUN apt-get update \
&& apt-get install --no-install-recommends --no-install-suggests -y \ && apt-get install --no-install-recommends --no-install-suggests -y \
ca-certificates \ ca-certificates \
apt-transport-https \ apt-transport-https \
apt-utils \
lsb-release \ lsb-release \
gnupg \
curl \ curl \
gnupg \
# Add torproject.org repository for stable Tor # Add torproject.org repository for stable Tor
&& curl -fsSL https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.asc | gpg --dearmor -o /usr/share/keyrings/tor-archive-keyring.gpg \ && curl -fsSL https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.asc | gpg --dearmor -o /usr/share/keyrings/tor-archive-keyring.gpg \
&& echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/tor-archive-keyring.gpg] https://deb.torproject.org/torproject.org $(lsb_release -cs) main \ && echo "deb [signed-by=/usr/share/keyrings/tor-archive-keyring.gpg] https://deb.torproject.org/torproject.org $(lsb_release -cs) main \
deb-src [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/tor-archive-keyring.gpg] https://deb.torproject.org/torproject.org $(lsb_release -cs) main" | tee /etc/apt/sources.list.d/tor.list >/dev/null \ deb-src [signed-by=/usr/share/keyrings/tor-archive-keyring.gpg] https://deb.torproject.org/torproject.org $(lsb_release -cs) main" | tee /etc/apt/sources.list.d/tor.list >/dev/null \
# Install Tor with GeoIP # Install Tor with GeoIP
&& apt-get update \ && apt-get update \
&& apt-get install --no-install-recommends --no-install-suggests -y \ && apt-get install --no-install-recommends --no-install-suggests -y \
tor \ tor \
tor-geoipdb \ tor-geoipdb \
deb.torproject.org-keyring \
obfs4proxy \ obfs4proxy \
iputils-ping \ iputils-ping \
# Tidy up # Tidy up
&& apt-get purge --auto-remove -y \ && apt-get purge --auto-remove -y \
apt-transport-https \ apt-transport-https \
apt-utils \
lsb-release \ lsb-release \
gnupg \
curl \ curl \
gnupg \
&& apt-get clean \ && apt-get clean \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
# Copy entrypoint script # Copy entrypoint script
COPY ./entrypoint.sh /usr/local/bin/docker-entrypoint COPY ./entrypoint.sh /usr/local/bin/docker-entrypoint
# Tor data should be persisted on the host
VOLUME /var/lib/tor
# Run as non-root user
USER debian-tor USER debian-tor
ENTRYPOINT ["docker-entrypoint"] ENTRYPOINT ["docker-entrypoint"]