This is an automated email from the ASF dual-hosted git repository.
vinayakumarb pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new f4f9f0f HADOOP-16562. [pb-upgrade] Update docker image to have 3.7.1
protoc executable (#1429). Contributed by Vinayakumar B.
f4f9f0f is described below
commit f4f9f0fe4f215e2e1b88b0607102f22388acfe45
Author: Vinayakumar B <vinayakum...@apache.org>
AuthorDate: Thu Sep 12 16:47:54 2019 +0530
HADOOP-16562. [pb-upgrade] Update docker image to have 3.7.1 protoc
executable (#1429). Contributed by Vinayakumar B.
---
dev-support/docker/Dockerfile | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/dev-support/docker/Dockerfile b/dev-support/docker/Dockerfile
index e71e51c..fe38395 100644
--- a/dev-support/docker/Dockerfile
+++ b/dev-support/docker/Dockerfile
@@ -212,6 +212,22 @@ RUN curl -L -o hugo.deb
https://github.com/gohugoio/hugo/releases/download/v0.30
&& dpkg --install 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
+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
RUN chmod 755 /root/hadoop_env_checks.sh
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
