-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Bump parent image to debian:bullseye-slim
Upgrade to debian:bullseye-slim (Debian 11) as parent Docker image with Python 3.9.2 and some packages from bullseye-backports. Refresh Python libraries from Debian packages: - python3-cffi: 1.14.3 → 1.14.5 - python3-chardet: 3.0.4 → 4.0.0 - python3-elasticsearch: 7.16.1 → 7.16.2 - python3-gdal: 3.1.3 → 3.2.2 - python3-numpy: 1.19.2 → 1.19.5 - python3-pandas 1.0.5 → 1.1.5 - python3-psycopg2: 2.8.5 → 2.9.3 (from PGDG) - python3-pytz: 2020.1 → 2021.1 - python3-requests: 2.23.0 → 2.25.1 - python3-six: 1.15.0 → 1.16.0 - python3-sqlalchemy: 1.3.19 → 1.3.22 Update README.md and docker-publish.yml accordingly. Fixes #3
- Loading branch information
1 parent
43a8c4c
commit f42d4ff
Showing
4 changed files
with
52 additions
and
49 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,7 @@ | ||
# ================================================================= | ||
# | ||
# Author: Joost van Ulden <[email protected]> | ||
# Authors: Joost van Ulden <[email protected]> | ||
# Anthony Fok <[email protected]> | ||
# | ||
# Copyright (c) 2020-2022 Government of Canada | ||
# | ||
|
@@ -27,39 +28,51 @@ | |
# | ||
# ================================================================= | ||
|
||
FROM debian:sid-20201012-slim | ||
FROM debian:bullseye-slim | ||
|
||
LABEL org.opencontainers.image.authors="Joost van Ulden <[email protected]>, Anthony Fok <[email protected]>" | ||
LABEL org.opencontainers.image.source="https://github.com/opendrr/python-env" | ||
LABEL org.opencontainers.image.version="1.2.4" | ||
LABEL org.opencontainers.image.version="1.3.0" | ||
LABEL org.opencontainers.image.vendor="Government of Canada" | ||
LABEL org.opencontainers.image.licenses="MIT" | ||
|
||
# To use Debian Snapshot, prepend the following commands: | ||
# echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf.d/docker-snapshot.conf | ||
# sed -i '/snapshot.debian.org/s/^# //; /deb.debian.org/s/^/# /' /etc/apt/sources.list | ||
|
||
SHELL ["/bin/bash", "-o", "pipefail", "-c"] | ||
RUN echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf.d/docker-snapshot.conf \ | ||
&& sed -i '/snapshot.debian.org/s/^# //; /deb.debian.org/s/^/# /' /etc/apt/sources.list \ | ||
&& echo 'deb http://deb.debian.org/debian bullseye main' >> /etc/apt/sources.list \ | ||
&& echo 'deb http://deb.debian.org/debian bullseye-backports main' >> /etc/apt/sources.list \ | ||
&& printf 'Package: *\n\ | ||
Pin: release n=bullseye\n\ | ||
Pin-Priority: 50' > /etc/apt/preferences.d/git-in-bullseye \ | ||
&& cat /etc/apt/preferences.d/git-in-bullseye \ | ||
RUN echo 'deb http://deb.debian.org/debian bullseye-backports main' >> /etc/apt/sources.list \ | ||
&& apt-get update \ | ||
&& apt-get install -y --no-install-recommends \ | ||
eatmydata \ | ||
&& eatmydata apt-get install -y --no-install-recommends \ | ||
ca-certificates \ | ||
curl \ | ||
eatmydata \ | ||
gpg \ | ||
&& curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor \ | ||
| tee /etc/apt/trusted.gpg.d/apt.postgresql.org.gpg >/dev/null \ | ||
&& echo 'deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main 14' \ | ||
> /etc/apt/sources.list.d/pgdg.list \ | ||
&& curl -fsSL --create-dirs --output /usr/share/keyrings/githubcli-archive-keyring.gpg \ | ||
https://cli.github.com/packages/githubcli-archive-keyring.gpg \ | ||
&& echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" \ | ||
> /etc/apt/sources.list.d/github-cli.list \ | ||
&& eatmydata apt-get update \ | ||
&& eatmydata apt-get install -t bullseye-backports -y --no-install-recommends \ | ||
7zip \ | ||
dos2unix \ | ||
gdal-bin \ | ||
gpg \ | ||
git \ | ||
git-lfs \ | ||
gh \ | ||
jq \ | ||
moreutils \ | ||
nano \ | ||
neovim \ | ||
postgresql-client \ | ||
procps \ | ||
pv \ | ||
pypy3 \ | ||
python3-elasticsearch \ | ||
python3-numpy \ | ||
python3-pandas \ | ||
python3-psycopg2 \ | ||
|
@@ -69,22 +82,6 @@ Pin-Priority: 50' > /etc/apt/preferences.d/git-in-bullseye \ | |
python3-pip \ | ||
time \ | ||
xz-utils \ | ||
&& eatmydata apt-get install -y --no-install-recommends -t bullseye-backports \ | ||
7zip \ | ||
git \ | ||
git-lfs \ | ||
&& curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor \ | ||
| tee /etc/apt/trusted.gpg.d/apt.postgresql.org.gpg >/dev/null \ | ||
&& echo 'deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main 14' \ | ||
> /etc/apt/sources.list.d/pgdg.list \ | ||
&& curl -fsSL --create-dirs --output /usr/share/keyrings/githubcli-archive-keyring.gpg \ | ||
https://cli.github.com/packages/githubcli-archive-keyring.gpg \ | ||
&& echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" \ | ||
> /etc/apt/sources.list.d/github-cli.list \ | ||
&& eatmydata apt-get update \ | ||
&& eatmydata apt-get install -y --no-install-recommends \ | ||
gh \ | ||
postgresql-client \ | ||
&& rm -rf /var/lib/apt/lists/* | ||
|
||
COPY requirements.txt /tmp | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,18 @@ | ||
certifi==2020.6.20 | ||
cffi==1.14.3 | ||
chardet==3.0.4 | ||
elasticsearch==7.16.1 | ||
GDAL==3.1.3 | ||
cffi==1.14.5 | ||
chardet==4.0.0 | ||
elasticsearch==7.16.2 | ||
GDAL==3.2.2 | ||
idna==2.10 | ||
numpy==1.19.2 | ||
pandas==1.0.5 | ||
numpy==1.19.5 | ||
pandas==1.1.5 | ||
ply==3.11 | ||
psycopg2==2.8.5 | ||
psycopg2==2.9.3 | ||
psycopg2cffi==2.8.1 | ||
pycparser==2.20 | ||
python-dateutil==2.8.1 | ||
pytz==2020.1 | ||
requests==2.23.0 | ||
six==1.15.0 | ||
SQLAlchemy==1.3.19 | ||
pytz==2021.1 | ||
requests==2.25.1 | ||
six==1.16.0 | ||
SQLAlchemy==1.3.22 | ||
urllib3==1.26.12 |