From 39e82acc485db0e66cbb3dd26b59dfe111ce6a10 Mon Sep 17 00:00:00 2001
From: Vinayakumar B <vinayakumarb@apache.org>
Date: Fri, 13 Sep 2019 15:30:24 +0530
Subject: [PATCH] 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.
---
 dev-support/docker/Dockerfile | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/dev-support/docker/Dockerfile b/dev-support/docker/Dockerfile
index fe38395a8f1..371bddee292 100644
--- a/dev-support/docker/Dockerfile
+++ b/dev-support/docker/Dockerfile
@@ -200,6 +200,16 @@ RUN curl -L -s -S \
 ###
 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.
@@ -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.
 ######
 # 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.
 COPY hadoop_env_checks.sh /root/hadoop_env_checks.sh