Skip to content

Commit c962a12

Browse files
authored
Merge pull request #1416 from garberg/docker_ubuntu_24.04
Upgrade Docker images and Docker CI env to Ubuntu 24.04
2 parents 89ab1d6 + ae6744b commit c962a12

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

.github/workflows/ci.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ jobs:
170170
171171
docker:
172172
name: docker
173-
runs-on: ubuntu-22.04
173+
runs-on: ubuntu-24.04
174174
steps:
175175

176176
- name: "Set up QEMU"
@@ -239,9 +239,9 @@ jobs:
239239
python3-wheel \
240240
python3-nose \
241241
python3-requests \
242-
postgresql-14-ip4r
242+
postgresql-16-ip4r
243243
244-
sudo -H pip3 install -r nipap/requirements.txt # needed to run test suite
244+
sudo -H pip3 install -I --break-system-packages -r nipap/requirements.txt # needed to run test suite
245245
246246
# Set up PostgreSQL
247247
sudo service postgresql start

Dockerfile.nipapd

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
# via a volume.
3333
#
3434

35-
FROM ubuntu:jammy
35+
FROM ubuntu:noble
3636
MAINTAINER Kristian Larsson <[email protected]>
3737

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

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

7272
EXPOSE 1337

Dockerfile.www

+5-5
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
# database so that you can later login to the web interface.
2424
#
2525

26-
FROM ubuntu:jammy
26+
FROM ubuntu:noble
2727

2828
MAINTAINER Lukas Garberg <[email protected]>
2929

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

@@ -63,9 +63,9 @@ ENV REQUESTS_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt
6363
COPY pynipap /pynipap
6464
COPY nipap /nipap
6565
COPY nipap-www /nipap-www
66-
RUN cd /pynipap && python3 setup.py install && \
67-
cd /nipap && pip3 --no-input install --no-cache-dir -r requirements.txt && python3 setup.py install && \
68-
cd /nipap-www && pip3 --no-input install --no-cache-dir -r requirements.txt && python3 setup.py install && \
66+
RUN cd /pynipap && pip3 --no-input install --break-system-packages --no-cache-dir . && \
67+
cd /nipap && pip3 --no-input install --break-system-packages --no-cache-dir -r requirements.txt && python3 setup.py install && \
68+
cd /nipap-www && pip3 --no-input install --break-system-packages --no-cache-dir -r requirements.txt && python3 setup.py install && \
6969
cd ..
7070

7171
EXPOSE 80

0 commit comments

Comments
 (0)