Skip to content

Commit 4fb5fee

Browse files
authored
update setuptools and pip before installing opengrok-tools (#4500)
fixes #4497
1 parent 41ca0ba commit 4fb5fee

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

Dockerfile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ RUN echo 'deb https://package.perforce.com/apt/ubuntu jammy release' > /etc/apt/
5858
# hadolint ignore=DL3008,DL3009
5959
RUN apt-get update && \
6060
apt-get install --no-install-recommends -y git subversion mercurial cvs cssc bzr rcs rcs-blame helix-p4d \
61-
unzip inotify-tools python3 python3-pip \
61+
unzip python3 python3-pip \
6262
python3-venv python3-setuptools openssh-client libyaml-dev
6363

6464
# compile and install universal-ctags
@@ -72,14 +72,18 @@ RUN apt-get install --no-install-recommends -y pkg-config automake build-essenti
7272
apt-get clean && \
7373
rm -rf /var/lib/apt/lists/*
7474

75+
# Update the Python tooling in order to successfully install the opengrok-tools package.
76+
# hadolint ignore=DL3013
77+
RUN python3 -m pip install --no-cache-dir --upgrade pip setuptools
78+
7579
# prepare OpenGrok binaries and directories
7680
# hadolint ignore=DL3010
7781
COPY --from=build opengrok.tar.gz /opengrok.tar.gz
7882
# hadolint ignore=DL3013
7983
RUN mkdir -p /opengrok /opengrok/etc /opengrok/data /opengrok/src && \
8084
tar -zxvf /opengrok.tar.gz -C /opengrok --strip-components 1 && \
8185
rm -f /opengrok.tar.gz && \
82-
python3 -m pip install --no-cache-dir /opengrok/tools/opengrok-tools* && \
86+
python3 -m pip install --no-cache-dir /opengrok/tools/opengrok-tools.tar.gz && \
8387
python3 -m pip install --no-cache-dir Flask Flask-HTTPAuth waitress # for /reindex REST endpoint handled by start.py
8488

8589
COPY --from=build /mvn/VERSION /opengrok/VERSION

0 commit comments

Comments
 (0)