From 4fb5fee5c69ca138a4f8510a523f9bcb33ede8f2 Mon Sep 17 00:00:00 2001 From: Vladimir Kotal Date: Mon, 4 Dec 2023 16:00:53 +0100 Subject: [PATCH] update setuptools and pip before installing opengrok-tools (#4500) fixes #4497 --- Dockerfile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 59a7dd67ee4..9b21edd3404 100644 --- a/Dockerfile +++ b/Dockerfile @@ -58,7 +58,7 @@ RUN echo 'deb https://package.perforce.com/apt/ubuntu jammy release' > /etc/apt/ # hadolint ignore=DL3008,DL3009 RUN apt-get update && \ apt-get install --no-install-recommends -y git subversion mercurial cvs cssc bzr rcs rcs-blame helix-p4d \ - unzip inotify-tools python3 python3-pip \ + unzip python3 python3-pip \ python3-venv python3-setuptools openssh-client libyaml-dev # compile and install universal-ctags @@ -72,6 +72,10 @@ RUN apt-get install --no-install-recommends -y pkg-config automake build-essenti apt-get clean && \ rm -rf /var/lib/apt/lists/* +# Update the Python tooling in order to successfully install the opengrok-tools package. +# hadolint ignore=DL3013 +RUN python3 -m pip install --no-cache-dir --upgrade pip setuptools + # prepare OpenGrok binaries and directories # hadolint ignore=DL3010 COPY --from=build opengrok.tar.gz /opengrok.tar.gz @@ -79,7 +83,7 @@ COPY --from=build opengrok.tar.gz /opengrok.tar.gz RUN mkdir -p /opengrok /opengrok/etc /opengrok/data /opengrok/src && \ tar -zxvf /opengrok.tar.gz -C /opengrok --strip-components 1 && \ rm -f /opengrok.tar.gz && \ - python3 -m pip install --no-cache-dir /opengrok/tools/opengrok-tools* && \ + python3 -m pip install --no-cache-dir /opengrok/tools/opengrok-tools.tar.gz && \ python3 -m pip install --no-cache-dir Flask Flask-HTTPAuth waitress # for /reindex REST endpoint handled by start.py COPY --from=build /mvn/VERSION /opengrok/VERSION