docker – Diff between revs 47 and 54

Subversion Repositories:
Rev:
Show entire fileIgnore whitespace
Rev 47 Rev 54
Line 1... Line 1...
1 FROM debian:stable-slim 1 FROM debian:bullseye-slim
Line 2... Line 2...
2   2  
3 # update package manager 3 # update package manager
4 RUN apt-get update -y && \ 4 RUN apt-get update -y && \
5 apt-get upgrade -y && \ 5 apt-get upgrade -y && \
Line 26... Line 26...
26 libzstd-dev \ 26 libzstd-dev \
27 liblzma-dev \ 27 liblzma-dev \
28 zlib1g \ 28 zlib1g \
29 zlib1g-dev \ 29 zlib1g-dev \
30 supervisor \ 30 supervisor \
-   31 libssl1.1 \
-   32 libicu67 \
31 socat 33 unzip
Line 32... Line 34...
32   34  
33 # install the latest golang 35 # install the latest golang
34 WORKDIR /tmp 36 WORKDIR /tmp
35 RUN curl -fsSL "https://go.dev/dl/$(curl -s 'https://go.dev/VERSION?m=text' | head -1).linux-amd64.tar.gz" -o go.tar.gz && \ 37 RUN curl -fsSL "https://go.dev/dl/$(curl -s 'https://go.dev/VERSION?m=text' | head -1).linux-amd64.tar.gz" -o go.tar.gz && \
Line 45... Line 47...
45   47  
46 # compile the latest tor 48 # compile the latest tor
47 WORKDIR /tmp 49 WORKDIR /tmp
48 RUN git clone https://gitlab.torproject.org/tpo/core/tor.git && \ 50 RUN git clone https://gitlab.torproject.org/tpo/core/tor.git && \
49 cd /tmp/tor && \ 51 cd /tmp/tor && \
50 export DISTCC_HOSTS="docker1.internal:35001 docker2.internal:35002 docker3.internal:35003 docker4.internal:35004" CC=distcc CXX='distcc g++' && \ 52 export DISTCC_HOSTS="docker1.internal:35001 docker2.internal:35002" CC=distcc CXX='distcc g++' && \
51 ./autogen.sh && \ 53 ./autogen.sh && \
52 ./configure \ 54 ./configure \
53 --enable-lzma \ 55 --enable-lzma \
54 --enable-zstd \ 56 --enable-zstd \
Line 62... Line 64...
62 mkdir -p /usr/local/bin && \ 64 mkdir -p /usr/local/bin && \
63 cp /tmp/tor/src/app/tor /usr/local/bin/ && \ 65 cp /tmp/tor/src/app/tor /usr/local/bin/ && \
64 cd /tmp && \ 66 cd /tmp && \
65 rm -rf /tmp/tor 67 rm -rf /tmp/tor
Line -... Line 68...
-   68  
-   69 # install checkcircuit
-   70 WORKDIR /tmp
-   71 RUN curl -fsSL https://checkcircuit.grimore.org/download/linux-x64/CheckCircuit-1.0.7.1-linux-x64.zip -o checkcircuit.zip && \
-   72 unzip checkcircuit.zip && \
-   73 mv CheckCircuit /usr/local/bin/ && \
-   74 rm -rf checkcircuit.zip CheckCircuit
66   75  
67 # remove packages that will not be used 76 # remove packages that will not be used
68 WORKDIR / 77 WORKDIR /
69 RUN apt-get purge -y \ 78 RUN apt-get purge -y \
70 curl \ 79 curl \