fix: tor version

This commit is contained in:
f 2023-08-24 11:11:41 -03:00
parent 8864585f04
commit 6930ee4006
2 changed files with 10 additions and 6 deletions

View file

@ -9,6 +9,7 @@ pipeline:
- "${ALPINE_VERSION}-${SUTTY_TOR_HIDDEN_SERVICE_VERSION}" - "${ALPINE_VERSION}-${SUTTY_TOR_HIDDEN_SERVICE_VERSION}"
- "latest" - "latest"
build_args: build_args:
- "TOR_VERSION=${TOR_VERSION}"
- "SUTTY_TOR_HIDDEN_SERVICE_VERSION=${SUTTY_TOR_HIDDEN_SERVICE_VERSION}" - "SUTTY_TOR_HIDDEN_SERVICE_VERSION=${SUTTY_TOR_HIDDEN_SERVICE_VERSION}"
- "ALPINE_VERSION=${ALPINE_VERSION}" - "ALPINE_VERSION=${ALPINE_VERSION}"
- "BASE_IMAGE=gitea.nulo.in/sutty/monit" - "BASE_IMAGE=gitea.nulo.in/sutty/monit"
@ -18,8 +19,10 @@ pipeline:
branch: "antifascista" branch: "antifascista"
event: "push" event: "push"
matrix: matrix:
ALPINE_VERSION: include:
- "3.18.3" - ALPINE_VERSION: "3.18.3"
- "3.17.5" SUTTY_TOR_HIDDEN_SERVICE_VERSION: "0.1.3"
SUTTY_TOR_HIDDEN_SERVICE_VERSION: TOR_VERSION: "0.4.8.4"
- "0.1.3" - ALPINE_VERSION: "3.17.5"
SUTTY_TOR_HIDDEN_SERVICE_VERSION: "0.1.3"
TOR_VERSION: "0.4.7.13"

View file

@ -2,13 +2,14 @@ ARG ALPINE_VERSION=3.13.6
ARG BASE_IMAGE=sutty/monit ARG BASE_IMAGE=sutty/monit
FROM ${BASE_IMAGE}:${ALPINE_VERSION} FROM ${BASE_IMAGE}:${ALPINE_VERSION}
MAINTAINER "f <f@sutty.nl>" MAINTAINER "f <f@sutty.nl>"
ARG TOR_VERSION=0.4.8.4
ARG SUTTY_TOR_HIDDEN_SERVICE_VERSION=0.1.0 ARG SUTTY_TOR_HIDDEN_SERVICE_VERSION=0.1.0
ENV SUTTY="sutty.nl" ENV SUTTY="sutty.nl"
ENV HTTP_BASIC_USER="" ENV HTTP_BASIC_USER=""
ENV HTTP_BASIC_PASSWORD="" 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 ./monit.conf /etc/monit.d/tor.conf
COPY ./torrc /etc/tor/torrc COPY ./torrc /etc/tor/torrc
COPY ./hidden_servicesd.sh /usr/local/bin/hidden_servicesd COPY ./hidden_servicesd.sh /usr/local/bin/hidden_servicesd