Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-16589. [pb-upgrade] Update docker image to make 3.7.1 protoc as default (#1482). Contributed by Vinayakumar B.

This commit is contained in:
Vinayakumar B 2019-09-21 10:07:26 +05:30 committed by GitHub
parent aa938662f9
commit efed4450bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dev-support/docker/Dockerfile
View File

@ -106,12 +106,12 @@ ENV CMAKE_HOME /opt/cmake
ENV PATH "${PATH}:/opt/cmake/bin" ENV PATH "${PATH}:/opt/cmake/bin"
###### ######
# Install Google Protobuf 2.5.0 (2.6.0 ships with Xenial) # Install Google Protobuf 3.7.1 (2.6.0 ships with Xenial)
###### ######
# hadolint ignore=DL3003 # hadolint ignore=DL3003
RUN mkdir -p /opt/protobuf-src \ RUN mkdir -p /opt/protobuf-src \
&& curl -L -s -S \ && curl -L -s -S \
https://github.com/google/protobuf/releases/download/v2.5.0/protobuf-2.5.0.tar.gz \ https://github.com/protocolbuffers/protobuf/releases/download/v3.7.1/protobuf-java-3.7.1.tar.gz \
-o /opt/protobuf.tar.gz \ -o /opt/protobuf.tar.gz \
&& tar xzf /opt/protobuf.tar.gz --strip-components 1 -C /opt/protobuf-src \ && tar xzf /opt/protobuf.tar.gz --strip-components 1 -C /opt/protobuf-src \
&& cd /opt/protobuf-src \ && cd /opt/protobuf-src \
@ -200,17 +200,6 @@ RUN curl -L -s -S \
### ###
ENV MAVEN_OPTS -Xms256m -Xmx1536m ENV MAVEN_OPTS -Xms256m -Xmx1536m
RUN mkdir -p /opt/protobuf-3.7-src \
&& curl -L -s -S \
https://github.com/protocolbuffers/protobuf/releases/download/v3.7.1/protobuf-java-3.7.1.tar.gz \
-o /opt/protobuf-3.7.1.tar.gz \
&& tar xzf /opt/protobuf-3.7.1.tar.gz --strip-components 1 -C /opt/protobuf-3.7-src \
&& cd /opt/protobuf-3.7-src \
&& ./configure --prefix=/opt/protobuf-3.7 \
&& make install \
&& cd /root \
&& rm -rf /opt/protobuf-3.7-src
### ###
# Everything past this point is either not needed for testing or breaks Yetus. # Everything past this point is either not needed for testing or breaks Yetus.
# So tell Yetus not to read the rest of the file: # 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
&& dpkg --install hugo.deb \ && dpkg --install hugo.deb \
&& rm hugo.deb && rm hugo.deb
######
# Install Google Protobuf 3.7.1 (2.6.0 ships with Xenial)
# Keep 2.5.0 as well, until 3.7.1 upgrade is complete.
######
# hadolint ignore=DL3003
# Add a welcome message and environment checks. # Add a welcome message and environment checks.
COPY hadoop_env_checks.sh /root/hadoop_env_checks.sh COPY hadoop_env_checks.sh /root/hadoop_env_checks.sh

3
hadoop-project/pom.xml
View File

@ -1918,9 +1918,6 @@
<activation> <activation>
<activeByDefault>false</activeByDefault> <activeByDefault>false</activeByDefault>
</activation> </activation>
<properties>
<protoc.path>/opt/protobuf-3.7/bin/protoc</protoc.path>
</properties>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>