@@ -111,7 +111,7 @@ ENV PATH "${PATH}:/opt/cmake/bin"
111111# hadolint ignore=DL3003
112112RUN 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# ##
201201ENV 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.
232216COPY hadoop_env_checks.sh /root/hadoop_env_checks.sh
0 commit comments