From f23603d79137ace889159f9949dbd75cd6d80ec2 Mon Sep 17 00:00:00 2001 From: samuel-p Date: Wed, 27 Jan 2021 19:45:31 +0100 Subject: [PATCH] major fixes --- Dockerfile | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index c10e70e..966e379 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,17 @@ ARG ARCH -FROM amd64/debian:10.7-slim@sha256:b1af07039fe341833982bae85a2724ac8600ec5c74c37277c7a6ef7cddfb2cd0 AS base-amd64 -FROM arm32v7/debian:10.7-slim@sha256:d31590f680577ffde6bd08943e9590eaabdc04529ea60f4bb6f58cddbc33f628 AS base-arm -FROM arm64v8/debian:10.7-slim@sha256:01b65c2928fed9427e59a679e287a75d98551ea2061cf03c61be0c7e1fc40fef AS base-arm64 +FROM amd64/alpine:3.12.3@sha256:074d3636ebda6dd446d0d00304c4454f468237fdacf08fb0eeac90bdbfa1bac7 AS base-amd64 +FROM arm32v7/alpine:3.12.3@sha256:299294be8699c1b323c137f972fd0aa5eaa4b95489c213091dcf46ef39b6c810 AS base-arm +FROM arm64v8/alpine:3.12.3@sha256:549694ea68340c26d1d85c00039aa11ad835be279bfd475ff4284b705f92c24e AS base-arm64 FROM base-${ARCH} -RUN apt-get update && apt-get upgrade -y && apt-get install -y \ - curl="7.64.0-4+deb10u1" \ - tor="0.3.5.12-1" && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* && \ - useradd --system -M --shell /usr/sbin/nologin tor +RUN adduser -D -h /usr/local/tor -s /bin/false tor tor && \ + apk update && apk add \ + curl="7.69.1-r3" \ + tor="0.4.3.7-r0" && \ + rm -f /var/cache/apk/* && \ + mkdir /web && \ + chown -R tor /web /etc/tor && \ + chmod 700 /web COPY entrypoint.sh / @@ -17,4 +19,4 @@ VOLUME /web USER tor -ENTRYPOINT ["/entrypoint.sh"] +ENTRYPOINT ["sh", "/entrypoint.sh"]