From 71aa29ed935bbd01f488ef2e877018a277269bda Mon Sep 17 00:00:00 2001 From: Lukas Garberg Date: Thu, 10 Jul 2025 12:10:35 +0200 Subject: [PATCH 1/2] packaging: Handle some Hadolint errors * Set min severity from info to warning * Set severity of non-pinned pip3 install-command to info * Replace deprecated MAINTAINER with LABEL --- .github/workflows/ci.yml | 8 ++++++-- Dockerfile.nipapd | 3 ++- Dockerfile.www | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 64161c40a..d1662729d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -189,12 +189,16 @@ jobs: - name: "Hadolint nipapd" uses: hadolint/hadolint-action@v3.1.0 with: - Dockerfile: Dockerfile.nipapd + dockerfile: Dockerfile.nipapd + failure-threshold: warning + override-info: DL3013 - name: "Hadolint WWW" uses: hadolint/hadolint-action@v3.1.0 with: - Dockerfile: Dockerfile.www + dockerfile: Dockerfile.www + failure-threshold: warning + override-info: DL3013 - name: "nipapd metadata" id: nipapd_meta diff --git a/Dockerfile.nipapd b/Dockerfile.nipapd index a47f3318e..30f985824 100644 --- a/Dockerfile.nipapd +++ b/Dockerfile.nipapd @@ -33,7 +33,8 @@ # FROM ubuntu:noble -MAINTAINER Kristian Larsson + +LABEL org.opencontainers.image.authors="Kristian Larsson , Lukas Garberg " ENV DEBIAN_FRONTEND=noninteractive diff --git a/Dockerfile.www b/Dockerfile.www index aca28e7d6..44ba05f1a 100644 --- a/Dockerfile.www +++ b/Dockerfile.www @@ -25,7 +25,7 @@ FROM ubuntu:noble -MAINTAINER Lukas Garberg +LABEL org.opencontainers.image.authors="Kristian Larsson , Lukas Garberg " ENV DEBIAN_FRONTEND=noninteractive From 362cbbe89282cb7fdaf2818307bbe76bc99212a0 Mon Sep 17 00:00:00 2001 From: Lukas Garberg Date: Thu, 10 Jul 2025 12:32:32 +0200 Subject: [PATCH 2/2] www: Avoid cd in RUN command --- Dockerfile.www | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Dockerfile.www b/Dockerfile.www index 44ba05f1a..a9e2674fb 100644 --- a/Dockerfile.www +++ b/Dockerfile.www @@ -63,11 +63,10 @@ ENV REQUESTS_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt COPY pynipap /pynipap COPY nipap /nipap COPY nipap-www /nipap-www -RUN cd /pynipap && pip3 --no-input install --break-system-packages --no-cache-dir . && \ - cd /nipap && pip3 --no-input install --break-system-packages --no-cache-dir . && \ - cd /nipap-www && pip3 --no-input install --break-system-packages --no-cache-dir . && \ - mkdir -p /etc/nipap/www/ && cp nipap-www.wsgi /etc/nipap/www/ && \ - cd .. +RUN pip3 --no-input install --break-system-packages --no-cache-dir ./pynipap/ && \ + pip3 --no-input install --break-system-packages --no-cache-dir ./nipap/ && \ + pip3 --no-input install --break-system-packages --no-cache-dir ./nipap-www/ && \ + mkdir -p /etc/nipap/www/ && cp ./nipap-www/nipap-www.wsgi /etc/nipap/www/ EXPOSE 80 VOLUME [ "/var/log/apache2" ]