Skip to content
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

Upgrade Docker images and Docker CI env to Ubuntu 24.04 #1416

Merged
merged 2 commits into from
Jan 10, 2025
+11 −11
Merged

Upgrade Docker images and Docker CI env to Ubuntu 24.04 #1416

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ea37c5
build: Base Docker images on Ubuntu 24.04
garberg Jan 10, 2025
ae6744b
ci: Run Docker tests on Ubuntu 24.04
garberg Jan 10, 2025
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
Next Next commit
build: Base Docker images on Ubuntu 24.04 
Update the Dockerfiles to base the images on Ubuntu 24.04. Required a
few other changes to the Dockerfiles. Not pretty... time to reconsider
how the application is run in Docker.
@garberg
garberg committed Jan 10, 2025
commit 7ea37c50eb0e3d1b8d580e3dfbef59502bf1162e
6 changes: 3 additions & 3 deletions Dockerfile.nipapd
View file
Original file line number Diff line number Diff line change
@@ -32,7 +32,7 @@
# via a volume.
#

FROM ubuntu:jammy
FROM ubuntu:noble
MAINTAINER Kristian Larsson <[email protected]>

ENV DEBIAN_FRONTEND=noninteractive
@@ -65,8 +65,8 @@ ENV REQUESTS_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt

COPY nipap /nipap
WORKDIR /nipap
RUN pip3 --no-input install --no-cache-dir envtpl==0.7.2 \
&& pip3 --no-input install --no-cache-dir -r requirements.txt \
RUN pip3 --no-input install --break-system-packages --no-cache-dir envtpl==0.7.2 \
&& pip3 --no-input install -I --break-system-packages --no-cache-dir -r requirements.txt \
&& python3 setup.py install

EXPOSE 1337
10 changes: 5 additions & 5 deletions Dockerfile.www
View file
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@
# database so that you can later login to the web interface.
#

FROM ubuntu:jammy
FROM ubuntu:noble

MAINTAINER Lukas Garberg <[email protected]>

@@ -45,7 +45,7 @@ RUN apt-get update -qy && apt-get upgrade -qy \
python3-all \
python3-pip \
python3-dev \
&& pip3 --no-input install --no-cache-dir envtpl==0.7.2 \
&& pip3 --no-input install --break-system-packages --no-cache-dir envtpl==0.7.2 \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

@@ -63,9 +63,9 @@ ENV REQUESTS_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt
COPY pynipap /pynipap
COPY nipap /nipap
COPY nipap-www /nipap-www
RUN cd /pynipap && python3 setup.py install && \
cd /nipap && pip3 --no-input install --no-cache-dir -r requirements.txt && python3 setup.py install && \
cd /nipap-www && pip3 --no-input install --no-cache-dir -r requirements.txt && python3 setup.py install && \
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 -r requirements.txt && python3 setup.py install && \
cd /nipap-www && pip3 --no-input install --break-system-packages --no-cache-dir -r requirements.txt && python3 setup.py install && \
cd ..

EXPOSE 80