Support Ubuntu 24.04 (#613)

* build noble

* attach noble

* change to noble

* change to noble

* fix docker image

.github/workflows/test.yml

@@ -70,6 +70,8 @@ jobs:
             python-version: '3.8'  # default python version in 20.04
           - os: 'ubuntu-22.04'
             python-version: '3.10'  # default python version in 22.04
+          - os: 'ubuntu-24.04'
+            python-version: '3.12'  # default python version in 22.04
 
     steps:
     - uses: actions/checkout@v4
@@ -124,13 +126,14 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
         matrix:
-            os: ['focal', 'jammy']
+            os: ['focal', 'jammy', 'noble']
             include:
                 - os: focal
                   version: '20.04'
                 - os: jammy
                   version: '22.04'
-
+                - os: noble
+                  version: '24.04'
     env:
       DISTRO: 'ubuntu:${{ matrix.os }}'
       CODE: ${{ matrix.version }}
@@ -207,7 +210,7 @@ jobs:
     needs: [ build_deb ]
     strategy:
         matrix:
-            version: ['20.04', '22.04']
+            version: ['20.04', '22.04', '24.04']
 
     steps:
       - uses: actions/download-artifact@v4
@@ -309,6 +312,11 @@ jobs:
         with:
           name: debian-22.04
 
+      - name: Download 24.04 debian artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: debian-24.04
+
       - name: Attach debian packages as release binaries
         uses: skx/github-action-publish-binaries@master
         env:

CHANGES.md

@@ -1,6 +1,13 @@
 CHANGELOG
 =========
 
+2.2.5+dev    (XXXX-XX-XX)
+-------------------------
+
+* Add Ubuntu noble 24.04 support
+* Change base docker image to Noble
+
+
 2.2.5        (2024-10-07)
 -------------------------
 

Dockerfile

@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=jammy
+ARG BASE_IMAGE=noble
 
 FROM ubuntu:${BASE_IMAGE} AS base
 
@@ -17,8 +17,8 @@ RUN mkdir -p /app/static /opt
 RUN chown django:django /app /opt
 
 RUN apt-get -qq update && apt-get install -qq -y \
-    gconf-service \
-    libasound2 \
+    libappindicator3-1 \
+    libasound2-dev \
     libatk1.0-0 \
     libatk-bridge2.0-0 \
     libc6 \
@@ -28,7 +28,6 @@ RUN apt-get -qq update && apt-get install -qq -y \
     libexpat1 \
     libfontconfig1 \
     libgcc1 \
-    libgconf-2-4 \
     libgdk-pixbuf2.0-0 \
     libglib2.0-0 \
     libgtk-3-0 \
@@ -51,7 +50,6 @@ RUN apt-get -qq update && apt-get install -qq -y \
     libxtst6 \
     ca-certificates \
     fonts-liberation \
-    libappindicator1 \
     libnss3 \
     lsb-release \
     xdg-utils \
@@ -74,12 +72,9 @@ ARG NODE_ENV=production
 
 RUN apt-get -qq update && apt-get install -qq -y \
     build-essential \
-    python3-dev python3-venv python3-distutils libmagic1 && \
+    python3-pip python3-dev python3-venv libmagic1 && \
     apt-get clean all && rm -rf /var/apt/lists/* && rm -rf /var/cache/apt/*
 
-# install pip & requirements
-RUN wget https://bootstrap.pypa.io/get-pip.py && python3 get-pip.py && rm get-pip.py
-
 USER django
 RUN python3 -m venv /opt/venv
 RUN /opt/venv/bin/pip3 install --no-cache-dir pip setuptools wheel -U

src/screenshotter/tests.py

@@ -63,7 +63,7 @@ def test_bad_script_path(self):
     def test_timeout_screenshot(self):
         # We show that we can change timeout value. It's so small, this takes more than 1ms to generate the screenshot.
         # => It fails
-        with self.assertRaisesRegexp(ScreenshotterException, 'TimeoutError: Navigation timeout of 1 ms exceeded'):
+        with self.assertRaisesRegex(ScreenshotterException, 'TimeoutError: Navigation timeout of 1 ms exceeded'):
             take_screenshot('https://www.google.fr')
 
     @override_settings(SCREENSHOTTER={'BAD_SETTINGS': 'none'})