build(docker): upgrade base image to ubuntu 24.04 (reanahub#592)

Closes reanahub/reana#808
mdonadoni · Jul 8, 2024 · faf5d8a · faf5d8a
1 parent f1764ed
commit faf5d8a
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 71 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ on: [push, pull_request]
 
 jobs:
   lint-commitlint:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -36,7 +36,7 @@ jobs:
           ./run-tests.sh --check-commitlint ${{ github.event.pull_request.base.sha }} ${{ github.event.pull_request.head.sha }} ${{ github.event.pull_request.number }}
 
   lint-shellcheck:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -47,15 +47,15 @@ jobs:
           ./run-tests.sh --check-shellcheck
 
   lint-black:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
       - name: Setup Python
         uses: actions/setup-python@v5
         with:
-          python-version: 3.8
+          python-version: "3.12"
 
       - name: Check Python code formatting
         run: |
@@ -64,15 +64,15 @@ jobs:
           ./run-tests.sh --check-black
 
   lint-flake8:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
       - name: Setup Python
         uses: actions/setup-python@v5
         with:
-          python-version: 3.8
+          python-version: "3.12"
 
       - name: Check compliance with pep8, pyflakes and circular complexity
         run: |
@@ -81,15 +81,15 @@ jobs:
           ./run-tests.sh --check-flake8
 
   lint-pydocstyle:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
       - name: Setup Python
         uses: actions/setup-python@v5
         with:
-          python-version: 3.8
+          python-version: "3.12"
 
       - name: Check compliance with Python docstring conventions
         run: |
@@ -98,15 +98,15 @@ jobs:
           ./run-tests.sh --check-pydocstyle
 
   lint-check-manifest:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
       - name: Setup Python
         uses: actions/setup-python@v5
         with:
-          python-version: 3.8
+          python-version: "3.12"
 
       - name: Check Python manifest completeness
         run: |
@@ -115,15 +115,15 @@ jobs:
           ./run-tests.sh --check-manifest
 
   docs-sphinx:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
       - name: Setup Python
         uses: actions/setup-python@v5
         with:
-          python-version: 3.8
+          python-version: "3.12"
 
       - name: Install system dependencies
         run: |
@@ -140,15 +140,15 @@ jobs:
         run: ./run-tests.sh --check-sphinx
 
   python-tests:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
       - name: Setup Python
         uses: actions/setup-python@v5
         with:
-          python-version: 3.8
+          python-version: "3.12"
 
       - name: Install Python dependencies
         run: |
@@ -171,7 +171,7 @@ jobs:
           files: coverage.xml
 
   lint-dockerfile:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -180,7 +180,7 @@ jobs:
         run: ./run-tests.sh --check-dockerfile
 
   docker-build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -189,7 +189,7 @@ jobs:
         run: ./run-tests.sh --check-docker-build
 
   release-docker:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     if: >
       vars.RELEASE_DOCKER == 'true' &&
       github.event_name == 'push' &&

diff --git a/Dockerfile b/Dockerfile
@@ -1,19 +1,17 @@
 # This file is part of REANA.
-# Copyright (C) 2017, 2018, 2019, 2020, 2021, 2022, 2023 CERN.
+# Copyright (C) 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024 CERN.
 #
 # REANA is free software; you can redistribute it and/or modify it
 # under the terms of the MIT License; see LICENSE file for more details.
 
 # Use Ubuntu LTS base image
-FROM docker.io/library/ubuntu:20.04
+FROM docker.io/library/ubuntu:24.04
 
 # Use default answers in installation commands
 ENV DEBIAN_FRONTEND=noninteractive
 
-# Use distutils provided by the standard Python library instead of the vendored one in
-# setuptools, so that editable installations are stored in the right directory.
-# See https://github.com/pypa/setuptools/issues/3301
-ENV SETUPTOOLS_USE_DISTUTILS=stdlib
+# Allow pip to install packages in the system site-packages dir
+ENV PIP_BREAK_SYSTEM_PACKAGES=true
 
 # Prepare list of Python dependencies
 COPY requirements.txt /code/
@@ -26,16 +24,16 @@ RUN apt-get update -y && \
       git \
       libpcre3 \
       libpcre3-dev \
-      libpython3.8 \
+      libpython3.12 \
       python3-pip \
-      python3.8 \
-      python3.8-dev \
+      python3.12 \
+      python3.12-dev \
       vim-tiny && \
-    pip install --no-cache-dir --upgrade pip setuptools && \
+    pip install --no-cache-dir --upgrade setuptools && \
     pip install --no-cache-dir -r /code/requirements.txt && \
     apt-get remove -y \
       gcc \
-      python3.8-dev && \
+      python3.12-dev && \
     apt-get autoremove -y && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*

diff --git a/requirements.txt b/requirements.txt
@@ -1,83 +1,80 @@
 #
-# This file is autogenerated by pip-compile with Python 3.8
+# This file is autogenerated by pip-compile with Python 3.12
 # by the following command:
 #
 #    pip-compile --annotation-style=line --output-file=requirements.txt setup.py
 #
-alembic==1.13.1           # via reana-db
+alembic==1.13.2           # via reana-db
 amqp==5.2.0               # via kombu
 appdirs==1.4.4            # via fs
 attrs==23.2.0             # via jsonschema
-backports-zoneinfo[tzdata]==0.2.1  # via backports-zoneinfo, kombu
 bracex==2.4               # via wcmatch
 bravado==10.3.2           # via reana-commons
 bravado-core==6.1.0       # via bravado, reana-commons
 cachetools==5.3.3         # via google-auth
-certifi==2024.2.2         # via kubernetes, requests
+certifi==2024.7.4         # via kubernetes, requests
 cffi==1.16.0              # via cryptography
 chardet==3.0.4            # via requests
 checksumdir==1.1.9        # via reana-commons
 click==8.1.7              # via flask, reana-commons
-cryptography==42.0.5      # via sqlalchemy-utils
-flask==2.1.3              # via reana-workflow-controller (setup.py)
+cryptography==42.0.8      # via sqlalchemy-utils
+flask==2.2.5              # via reana-workflow-controller (setup.py)
 fs==2.4.16                # via reana-commons
 gitdb==4.0.11             # via gitpython
-gitpython==3.1.42         # via reana-workflow-controller (setup.py)
-google-auth==2.28.1       # via kubernetes
+gitpython==3.1.43         # via reana-workflow-controller (setup.py)
+google-auth==2.31.0       # via kubernetes
+greenlet==3.0.3           # via sqlalchemy
 idna==2.10                # via jsonschema, requests
-importlib-metadata==7.0.1  # via alembic, flask
-importlib-resources==6.1.2  # via alembic
-itsdangerous==2.1.2       # via flask
-jinja2==3.1.3             # via flask
-jsonpickle==3.0.3         # via reana-workflow-controller (setup.py)
-jsonpointer==2.4          # via jsonschema
+importlib-resources==6.4.0  # via swagger-spec-validator
+itsdangerous==2.2.0       # via flask
+jinja2==3.1.4             # via flask
+jsonpickle==3.2.2         # via reana-workflow-controller (setup.py)
+jsonpointer==3.0.0        # via jsonschema
 jsonref==1.1.0            # via bravado-core
 jsonschema[format]==3.2.0  # via bravado-core, reana-commons, swagger-spec-validator
-kombu==5.3.5              # via reana-commons
+kombu==5.3.7              # via reana-commons
 kubernetes==22.6.0        # via reana-commons
-mako==1.3.2               # via alembic
+mako==1.3.5               # via alembic
 markupsafe==2.1.5         # via jinja2, mako, werkzeug
-marshmallow==2.20.1       # via reana-workflow-controller (setup.py), webargs
+marshmallow==2.21.0       # via reana-workflow-controller (setup.py), webargs
 mock==3.0.5               # via reana-commons
 monotonic==1.6            # via bravado
-msgpack==1.0.7            # via bravado-core
+msgpack==1.0.8            # via bravado-core
 msgpack-python==0.5.6     # via bravado
 oauthlib==3.2.2           # via requests-oauthlib
-packaging==23.2           # via reana-workflow-controller (setup.py)
+packaging==24.1           # via reana-workflow-controller (setup.py)
 psycopg2-binary==2.9.9    # via reana-db
-pyasn1==0.5.1             # via pyasn1-modules, rsa
-pyasn1-modules==0.3.0     # via google-auth
-pycparser==2.21           # via cffi
+pyasn1==0.6.0             # via pyasn1-modules, rsa
+pyasn1-modules==0.4.0     # via google-auth
+pycparser==2.22           # via cffi
 pyrsistent==0.20.0        # via jsonschema
-python-dateutil==2.9.0    # via bravado, bravado-core, kubernetes
+python-dateutil==2.9.0.post0  # via bravado, bravado-core, kubernetes
 pytz==2024.1              # via bravado-core
 pyyaml==6.0.1             # via bravado, bravado-core, kubernetes, reana-commons, swagger-spec-validator
-reana-commons[kubernetes]==0.95.0a2	# via reana-db, reana-workflow-controller (setup.py)
-reana-db==0.95.0a2	# via reana-workflow-controller (setup.py)
+reana-commons[kubernetes]==0.95.0a2  # via reana-db, reana-workflow-controller (setup.py)
+reana-db==0.95.0a3        # via reana-workflow-controller (setup.py)
 requests==2.25.0          # via bravado, bravado-core, kubernetes, reana-workflow-controller (setup.py), requests-oauthlib
-requests-oauthlib==1.3.1  # via kubernetes
+requests-oauthlib==2.0.0  # via kubernetes
 rfc3987==1.3.8            # via jsonschema
 rsa==4.9                  # via google-auth
 simplejson==3.19.2        # via bravado, bravado-core
 six==1.16.0               # via bravado, bravado-core, fs, jsonschema, kubernetes, mock, python-dateutil
 smmap==5.0.1              # via gitdb
-sqlalchemy==1.3.24        # via alembic, reana-db, sqlalchemy-utils
-sqlalchemy-utils[encrypted]==0.41.1  # via reana-db, reana-workflow-controller (setup.py)
+sqlalchemy==1.4.52        # via alembic, reana-db, sqlalchemy-utils
+sqlalchemy-utils[encrypted]==0.41.2  # via reana-db, reana-workflow-controller (setup.py)
 strict-rfc3339==0.7       # via jsonschema
-swagger-spec-validator==3.0.3  # via bravado-core
-typing-extensions==4.10.0  # via alembic, bravado, kombu, swagger-spec-validator
-tzdata==2024.1            # via backports-zoneinfo
-urllib3==1.26.18          # via kubernetes, requests
-uwsgi==2.0.24             # via reana-workflow-controller (setup.py)
+swagger-spec-validator==3.0.4  # via bravado-core
+typing-extensions==4.12.2  # via alembic, bravado, swagger-spec-validator
+urllib3==1.26.19          # via kubernetes, requests
+uwsgi==2.0.26             # via reana-workflow-controller (setup.py)
 uwsgi-tools==1.1.1        # via reana-workflow-controller (setup.py)
-uwsgitop==0.11            # via reana-workflow-controller (setup.py)
+uwsgitop==0.12            # via reana-workflow-controller (setup.py)
 vine==5.1.0               # via amqp, kombu
 wcmatch==8.4.1            # via reana-commons
 webargs==6.1.1            # via reana-workflow-controller (setup.py)
-webcolors==1.13           # via jsonschema
-websocket-client==1.7.0   # via kubernetes
-werkzeug==2.3.8           # via flask, reana-commons, reana-workflow-controller (setup.py)
-zipp==3.17.0              # via importlib-metadata, importlib-resources
+webcolors==24.6.0         # via jsonschema
+websocket-client==1.8.0   # via kubernetes
+werkzeug==2.2.3           # via flask, reana-commons, reana-workflow-controller (setup.py)
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools
diff --git a/setup.py b/setup.py
@@ -50,14 +50,14 @@
 ]
 
 install_requires = [
-    "Flask>=2.1.1,<2.2.0",
-    "Werkzeug>=2.1.0,<3.0.0",
+    "Flask>=2.1.1,<2.3.0",  # same upper pin as invenio-base/reana-server
+    "Werkzeug>=2.1.0,<2.3.0",  # same upper pin as invenio-base
     "gitpython>=2.1",
     "jsonpickle>=0.9.6",
-    "marshmallow>2.13.0,<=2.20.1",
+    "marshmallow>2.13.0,<3.0.0",  # same upper pin as reana-server
     "packaging>=18.0",
     "reana-commons[kubernetes]>=0.95.0a2,<0.96.0",
-    "reana-db>=0.95.0a2,<0.96.0",
+    "reana-db>=0.95.0a3,<0.96.0",
     "requests==2.25.0",
     "sqlalchemy-utils>=0.31.0",
     "uwsgi-tools>=1.1.1",
@@ -105,7 +105,7 @@
         "License :: OSI Approved :: MIT License",
         "Operating System :: OS Independent",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.12",
         "Programming Language :: Python :: Implementation :: CPython",
         "Programming Language :: Python",
         "Topic :: Internet :: WWW/HTTP :: Dynamic Content",