From 315924a4dbcf509d55bec336adf3322b1f55af72 Mon Sep 17 00:00:00 2001 From: Benjamin Renard Date: Thu, 29 Feb 2024 12:52:25 +0100 Subject: [PATCH] Fix debian10 image and add equivs, wget and ca-certificates deb packages --- Dockerfile.common | 4 ++-- Dockerfile.debian10 | 9 ++++++++- README.md | 7 ++++--- 3 files changed, 14 insertions(+), 6 deletions(-) mode change 120000 => 100644 Dockerfile.debian10 diff --git a/Dockerfile.common b/Dockerfile.common index 773b8be..21e6918 100644 --- a/Dockerfile.common +++ b/Dockerfile.common @@ -1,6 +1,6 @@ ENV PYTHON_APT_PACKAGES="python3-all python3-dev python3-pip python3-venv python3-apt python3-appdirs python3-wheel python3-git" -ENV DEB_APT_PACKAGES="apt-file dpkg-dev fakeroot build-essential devscripts debhelper dh-python" -ENV TOOLS_APT_PACKAGES="sed lsb-release gnupg2 curl jq git rsync gitdch" +ENV DEB_APT_PACKAGES="apt-file dpkg-dev fakeroot build-essential devscripts debhelper dh-python equivs" +ENV TOOLS_APT_PACKAGES="sed lsb-release gnupg2 curl jq git rsync gitdch wget ca-certificates" ENV APT_PACKAGES="$PYTHON_APT_PACKAGES $DEB_APT_PACKAGES $TOOLS_APT_PACKAGES" ENV PIP_PACKAGES="stdeb poetry2setup wheel2deb pylint pytest flake8 flake8-junit-report pylint-junit junitparser pylint-gitlab flake8-codeclimate" diff --git a/Dockerfile.debian10 b/Dockerfile.debian10 deleted file mode 120000 index 7d379b2..0000000 --- a/Dockerfile.debian10 +++ /dev/null @@ -1 +0,0 @@ -Dockerfile.debian11 \ No newline at end of file diff --git a/Dockerfile.debian10 b/Dockerfile.debian10 new file mode 100644 index 0000000..c567949 --- /dev/null +++ b/Dockerfile.debian10 @@ -0,0 +1,8 @@ +# syntax = edrevo/dockerfile-plus + +FROM debian:10 + +INCLUDE+ Dockerfile.common + +RUN python3 -m pip install -U pip && \ + python3 -m pip install $PIP_PACKAGES diff --git a/README.md b/README.md index d22eefb..84064b1 100644 --- a/README.md +++ b/README.md @@ -2,9 +2,10 @@ Image with common dependencies to build Debian package of Python apps/libraries : -- common python packages: `python3-all python3-dev python3-pip python3-venv python3-apt python3-appdirs python3-wheel python3-git` -- common Debian packages building tools: `apt-file dpkg-dev fakeroot build-essential devscripts debhelper dh-python` -- common tools: `sed lsb-release gnupg2 curl jq git rsync` +- common Debian python packages: `python3-all python3-dev python3-pip python3-venv python3-apt python3-appdirs python3-wheel python3-git` +- common PIP installed python packages: `stdeb poetry2setup wheel2deb pylint pytest flake8 flake8-junit-report pylint-junit junitparser pylint-gitlab flake8-codeclimate` +- common Debian packages building tools: `apt-file dpkg-dev fakeroot build-essential devscripts debhelper dh-python equivs` +- common tools: `sed lsb-release gnupg2 curl jq git rsync wget ca-certificates` - [gitdch](https://gitea.zionetrix.net/bn8/gitdch) tool To use it: