Skip to content

Commit 5afbce4

Browse files
committed
HADOOP-16589. [pb-upgrade] Update docker image to make 3.7.1 protoc as default
1 parent 1654497 commit 5afbce4

File tree

2 files changed

+1
-20
lines changed

2 files changed

+1
-20
lines changed

dev-support/docker/Dockerfile

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ ENV PATH "${PATH}:/opt/cmake/bin"
111111
# hadolint ignore=DL3003
112112
RUN mkdir -p /opt/protobuf-src \
113113
&& curl -L -s -S \
114-
https://github.com/google/protobuf/releases/download/v2.5.0/protobuf-2.5.0.tar.gz \
114+
https://github.com/protocolbuffers/protobuf/releases/download/v3.7.1/protobuf-java-3.7.1.tar.gz \
115115
-o /opt/protobuf.tar.gz \
116116
&& tar xzf /opt/protobuf.tar.gz --strip-components 1 -C /opt/protobuf-src \
117117
&& cd /opt/protobuf-src \
@@ -200,17 +200,6 @@ 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
213-
214203
###
215204
# Everything past this point is either not needed for testing or breaks Yetus.
216205
# So tell Yetus not to read the rest of the file:
@@ -222,11 +211,6 @@ RUN curl -L -o hugo.deb https://github.com/gohugoio/hugo/releases/download/v0.30
222211
&& dpkg --install hugo.deb \
223212
&& rm hugo.deb
224213

225-
######
226-
# Install Google Protobuf 3.7.1 (2.6.0 ships with Xenial)
227-
# Keep 2.5.0 as well, until 3.7.1 upgrade is complete.
228-
######
229-
# hadolint ignore=DL3003
230214

231215
# Add a welcome message and environment checks.
232216
COPY hadoop_env_checks.sh /root/hadoop_env_checks.sh

hadoop-project/pom.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1918,9 +1918,6 @@
19181918
<activation>
19191919
<activeByDefault>false</activeByDefault>
19201920
</activation>
1921-
<properties>
1922-
<protoc.path>/opt/protobuf-3.7/bin/protoc</protoc.path>
1923-
</properties>
19241921
<build>
19251922
<plugins>
19261923
<plugin>

0 commit comments

Comments
 (0)