Skip to content

Commit 39e82ac

Browse files
committed
HADOOP-16562. [pb-upgrade] Update docker image to have 3.7.1 protoc executable (#1429).
Addendum patch. Moved protobuf-3.7.1 installation within YETUS marker.
1 parent 4a9a6a2 commit 39e82ac

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

dev-support/docker/Dockerfile

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,16 @@ RUN curl -L -s -S \
200200
###
201201
ENV MAVEN_OPTS -Xms256m -Xmx1536m
202202

203+
RUN mkdir -p /opt/protobuf-3.7-src \
204+
&& curl -L -s -S \
205+
https://github.com/protocolbuffers/protobuf/releases/download/v3.7.1/protobuf-java-3.7.1.tar.gz \
206+
-o /opt/protobuf-3.7.1.tar.gz \
207+
&& tar xzf /opt/protobuf-3.7.1.tar.gz --strip-components 1 -C /opt/protobuf-3.7-src \
208+
&& cd /opt/protobuf-3.7-src \
209+
&& ./configure --prefix=/opt/protobuf-3.7 \
210+
&& make install \
211+
&& cd /root \
212+
&& rm -rf /opt/protobuf-3.7-src
203213

204214
###
205215
# Everything past this point is either not needed for testing or breaks Yetus.
@@ -217,16 +227,6 @@ RUN curl -L -o hugo.deb https://github.com/gohugoio/hugo/releases/download/v0.30
217227
# Keep 2.5.0 as well, until 3.7.1 upgrade is complete.
218228
######
219229
# hadolint ignore=DL3003
220-
RUN mkdir -p /opt/protobuf-3.7-src \
221-
&& curl -L -s -S \
222-
https://github.com/protocolbuffers/protobuf/releases/download/v3.7.1/protobuf-java-3.7.1.tar.gz \
223-
-o /opt/protobuf-3.7.1.tar.gz \
224-
&& tar xzf /opt/protobuf-3.7.1.tar.gz --strip-components 1 -C /opt/protobuf-3.7-src \
225-
&& cd /opt/protobuf-3.7-src \
226-
&& ./configure --prefix=/opt/protobuf-3.7 \
227-
&& make install \
228-
&& cd /root \
229-
&& rm -rf /opt/protobuf-3.7-src
230230

231231
# Add a welcome message and environment checks.
232232
COPY hadoop_env_checks.sh /root/hadoop_env_checks.sh

0 commit comments

Comments
 (0)