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.
This commit is contained in:
parent
4a9a6a21b8
commit
39e82acc48
|
@ -200,6 +200,16 @@ 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.
|
||||||
|
@ -217,16 +227,6 @@ RUN curl -L -o hugo.deb https://github.com/gohugoio/hugo/releases/download/v0.30
|
||||||
# Keep 2.5.0 as well, until 3.7.1 upgrade is complete.
|
# Keep 2.5.0 as well, until 3.7.1 upgrade is complete.
|
||||||
######
|
######
|
||||||
# hadolint ignore=DL3003
|
# hadolint ignore=DL3003
|
||||||
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
|
|
||||||
|
|
||||||
# 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
|
||||||
|
|
Loading…
Reference in New Issue