Skip to content

Commit

Permalink
Revert "bump Tor"
Browse files Browse the repository at this point in the history
This reverts commit 257c5ab.
  • Loading branch information
NicolasDorier committed Dec 13, 2023
1 parent 257c5ab commit 6340c05
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 15 deletions.
10 changes: 5 additions & 5 deletions Tor/0.4.7.10/linuxamd64.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Thanks to https://hub.docker.com/r/chriswayg/tor-alpine/dockerfile (Christian [email protected])
# Dockerfile for Tor Relay Server with obfs4proxy (Multi-Stage build)

FROM alpine:3.19 AS tor-build
ENV TOR_VERSION=0.4.8.10
ENV TOR_HASH=e628b4fab70edb4727715b23cf2931375a9f7685ac08f2c59ea498a178463a86
FROM alpine:3.13 AS tor-build
ENV TOR_VERSION=0.4.7.10
ENV TOR_HASH=647e56dfa59ea36dab052027fcfc7663905c826c03509363c456900ecd435a5b
# Install prerequisites
RUN apk --no-cache add --update \
build-base \
Expand Down Expand Up @@ -41,9 +41,9 @@ WORKDIR /tmp/bin
RUN wget -qO gosu "https://github.com/tianon/gosu/releases/download/1.13/gosu-amd64" \
&& echo "6f333f520d31e212634c0777213a5d4f8f26bba1ab4b0edbbdf3c8bff8896ecf gosu" | sha256sum -c -

FROM alpine:3.19
FROM alpine:3.13

ENV TOR_VERSION=0.4.8.10
ENV TOR_VERSION=0.4.7.8

# Installing dependencies of Tor
RUN apk --no-cache add --update \
Expand Down
10 changes: 5 additions & 5 deletions Tor/0.4.7.10/linuxarm32v7.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:bookworm-slim as download
FROM debian:buster-slim as download

RUN set -ex \
&& apt-get update \
Expand All @@ -9,10 +9,10 @@ WORKDIR /tmp/bin
RUN wget -qO gosu "https://github.com/tianon/gosu/releases/download/1.13/gosu-armhf" \
&& echo "33e421b84b3f746e7353ac2e7c9f199c5beef5a3b2b7a013b591a9af25d84919 gosu" | sha256sum -c -

FROM debian:bookworm-slim as tor-build
FROM debian:buster-slim as tor-build

ENV TOR_VERSION=0.4.8.10
ENV TOR_HASH=e628b4fab70edb4727715b23cf2931375a9f7685ac08f2c59ea498a178463a86
ENV TOR_VERSION=0.4.7.10
ENV TOR_HASH=647e56dfa59ea36dab052027fcfc7663905c826c03509363c456900ecd435a5b

RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates perl autoconf automake build-essential git libtool python python3 wget gnupg dirmngr git \
libc6-armhf-cross gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf
Expand Down Expand Up @@ -101,7 +101,7 @@ RUN apt-get install -y pkg-config && wget -q https://dist.torproject.org/tor-${T
&& make install && cd .. && rm $TAR_NAME && rm -rf $FOLDER_NAME \
&& ${STRIP} /usr/arm-linux-gnueabihf/bin/tor-* && ${STRIP} /usr/arm-linux-gnueabihf/bin/tor

FROM arm32v7/debian:bookworm-slim
FROM arm32v7/debian:buster-slim
ENV target_host=arm-linux-gnueabihf
ENV QEMU_LD_PREFIX=/usr/${target_host}
COPY --from=download /usr/bin/qemu-arm-static /usr/bin/qemu-arm-static
Expand Down
10 changes: 5 additions & 5 deletions Tor/0.4.7.10/linuxarm64v8.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:bookworm-slim as download
FROM debian:buster-slim as download

RUN set -ex \
&& apt-get update \
Expand All @@ -9,10 +9,10 @@ WORKDIR /tmp/bin
RUN wget -qO gosu "https://github.com/tianon/gosu/releases/download/1.13/gosu-arm64" \
&& echo "578b2c70936cae372f6826585f82e76de5858342dd179605a8cb58d58828a079 gosu" | sha256sum -c -

FROM debian:bookworm-slim as tor-build
FROM debian:buster-slim as tor-build

ENV TOR_VERSION=0.4.8.10
ENV TOR_HASH=e628b4fab70edb4727715b23cf2931375a9f7685ac08f2c59ea498a178463a86
ENV TOR_VERSION=0.4.7.10
ENV TOR_HASH=647e56dfa59ea36dab052027fcfc7663905c826c03509363c456900ecd435a5b

RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates perl autoconf automake build-essential git libtool python python3 wget gnupg dirmngr git \
libc6-arm64-cross gcc-aarch64-linux-gnu g++-aarch64-linux-gnu
Expand Down Expand Up @@ -101,7 +101,7 @@ RUN apt-get install -y pkg-config && wget -q https://dist.torproject.org/tor-${T
&& make install && cd .. && rm $TAR_NAME && rm -rf $FOLDER_NAME \
&& ${STRIP} /usr/aarch64-linux-gnu/bin/tor-* && ${STRIP} /usr/aarch64-linux-gnu/bin/tor

FROM arm64v8/debian:bookworm-slim
FROM arm64v8/debian:buster-slim
ENV target_host=aarch64-linux-gnu
ENV QEMU_LD_PREFIX=/usr/${target_host}
COPY --from=download /usr/bin/qemu-aarch64-static /usr/bin/qemu-aarch64-static
Expand Down

0 comments on commit 6340c05

Please sign in to comment.