Skip to content

Commit f3e4eae

Browse files
committed
Replace p7zip 16.02 with 7zip 22.01 from bullseye-backports
Also: - Install git and git-lfs from bullseye-backports for newer versions - Install neovim for a Vi editor for convenience - Install procps for tools like ps to help debugging
1 parent 788e1eb commit f3e4eae

File tree

1 file changed

+15
-10
lines changed

1 file changed

+15
-10
lines changed

Dockerfile

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,28 +31,32 @@ FROM debian:sid-20201012-slim
3131

3232
LABEL org.opencontainers.image.authors="Joost van Ulden <joost.vanulden@canada.ca>, Anthony Fok <anthony.fok@canada.ca>"
3333
LABEL org.opencontainers.image.source="https://github.com/opendrr/python-env"
34-
LABEL org.opencontainers.image.version="1.2.2"
34+
LABEL org.opencontainers.image.version="1.2.3"
3535
LABEL org.opencontainers.image.vendor="Government of Canada"
3636
LABEL org.opencontainers.image.licenses="MIT"
3737

3838
RUN echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf.d/docker-snapshot.conf \
3939
&& sed -i '/snapshot.debian.org/s/^# //; /deb.debian.org/s/^/# /' /etc/apt/sources.list \
40-
&& echo "deb http://deb.debian.org/debian bullseye main" >> /etc/apt/sources.list \
41-
&& echo 'Package: *\n\
40+
&& echo 'deb http://deb.debian.org/debian bullseye main' >> /etc/apt/sources.list \
41+
&& echo 'deb http://deb.debian.org/debian bullseye-backports main' >> /etc/apt/sources.list \
42+
&& printf 'Package: *\n\
4243
Pin: release n=bullseye\n\
4344
Pin-Priority: 50' > /etc/apt/preferences.d/git-in-bullseye \
4445
&& cat /etc/apt/preferences.d/git-in-bullseye \
4546
&& apt-get update \
4647
&& apt-get install -y --no-install-recommends \
48+
eatmydata \
49+
&& eatmydata apt-get install -y --no-install-recommends \
50+
ca-certificates \
4751
curl \
4852
dos2unix \
49-
eatmydata \
5053
gdal-bin \
5154
jq \
5255
moreutils \
5356
nano \
54-
p7zip \
57+
neovim \
5558
postgresql-client \
59+
procps \
5660
pv \
5761
pypy3 \
5862
python3-numpy \
@@ -64,15 +68,16 @@ Pin-Priority: 50' > /etc/apt/preferences.d/git-in-bullseye \
6468
python3-pip \
6569
time \
6670
xz-utils \
67-
&& apt-get install -y --no-install-recommends -t bullseye \
71+
&& eatmydata apt-get install -y --no-install-recommends -t bullseye-backports \
72+
7zip \
6873
git \
69-
git-lfs
70-
71-
RUN curl -fsSL --create-dirs --output /usr/share/keyrings/githubcli-archive-keyring.gpg \
74+
git-lfs \
75+
&& curl -fsSL --create-dirs --output /usr/share/keyrings/githubcli-archive-keyring.gpg \
7276
https://cli.github.com/packages/githubcli-archive-keyring.gpg \
7377
&& echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" \
7478
> /etc/apt/sources.list.d/github-cli.list \
75-
&& apt-get update && apt-get install -y --no-install-recommends gh \
79+
&& eatmydata apt-get update \
80+
&& eatmydata apt-get install -y --no-install-recommends gh \
7681
&& rm -rf /var/lib/apt/lists/*
7782

7883
COPY requirements.txt /tmp

0 commit comments

Comments
 (0)