Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion Dockerfile.nipapd
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,13 @@
#

FROM ubuntu:noble
MAINTAINER Kristian Larsson <kristian@spritelink.net>

LABEL org.opencontainers.image.authors="Kristian Larsson <kristian@spritelink.net>, Lukas Garberg <lukas@spritelink.net>"

ENV DEBIAN_FRONTEND=noninteractive

# apt update, upgrade & install packages
RUN apt-get update -qy && apt-get upgrade -qy \

Check failure on line 42 in Dockerfile.nipapd

View workflow job for this annotation

GitHub Actions / docker

DL3008 info: Pin versions in apt get install. Instead of `apt-get install <package>` use `apt-get install <package>=<version>`
&& apt-get install --no-install-recommends -qy build-essential \
libpq-dev \
libldap-dev \
Expand Down
11 changes: 5 additions & 6 deletions Dockerfile.www
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@

FROM ubuntu:noble

MAINTAINER Lukas Garberg <lukas@spritelink.net>
LABEL org.opencontainers.image.authors="Kristian Larsson <kristian@spritelink.net>, Lukas Garberg <lukas@spritelink.net>"

ENV DEBIAN_FRONTEND=noninteractive

ENV NIPAPD_HOST=nipapd NIPAPD_PORT=1337 WWW_USERNAME=guest WWW_PASSWORD=guest

# apt update, upgrade & install packages
RUN apt-get update -qy && apt-get upgrade -qy \

Check failure on line 35 in Dockerfile.www

View workflow job for this annotation

GitHub Actions / docker

DL3008 info: Pin versions in apt get install. Instead of `apt-get install <package>` use `apt-get install <package>=<version>`
&& apt-get install --no-install-recommends -qy apache2 \
build-essential \
libapache2-mod-wsgi-py3 \
Expand Down Expand Up @@ -63,11 +63,10 @@
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" ]
Expand Down