File tree Expand file tree Collapse file tree 1 file changed +7
-6
lines changed Expand file tree Collapse file tree 1 file changed +7
-6
lines changed Original file line number Diff line number Diff line change 1
- ARG VERSION=0.4.7 .13
1
+ ARG VERSION=0.4.8 .13
2
2
3
3
ARG USER=toruser
4
4
ARG UID=1000
5
5
6
6
ARG DIR=/data
7
7
8
- FROM debian:11 -slim as preparer-base
8
+ FROM debian:12 -slim as preparer-base
9
9
10
10
RUN apt update
11
11
RUN apt -y install gpg gpg-agent curl
12
12
13
13
# Add tor key
14
- ENV KEYS 514102454D0A87DB0767A1EBBE6A0531C18A9179 B74417EDDF22AC9F9E90F49142E86A2A11F48D36 7A02B3521DC75C542BA015456AFEE6D49E92B601
14
+ # Grabbed from https://gitlab.torproject.org/tpo/core/tor/-/blob/main/README.md#keys-that-can-sign-a-release
15
+ ENV KEYS 514102454D0A87DB0767A1EBBE6A0531C18A9179 B74417EDDF22AC9F9E90F49142E86A2A11F48D36 2133BC600AB133E1D826D173FE43009C4607B1FB
15
16
16
17
# RUN curl -s https://openpgpkey.torproject.org/.well-known/openpgpkey/torproject.org/hu/kounek7zrdx745qydx6p59t9mqjpuhdf |gpg --import -
17
- RUN gpg --keyserver keyserver.ubuntu.com --recv-keys $KEYS
18
+ RUN gpg --keyserver keys.openpgp.org --recv-keys $KEYS
18
19
19
20
RUN gpg --list-keys | tail -n +3 | tee /tmp/keys.txt && \
20
21
gpg --list-keys $KEYS | diff - /tmp/keys.txt
@@ -35,7 +36,7 @@ RUN tar -xzf "/tor-$VERSION.tar.gz" && \
35
36
36
37
FROM preparer-release AS preparer
37
38
38
- FROM debian:11 -slim as builder
39
+ FROM debian:12 -slim as builder
39
40
40
41
ARG VERSION
41
42
@@ -55,7 +56,7 @@ RUN ls -la /etc/tor
55
56
RUN ls -la /var/lib
56
57
RUN ls -la /var/lib/tor
57
58
58
- FROM debian:11 -slim as final
59
+ FROM debian:12 -slim as final
59
60
60
61
ARG VERSION
61
62
ARG USER
You can’t perform that action at this time.
0 commit comments