Skip to content

Build images with optional dependencies #1439

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
garberg merged 1 commit into from
Jul 10, 2025
Merged

Build images with optional dependencies #1439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Dockerfile.nipapd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
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 All @@ -66,8 +66,8 @@

COPY nipap /nipap
WORKDIR /nipap
RUN pip3 --no-input install --break-system-packages --no-cache-dir envtpl==0.7.2 \

Check failure on line 69 in Dockerfile.nipapd

View workflow job for this annotation

GitHub Actions / docker 

DL3013 info: Pin versions in pip. Instead of `pip install <package>` use `pip install <package>==<version>` or `pip install --requirement <requirements file>`
&& pip3 --no-input install -I --break-system-packages --no-cache-dir .
&& pip3 --no-input install -I --break-system-packages --no-cache-dir '.[instrumentation,ldap_auth]'

EXPOSE 1337
ENV LISTEN_ADDRESS=0.0.0.0 LISTEN_PORT=1337 SYSLOG=false DB_PORT=5432 DB_SSLMODE=disable DB_NAME=nipap
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.www
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
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 @@ -64,8 +64,8 @@
COPY nipap /nipap
COPY nipap-www /nipap-www
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/ && \
pip3 --no-input install --break-system-packages --no-cache-dir './nipap/[instrumentation,ldap_auth]' && \
pip3 --no-input install --break-system-packages --no-cache-dir './nipap-www/[instrumentation,ldap_auth]' && \
mkdir -p /etc/nipap/www/ && cp ./nipap-www/nipap-www.wsgi /etc/nipap/www/

EXPOSE 80
Expand Down
4 changes: 4 additions & 0 deletions nipap-www/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ instrumentation = [
"opentelemetry-util-http==0.50b0"
]

ldap_auth = [
"python-ldap==3.4.4"
]

[project.urls]
Homepage = "http://SpriteLink.github.io/NIPAP"

Expand Down