diff --git a/.woodpecker.yml b/.woodpecker.yml index 3c627b7..38e1896 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -6,9 +6,10 @@ pipeline: username: "sutty" repo: "registry.nulo.in/sutty/tor" tags: - - "${ALPINE_VERSION}" + - "${ALPINE_VERSION}-${SUTTY_TOR_HIDDEN_SERVICE_VERSION}" - "latest" build_args: + - "SUTTY_TOR_HIDDEN_SERVICE_VERSION=${SUTTY_TOR_HIDDEN_SERVICE_VERSION}" - "ALPINE_VERSION=${ALPINE_VERSION}" - "BASE_IMAGE=registry.nulo.in/sutty/monit" secrets: @@ -19,3 +20,5 @@ pipeline: matrix: ALPINE_VERSION: - "3.17.1" + SUTTY_TOR_HIDDEN_SERVICE_VERSION: + - "0.1.1" diff --git a/Dockerfile b/Dockerfile index f3a2ee4..7d333f5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,12 +2,13 @@ ARG ALPINE_VERSION=3.13.6 ARG BASE_IMAGE=sutty/monit FROM ${BASE_IMAGE}:${ALPINE_VERSION} MAINTAINER "f " +ARG SUTTY_TOR_HIDDEN_SERVICE_VERSION=0.1.0 ENV SUTTY="sutty.nl" ENV HTTP_BASIC_USER="" ENV HTTP_BASIC_PASSWORD="" -RUN apk add --no-cache tor sutty_tor_hidden_service daemonize +RUN apk add --no-cache tor sutty_tor_hidden_service~${SUTTY_TOR_HIDDEN_SERVICE_VERSION} daemonize COPY ./monit.conf /etc/monit.d/tor.conf COPY ./torrc /etc/tor/torrc COPY ./hidden_servicesd.sh /usr/local/bin/hidden_servicesd