From 6425db6c7e97fe90f6598a30505556566a962d70 Mon Sep 17 00:00:00 2001 From: Stavros Date: Thu, 4 Jul 2024 15:12:29 +0200 Subject: [PATCH] build(docker): upgraded docker image to ubuntu 24.04 (#211) --- Dockerfile | 22 ++++++++++------------ requirements.txt | 4 ++-- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/Dockerfile b/Dockerfile index 06dad8a..54b7b0a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,19 +1,17 @@ # This file is part of REANA. -# Copyright (C) 2018, 2019, 2020, 2021, 2022, 2023 CERN. +# Copyright (C) 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/ @@ -23,16 +21,16 @@ COPY requirements.txt /code/ RUN apt-get update -y && \ apt-get install --no-install-recommends -y \ gcc \ - python3.8 \ - python3-dev \ + python3.12 \ + python3.12-dev \ python3-pip \ 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-dev && \ - apt-get autoremove -y && \ + python3.12-dev && \ + apt-get autoremove -y && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* @@ -63,7 +61,7 @@ ENV TERM=xterm \ # Set image labels LABEL org.opencontainers.image.authors="team@reanahub.io" -LABEL org.opencontainers.image.created="2024-03-04" +LABEL org.opencontainers.image.created="2024-07-04" LABEL org.opencontainers.image.description="REANA reproducible analysis platform - Serial workflow engine component" LABEL org.opencontainers.image.documentation="https://reana-workflow-engine-serial.readthedocs.io/" LABEL org.opencontainers.image.licenses="MIT" diff --git a/requirements.txt b/requirements.txt index 2dd2aca..97dc2de 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,11 +7,11 @@ 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 +backports.zoneinfo[tzdata]==0.2.1;python_version<"3.9" # 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 -certifi==2024.2.2 # via requests +certifi==2024.6.2 # via requests charset-normalizer==3.3.2 # via requests checksumdir==1.1.9 # via reana-commons click==8.1.7 # via reana-commons