Skip to content

Commit 69b7309

Browse files
committed
Merge branch 'feature/fix-docker-build' into feature/buff-worms
Closes #405 [ENG-8674]
2 parents 374d392 + 983f5ce commit 69b7309

File tree

1 file changed

+7
-18
lines changed

1 file changed

+7
-18
lines changed

Dockerfile

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,10 @@ FROM python:3.13-slim
33

44
RUN usermod -d /home www-data \
55
&& chown www-data:www-data /home \
6-
# -slim images strip man dirs, but java won't install unless this dir exists.
7-
&& mkdir -p /usr/share/man/man1 \
8-
&& echo "deb http://deb.debian.org/debian bookworm-backports main" > /etc/apt/sources.list.d/backports.list \
9-
&& apt-get update \
10-
# HACK: work around bug in install java (dep of libreoffice)
11-
&& apt-get install -y ca-certificates-java \
6+
&& apt-get update
7+
128
# mfr dependencies
13-
&& apt-get install -y \
9+
RUN apt-get install -y \
1410
git \
1511
make \
1612
gcc \
@@ -32,17 +28,10 @@ RUN usermod -d /home www-data \
3228
# pspp dependencies
3329
pspp \
3430
# grab gosu for easy step-down from root
35-
gosu \
36-
# unoconv dependencies
37-
&& apt-get -t bookworm-backports install -y \
38-
libreoffice-core \
39-
libreoffice-writer \
40-
libreoffice-calc \
41-
libreoffice-impress \
42-
libreoffice-java-common \
43-
&& apt-get clean \
44-
&& apt-get autoremove -y \
45-
&& rm -rf /var/lib/apt/lists/*
31+
gosu
32+
RUN apt-get clean
33+
RUN apt-get autoremove -y
34+
RUN rm -rf /var/lib/apt/lists/*
4635

4736
RUN mkdir -p /code
4837
WORKDIR /code

0 commit comments

Comments
 (0)