From 097ab66cbce46e44353e9fb134280bc60a1e5409 Mon Sep 17 00:00:00 2001 From: Shane Unruh <87081771+shunr-hpe@users.noreply.github.com> Date: Tue, 30 Jul 2024 08:49:59 -0600 Subject: [PATCH] Fixed build failure (#12) This changes setuptools to not be upgraded. The build was failing because of incompatabilities between the python libraries packaging and setuptools. The packaging library is installed via an OS package, and so it cannot be upgraded by pip (uninstalled and then installed). The error given by pip is that it is a 'distutils installed project' and cannot accurately determine which files belong to it. CASMHMS-6243 --- .gitignore | 1 + Dockerfile | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index cfc16d38..03de42a8 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ **__pycache__** *.tar *.tar.gz +*.swp # Prevent certificates from getting checked in *.ca diff --git a/Dockerfile b/Dockerfile index fa2b8bab..eb3cf057 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # BSD 3-Clause License # -# Copyright 2022 Hewlett Packard Enterprise Development LP +# Copyright [2022,2024] Hewlett Packard Enterprise Development LP # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: @@ -28,7 +28,7 @@ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. -FROM artifactory.algol60.net/docker.io/library/alpine:3.16 AS base +FROM artifactory.algol60.net/docker.io/library/alpine:3.17 AS base COPY src/requirements.txt /app/requirements.txt @@ -48,6 +48,7 @@ RUN set -ex \ curl \ && pip3 install --upgrade \ pip \ + && pip3 install \ setuptools \ && pip3 install wheel \ && pip3 install -r /app/requirements.txt \