Skip to content

Commit 63f50bf

Browse files
committed
Merge branch 'hotfix/pin-python-docker-image'
2 parents 6430924 + 1f446e7 commit 63f50bf

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

Dockerfile

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.5-slim
1+
FROM python:3.5-slim-jessie
22

33
# ensure unoconv can locate the uno library
44
ENV PYTHONPATH=/usr/lib/python3/dist-packages
@@ -29,9 +29,18 @@ RUN usermod -d /home www-data \
2929
pspp \
3030
# gosu dependencies
3131
curl \
32+
gnupg2 \
3233
# gosu
3334
&& export GOSU_VERSION='1.10' \
34-
&& gpg --keyserver pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
35+
&& for key in \
36+
# GOSU
37+
B42F6819007F00F88E364FD4036A9C25BF357DD4 \
38+
; do \
39+
gpg --keyserver hkp://ipv4.pool.sks-keyservers.net:80 --recv-keys "$key" || \
40+
gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" || \
41+
gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \
42+
gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" \
43+
; done \
3544
&& curl -o /usr/local/bin/gosu -SL "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \
3645
&& curl -o /usr/local/bin/gosu.asc -SL "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \
3746
&& gpg --verify /usr/local/bin/gosu.asc \

0 commit comments

Comments
 (0)