diff --git a/Dockerfile.common b/Dockerfile.common index 714a6de..fdecb9a 100644 --- a/Dockerfile.common +++ b/Dockerfile.common @@ -3,7 +3,8 @@ ENV DEB_APT_PACKAGES="apt-file dpkg-dev fakeroot build-essential devscripts debh 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" +ENV PIP_PACKAGES="stdeb poetry2setup wheel2deb pylint pytest flake8 flake8-junit-report pylint-junit junitparser flake8-codeclimate" +ENV PIP_NEW_PACKAGES="pylint-gitlab" RUN echo "deb http://debian.zionetrix.net stable main" > /etc/apt/sources.list.d/zionetrix.list && \ apt-get -o Acquire::AllowInsecureRepositories=true -o Acquire::AllowDowngradeToInsecureRepositories=true update && \ diff --git a/Dockerfile.debian10 b/Dockerfile.debian10 index eacebb5..dab537d 100644 --- a/Dockerfile.debian10 +++ b/Dockerfile.debian10 @@ -5,4 +5,4 @@ FROM node:16-buster-slim INCLUDE+ Dockerfile.common RUN python3 -m pip install -U pip && \ - python3 -m pip install $PIP_PACKAGES + python3 -m pip install $PIP_PACKAGES $PIP_NEW_PACKAGES diff --git a/Dockerfile.debian11 b/Dockerfile.debian11 index 624779c..188e505 100644 --- a/Dockerfile.debian11 +++ b/Dockerfile.debian11 @@ -4,4 +4,4 @@ FROM node:16-bullseye-slim INCLUDE+ Dockerfile.common -RUN python3 -m pip install $PIP_PACKAGES +RUN python3 -m pip install $PIP_PACKAGES $PIP_NEW_PACKAGES diff --git a/Dockerfile.debian12 b/Dockerfile.debian12 index e9487f2..8024b09 100644 --- a/Dockerfile.debian12 +++ b/Dockerfile.debian12 @@ -4,4 +4,4 @@ FROM node:16-bookworm-slim INCLUDE+ Dockerfile.common -RUN python3 -m pip install --break-system-packages $PIP_PACKAGES +RUN python3 -m pip install --break-system-packages $PIP_PACKAGES $PIP_NEW_PACKAGES diff --git a/Dockerfile.debian9 b/Dockerfile.debian9 new file mode 100644 index 0000000..67aecec --- /dev/null +++ b/Dockerfile.debian9 @@ -0,0 +1,14 @@ +# syntax = edrevo/dockerfile-plus + +FROM debian:9 + +RUN echo "deb http://archive.debian.org/debian stretch main" > /etc/apt/sources.list && \ + echo "deb http://archive.debian.org/debian-security stretch/updates main" >> /etc/apt/sources.list + +INCLUDE+ Dockerfile.common + +RUN python3 -m pip install -U pip && \ + python3 -m pip install $PIP_PACKAGES +RUN dpkg --purge gitdch && \ + wget -O /usr/bin/gitdch https://gitea.zionetrix.net/bn8/gitdch/raw/tag/python35/gitdch && \ + chmod 755 /usr/bin/gitdch diff --git a/README.md b/README.md index 7c934fd..85edf66 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Image with common dependencies to build Debian package of Python apps/libraries : - common Debian python packages: `python3-all python3-dev python3-pip python3-venv python3-apt python3-appdirs python3-wheel python3-git python3-setuptools` -- common PIP installed python packages: `stdeb poetry2setup wheel2deb pylint pytest flake8 flake8-junit-report pylint-junit junitparser pylint-gitlab flake8-codeclimate` +- common PIP installed python packages: `stdeb poetry2setup wheel2deb pylint pytest flake8 flake8-junit-report pylint-junit junitparser pylint-gitlab flake8-codeclimate`. Note: `pylint-gitlab` not available on Debian 9. - 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 @@ -21,7 +21,7 @@ docker run -it -v "$(pwd)":/src -w /src docker.io/brenard/debian-python-deb export DOCKER_BUILDKIT=1 export COMPOSE_DOCKER_CLI_BUILD=1 -for deb_version in 10 11 12 +for deb_version in 9 10 11 12 do docker build -t docker.io/brenard/debian-python-deb:debian${deb_version} -f Dockerfile.debian${deb_version} . done @@ -31,7 +31,7 @@ docker build -t docker.io/brenard/debian-python-deb:latest -f Dockerfile.debian$ ## Publish ```bash -for deb_version in 10 11 12 +for deb_version in 9 10 11 12 do docker push docker.io/brenard/debian-python-deb:debian${deb_version} done