Skip to content

Commit d35b0c1

Browse files
committed
Revert "HADOOP-19252. Upgrade hadoop-thirdparty to 1.3.0"
revert docker changes This reverts commit 65669f5.
1 parent 65669f5 commit d35b0c1

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

dev-support/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
6666
ENV SPOTBUGS_HOME /opt/spotbugs
6767

6868
#######
69-
# Set env vars for Google Protobuf
69+
# Set env vars for Google Protobuf 3.21.12
7070
#######
7171
ENV PROTOBUF_HOME /opt/protobuf
7272
ENV PATH "${PATH}:/opt/protobuf/bin"

dev-support/docker/Dockerfile_aarch64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-arm64
6666
ENV SPOTBUGS_HOME /opt/spotbugs
6767

6868
#######
69-
# Set env vars for Google Protobuf
69+
# Set env vars for Google Protobuf 3.21.12
7070
#######
7171
ENV PROTOBUF_HOME /opt/protobuf
7272
ENV PATH "${PATH}:/opt/protobuf/bin"

dev-support/docker/Dockerfile_centos_7

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ ENV JAVA_HOME /usr/lib/jvm/java-1.8.0
8888
ENV SPOTBUGS_HOME /opt/spotbugs
8989

9090
#######
91-
# Set env vars for Google Protobuf
91+
# Set env vars for Google Protobuf 3.21.12
9292
#######
9393
ENV PROTOBUF_HOME /opt/protobuf
9494
ENV PATH "${PATH}:/opt/protobuf/bin"

dev-support/docker/Dockerfile_centos_8

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ ENV JAVA_HOME /usr/lib/jvm/java-1.8.0
101101
ENV SPOTBUGS_HOME /opt/spotbugs
102102

103103
#######
104-
# Set env vars for Google Protobuf
104+
# Set env vars for Google Protobuf 3.21.12
105105
#######
106106
ENV PROTOBUF_HOME /opt/protobuf
107107
ENV PATH "${PATH}:/opt/protobuf/bin"

dev-support/docker/Dockerfile_debian_10

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64
6666
ENV SPOTBUGS_HOME /opt/spotbugs
6767

6868
#######
69-
# Set env vars for Google Protobuf
69+
# Set env vars for Google Protobuf 3.21.12
7070
#######
7171
ENV PROTOBUF_HOME /opt/protobuf
7272
ENV PATH "${PATH}:/opt/protobuf/bin"

dev-support/docker/pkg-resolver/install-protobuf.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ if [ $? -eq 1 ]; then
2727
exit 1
2828
fi
2929

30-
default_version="3.25.3"
30+
default_version="3.21.12"
3131
version_to_install=$default_version
3232
if [ -n "$2" ]; then
3333
version_to_install="$2"
@@ -38,11 +38,11 @@ if [ "$version_to_install" != "3.21.12" ]; then
3838
version_to_install=$default_version
3939
fi
4040

41-
if [ "$version_to_install" == "3.25.3" ]; then
41+
if [ "$version_to_install" == "3.21.12" ]; then
4242
# hadolint ignore=DL3003
4343
mkdir -p /opt/protobuf-src &&
4444
curl -L -s -S \
45-
https://github.com/protocolbuffers/protobuf/releases/download/v25.3/protobuf-25.3.tar.gz \
45+
https://github.com/protocolbuffers/protobuf/archive/refs/tags/v3.21.12.tar.gz \
4646
-o /opt/protobuf.tar.gz &&
4747
tar xzf /opt/protobuf.tar.gz --strip-components 1 -C /opt/protobuf-src &&
4848
cd /opt/protobuf-src &&

0 commit comments

Comments
 (0)