From 15aab87f422021814a1da0084e4dd1c716e35006 Mon Sep 17 00:00:00 2001 From: Andrew Crosby Date: Thu, 9 Sep 2021 13:57:10 -0400 Subject: [PATCH] Pin setuptools in docker base images (#2786) --- scripts/docker/dev/Dockerfile | 2 +- scripts/docker/release/Dockerfile.base | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/docker/dev/Dockerfile b/scripts/docker/dev/Dockerfile index 3fe404410..4b7259cfd 100644 --- a/scripts/docker/dev/Dockerfile +++ b/scripts/docker/dev/Dockerfile @@ -51,7 +51,7 @@ RUN python3.6 -m venv "${GALAXY_VENV}" \ && "${GALAXY_VENV}/bin/pip" install -U \ 'pip' \ 'wheel' \ - 'setuptools' \ + 'setuptools>=57,<58' \ && "${GALAXY_VENV}/bin/pip" install -r /tmp/requirements.txt COPY scripts/docker/dev/entrypoint.sh /entrypoint diff --git a/scripts/docker/release/Dockerfile.base b/scripts/docker/release/Dockerfile.base index 25027f8b0..a68cc6be4 100644 --- a/scripts/docker/release/Dockerfile.base +++ b/scripts/docker/release/Dockerfile.base @@ -20,5 +20,5 @@ RUN python3.6 -m venv ${GALAXY_VENV} \ && "${GALAXY_VENV}/bin/pip" install -U \ 'pip' \ 'wheel' \ - 'setuptools' \ + 'setuptools>=57,<58' \ && "${GALAXY_VENV}/bin/pip" install -r /tmp/requirements.txt