.forgejo/workflows/release.yaml

@@ -32,7 +32,6 @@ jobs:
     runs-on: docker
     container:
       image: docker.io/brenard/debian-python-deb:latest
-    needs: build
     steps:
       - name: Download Debian & Python packages files
         uses: actions/download-artifact@v3
@@ -68,7 +67,6 @@ jobs:
     runs-on: docker
     container:
       image: docker.io/brenard/aptly-publish:latest
-    needs: build
     steps:
       - name: "Download Debian package files"
         uses: actions/download-artifact@v3

.forgejo/workflows/tests.yaml

@@ -5,10 +5,26 @@ jobs:
   tests:
     runs-on: docker
     container:
-      image: docker.io/brenard/mylib:dev-master
-      options: "--workdir /src"
+      image: docker.io/brenard/python-pre-commit:latest
     steps:
       - name: Check out repository code
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Install dependencies
+        env:
+          DEBIAN_FRONTEND: noninteractive
+        run: |
+          apt-get -qq update
+          apt-get -qq -y install --no-install-recommends \
+            build-essential \
+            python3 \
+            python3-dev \
+            libldap2-dev \
+            libsasl2-dev \
+            pkg-config \
+            libsystemd-dev \
+            libpq-dev \
+            libmariadb-dev
       - name: Run tests.sh
-        run: ./tests.sh --no-venv
+        run: ./tests.sh

build.sh

@@ -114,7 +114,6 @@ $GITDCH \
 	--release-notes ../../dist/release_notes.md \
 	--path ../../ \
 	--exclude "^CI: " \
-	--exclude "^Docker: " \
 	--exclude "^pre-commit: " \
 	--exclude "\.?woodpecker(\.yml)?" \
 	--exclude "build(\.sh)?" \

docker/dev-master/Dockerfile

@@ -1,6 +1,5 @@
 FROM brenard/mylib:latest
-RUN apt-get remove -y python3-mylib && \
-    git clone https://gitea.zionetrix.net/bn8/python-mylib.git /src && \
-    pip install --break-system-packages /src[dev] && \
-    cd /src && \
-    pre-commit run --all-files
+RUN apt-get remove -y python3-mylib
+RUN python3 -m pip install -U git+https://gitea.zionetrix.net/bn8/python-mylib.git
+RUN git clone https://gitea.zionetrix.net/bn8/python-mylib.git /usr/local/src/python-mylib && pip install /usr/local/src/python-mylib[dev]
+RUN cd /usr/local/src/python-mylib && pre-commit run --all-files

docker/latest/Dockerfile

@@ -1,26 +1,5 @@
-FROM node:16-bookworm-slim
-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 && \
-    apt-get \
-        -o APT::Get::AllowUnauthenticated=true \
-        install --yes zionetrix-archive-keyring && \
-    apt-get update && \
-    apt-get upgrade -y && \
-    apt-get install -y \
-        python3-all python3-dev python3-pip python3-venv python3-mylib build-essential git \
-        libldap2-dev libsasl2-dev \
-        pkg-config libsystemd-dev \
-        libpq-dev libmariadb-dev \
-        wget unzip && \
-     apt-get clean && \
-     rm -fr rm -rf /var/lib/apt/lists/*
-RUN python3 -m pip install --break-system-packages pylint pytest flake8 flake8-junit-report pylint-junit junitparser pre-commit
-RUN wget --no-verbose \
-    -O /opt/instantclient-basic-linux.x64-21.4.0.0.0dbru.zip \
-    https://download.oracle.com/otn_software/linux/instantclient/214000/instantclient-basic-linux.x64-21.4.0.0.0dbru.zip && \
-    unzip -qq -d /opt /opt/instantclient-basic-linux.x64-21.4.0.0.0dbru.zip && \
-    echo /opt/instantclient_* > /etc/ld.so.conf.d/oracle-instantclient.conf && \
-    ldconfig
+FROM debian:latest
+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 && apt-get -o APT::Get::AllowUnauthenticated=true install --yes zionetrix-archive-keyring && apt-get clean && rm -fr rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get upgrade -y && apt-get install -y python3-all python3-dev python3-pip python3-venv python3-mylib build-essential git libldap2-dev libsasl2-dev pkg-config libsystemd-dev libpq-dev libmariadb-dev wget unzip && apt-get clean && rm -fr rm -rf /var/lib/apt/lists/*
+RUN python3 -m pip install pylint pytest flake8 flake8-junit-report pylint-junit junitparser pre-commit
+RUN wget --no-verbose -O /opt/instantclient-basic-linux.x64-21.4.0.0.0dbru.zip https://download.oracle.com/otn_software/linux/instantclient/214000/instantclient-basic-linux.x64-21.4.0.0.0dbru.zip && unzip -qq -d /opt /opt/instantclient-basic-linux.x64-21.4.0.0.0dbru.zip && echo /opt/instantclient_* > /etc/ld.so.conf.d/oracle-instantclient.conf && ldconfig