Skip to content

Commit faa9bb9

Browse files
TEZ-4674: Update Dockerfile dependencies: Protobuf 3.25.5, and stable Python, npm tools (#452) (Raghav Aggarwal reviewed by Laszlo Bodor)
1 parent 6dc889e commit faa9bb9

File tree

1 file changed

+17
-20
lines changed

1 file changed

+17
-20
lines changed

build-tools/docker/Dockerfile

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ RUN apt-get -q update && apt-get -q install --no-install-recommends -y \
5656
rsync \
5757
software-properties-common \
5858
ssh-client \
59+
unzip \
5960
xz-utils \
6061
&& apt-get clean \
6162
&& rm -rf /var/lib/apt/lists/*
@@ -96,20 +97,16 @@ RUN add-apt-repository -y ppa:longsleep/golang-backports \
9697
#############
9798

9899
######
99-
# Install Google Protobuf 3.21.1
100+
# Install Google Protobuf 3.25.5
100101
######
101102
FROM tezbase AS protobuf
102103
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
103-
RUN mkdir -p /opt/protobuf-src \
104+
RUN mkdir -p /opt/protobuf \
104105
&& curl -L -s -S \
105-
https://github.com/protocolbuffers/protobuf/releases/download/v21.1/protobuf-java-3.21.1.tar.gz \
106-
-o /opt/protobuf.tar.gz \
107-
&& tar xzf /opt/protobuf.tar.gz --strip-components 1 -C /opt/protobuf-src
108-
WORKDIR /opt/protobuf-src
109-
RUN ./configure --prefix=/opt/protobuf \
110-
&& make install
111-
WORKDIR /root
112-
RUN rm -rf /opt/protobuf-src
106+
https://github.com/protocolbuffers/protobuf/releases/download/v25.5/protoc-25.5-linux-x86_64.zip \
107+
-o /opt/protoc.zip \
108+
&& unzip -q /opt/protoc.zip -d /opt/protobuf \
109+
&& rm /opt/protoc.zip
113110

114111
####
115112
# Install shellcheck (shell script lint)
@@ -165,7 +162,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
165162
####
166163

167164
####
168-
# OpenJDK 17
165+
# OpenJDK 21
169166
# hadolint ignore=DL3008
170167
RUN apt-get -q update \
171168
&& DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y openjdk-21-jdk \
@@ -197,7 +194,7 @@ RUN apt-get -q update && apt-get -q install --no-install-recommends -y maven \
197194
&& rm -rf /var/lib/apt/lists/*
198195

199196
######
200-
# Install python3 and pylint3
197+
# Install python3 and pylint4
201198
# astroid and pylint go hand-in-hand. Upgrade both at the same time.
202199
######
203200
# hadolint ignore=DL3008,DL3013
@@ -226,13 +223,13 @@ RUN apt-get -q update && apt-get -q install --no-install-recommends -y \
226223
&& python3 /tmp/get-pip.py --break-system-packages \
227224
&& rm /usr/local/bin/pip /tmp/get-pip.py \
228225
&& pip3 install --break-system-packages -v \
229-
astroid==2.4.2 \
230-
codespell==2.0 \
231-
pylint==2.5.3 \
232-
yamllint==1.24.2 \
226+
astroid==4.0.3 \
227+
codespell==2.4.1 \
228+
pylint==4.0.4 \
229+
yamllint==1.38.0 \
233230
&& rm -rf /root/.cache \
234-
&& mv /usr/local/bin/pylint /usr/local/bin/pylint3
235-
RUN ln -s /usr/local/bin/pylint3 /usr/local/bin/pylint
231+
&& mv /usr/local/bin/pylint /usr/local/bin/pylint4
232+
RUN ln -s /usr/local/bin/pylint4 /usr/local/bin/pylint
236233
RUN ln -s /usr/local/bin/pip3 /usr/local/bin/pip
237234

238235
###
@@ -241,8 +238,8 @@ RUN ln -s /usr/local/bin/pip3 /usr/local/bin/pip
241238
# hadolint ignore=DL3008
242239
RUN apt-get update && apt-get install --no-install-recommends -y nodejs npm \
243240
&& npm install -g \
244-
jshint@2.12.0 \
245-
markdownlint-cli@0.23.2 \
241+
jshint@2.13.6 \
242+
markdownlint-cli@0.46.0 \
246243
&& apt-get clean \
247244
&& rm -rf /var/lib/apt/lists/* /root/.npm
248245

0 commit comments

Comments
 (0)