From 6930ee4006cd1956f27bf6819774b085cfc51b2e Mon Sep 17 00:00:00 2001 From: f Date: Thu, 24 Aug 2023 11:11:41 -0300 Subject: [PATCH] fix: tor version --- .woodpecker.yml | 13 ++++++++----- Dockerfile | 3 ++- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 66e7ed9..5543adc 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -9,6 +9,7 @@ pipeline: - "${ALPINE_VERSION}-${SUTTY_TOR_HIDDEN_SERVICE_VERSION}" - "latest" build_args: + - "TOR_VERSION=${TOR_VERSION}" - "SUTTY_TOR_HIDDEN_SERVICE_VERSION=${SUTTY_TOR_HIDDEN_SERVICE_VERSION}" - "ALPINE_VERSION=${ALPINE_VERSION}" - "BASE_IMAGE=gitea.nulo.in/sutty/monit" @@ -18,8 +19,10 @@ pipeline: branch: "antifascista" event: "push" matrix: - ALPINE_VERSION: - - "3.18.3" - - "3.17.5" - SUTTY_TOR_HIDDEN_SERVICE_VERSION: - - "0.1.3" + include: + - ALPINE_VERSION: "3.18.3" + SUTTY_TOR_HIDDEN_SERVICE_VERSION: "0.1.3" + TOR_VERSION: "0.4.8.4" + - ALPINE_VERSION: "3.17.5" + SUTTY_TOR_HIDDEN_SERVICE_VERSION: "0.1.3" + TOR_VERSION: "0.4.7.13" diff --git a/Dockerfile b/Dockerfile index c132f4d..b99f2a4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,13 +2,14 @@ ARG ALPINE_VERSION=3.13.6 ARG BASE_IMAGE=sutty/monit FROM ${BASE_IMAGE}:${ALPINE_VERSION} MAINTAINER "f " +ARG TOR_VERSION=0.4.8.4 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~${SUTTY_TOR_HIDDEN_SERVICE_VERSION} daemonize +RUN apk add --no-cache tor~${TOR_VERSION} 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