docker – Diff between revs 24 and 25

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 24 Rev 25
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
Line 30... Line 30...
30   30  
31 # install the latest golang 31 # install the latest golang and socks router
32 WORKDIR /tmp 32 WORKDIR /tmp
33 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 && \ 33 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 && \
34 tar -xzf go.tar.gz && \ 34 tar -xzf go.tar.gz && \
35 rm go.tar.gz && \ -  
36 git clone https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake.git && \ -  
37 cd /tmp/snowflake/client && \ -  
38 /tmp/go/bin/go build && \ 35 rm go.tar.gz && \
39 mkdir -p /usr/local/bin && \ -  
40 cp client /usr/local/bin/snowflake-client && \ 36 mkdir -p /usr/local/bin/ && \
41 cd /tmp && \ -  
42 rm -rf /tmp/{go,snowflake} -  
43   -  
44 # compile the latest tor -  
45 WORKDIR /tmp 37 export GOPATH=/tmp/ && \
46 RUN git clone https://gitlab.torproject.org/tpo/core/tor.git && \ -  
47 cd /tmp/tor && \ -  
48 export DISTCC_HOSTS="docker.internal:35001 docker.internal:35002" CC=distcc CXX='distcc g++' && \ -  
49 ./autogen.sh && \ -  
50 ./configure \ -  
51 --enable-lzma \ -  
52 --enable-zstd \ -  
53 --disable-gcc-hardening \ -  
54 --disable-linker-hardening \ -  
55 --disable-manpage \ -  
56 --disable-html-manual \ -  
57 --disable-asciidoc \ -  
58 --disable-unittests && \ -  
59 make -j4 && \ 38 /tmp/go/bin/go install github.com/rus-cert/socks-router@latest && \
60 mkdir -p /usr/local/bin && \ 39 cp /tmp/bin/socks-router /usr/local/bin/ && \
61 cp /tmp/tor/src/app/tor /usr/local/bin/ && \ -  
62 cd /tmp && \ 40 printf "10.40.40.0/24\tsocks5://127.0.0.1:2080\n.example.com\tsocks5://127.0.0.1:2080\n" >/etc/socks-router.routes && \
Line 63... Line 41...
63 rm -rf /tmp/tor 41 rm -rf /tmp/go
64   42  
65 # remove packages that will not be used 43 # remove packages that will not be used
66 WORKDIR / 44 WORKDIR /
Line 72... Line 50...
72 automake \ 50 automake \
73 libtool \ 51 libtool \
74 pkgconf && \ 52 pkgconf && \
75 apt-get autoremove -y 53 apt-get autoremove -y
Line 76... Line -...
76   -  
77 # tor required port -  
78 EXPOSE 9050 9053 -  
79   54  
80 # add filesystem requirements 55 # add filesystem requirements
Line 81... Line -...
81 ADD rootfs / -  
82   -  
83 # set up healthcheck -  
84 HEALTHCHECK --interval=15m --timeout=3s \ -  
85 CMD /usr/local/bin/tor-check-circuit 56 ADD rootfs /
86   57