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
Merged

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

Show file tree
Hide file tree
Changes from all commits
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
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ jobs:

docker:
name: docker
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:

- name: "Set up QEMU"
Expand Down Expand Up @@ -239,9 +239,9 @@ jobs:
python3-wheel \
python3-nose \
python3-requests \
postgresql-14-ip4r
postgresql-16-ip4r

sudo -H pip3 install -r nipap/requirements.txt # needed to run test suite
sudo -H pip3 install -I --break-system-packages -r nipap/requirements.txt # needed to run test suite

# Set up PostgreSQL
sudo service postgresql start
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile.nipapd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@
# via a volume.
#

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

Check failure on line 36 in Dockerfile.nipapd

View workflow job for this annotation

GitHub Actions / docker 

DL4000 info: MAINTAINER is deprecated

ENV DEBIAN_FRONTEND=noninteractive

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

Check failure on line 41 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 @@ -65,8 +65,8 @@

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
Expand Down
10 changes: 5 additions & 5 deletions Dockerfile.www
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,16 @@
# database so that you can later login to the web interface.
#

FROM ubuntu:jammy
FROM ubuntu:noble

MAINTAINER Lukas Garberg <[email protected]>

Check failure on line 28 in Dockerfile.www

View workflow job for this annotation

GitHub Actions / docker 

DL4000 info: MAINTAINER is deprecated

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 All @@ -45,7 +45,7 @@
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/*

Expand All @@ -63,9 +63,9 @@
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 . && \

Check failure on line 66 in Dockerfile.www

View workflow job for this annotation

GitHub Actions / docker 

DL3003 info: Use WORKDIR to switch to a directory
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
Expand Down