This is an automated email from the ASF dual-hosted git repository.
wangdan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pegasus.git
The following commit(s) were added to refs/heads/master by this push:
new 32a982fb3 fix(download): fix the broken download URL of thrift 0.11.0
tarball (#2154)
32a982fb3 is described below
commit 32a982fb315ead2b1ea9b9f193110fd29a644a47
Author: Dan Wang <[email protected]>
AuthorDate: Thu Nov 28 17:05:34 2024 +0800
fix(download): fix the broken download URL of thrift 0.11.0 tarball (#2154)
Resolve https://github.com/apache/incubator-pegasus/issues/2155.
Change the download URL of thrift 0.11.0 tarball to Apache instead of
Github where it was removed recently.
---
docker/pegasus-build-env/centos7/Dockerfile | 6 +++---
docker/pegasus-build-env/ubuntu1804/Dockerfile | 6 +++---
docker/pegasus-build-env/ubuntu2004/Dockerfile | 6 +++---
docker/pegasus-build-env/ubuntu2204/Dockerfile | 6 +++---
java-client/scripts/download_thrift.sh | 2 +-
5 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/docker/pegasus-build-env/centos7/Dockerfile
b/docker/pegasus-build-env/centos7/Dockerfile
index 12db0544f..3bb5333fd 100644
--- a/docker/pegasus-build-env/centos7/Dockerfile
+++ b/docker/pegasus-build-env/centos7/Dockerfile
@@ -68,11 +68,11 @@ RUN wget --progress=dot:giga
https://archive.apache.org/dist/maven/maven-3/3.8.3
&& tar -zxf apache-maven-3.8.3-bin.tar.gz \
&& rm apache-maven-3.8.3-bin.tar.gz
-RUN wget --progress=dot:giga
https://github.com/apache/thrift/archive/refs/tags/0.11.0.tar.gz -P /opt/thrift
&& \
- cd /opt/thrift && tar xzf 0.11.0.tar.gz && cd thrift-0.11.0 &&
./bootstrap.sh && \
+RUN wget --progress=dot:giga
https://archive.apache.org/dist/thrift/0.11.0/thrift-0.11.0.tar.gz -P
/opt/thrift && \
+ cd /opt/thrift && tar xzf thrift-0.11.0.tar.gz && cd thrift-0.11.0 &&
./bootstrap.sh && \
./configure --enable-libs=no && \
make -j$(($(nproc)/2+1)) && make install && cd - && \
- rm -rf thrift-0.11.0 0.11.0.tar.gz
+ rm -rf thrift-0.11.0 thrift-0.11.0.tar.gz
ENV JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk
ENV PATH="/opt/maven/apache-maven-3.8.3/bin:${PATH}"
diff --git a/docker/pegasus-build-env/ubuntu1804/Dockerfile
b/docker/pegasus-build-env/ubuntu1804/Dockerfile
index 55189b199..00ac6111f 100644
--- a/docker/pegasus-build-env/ubuntu1804/Dockerfile
+++ b/docker/pegasus-build-env/ubuntu1804/Dockerfile
@@ -61,11 +61,11 @@ RUN add-apt-repository ppa:git-core/ppa -y; \
RUN pip3 install --no-cache-dir --upgrade pip && pip3 install --no-cache-dir
cmake
-RUN wget --progress=dot:giga
https://github.com/apache/thrift/archive/refs/tags/0.11.0.tar.gz -P /opt/thrift
&& \
- cd /opt/thrift && tar xzf 0.11.0.tar.gz && cd thrift-0.11.0 &&
./bootstrap.sh && \
+RUN wget --progress=dot:giga
https://archive.apache.org/dist/thrift/0.11.0/thrift-0.11.0.tar.gz -P
/opt/thrift && \
+ cd /opt/thrift && tar xzf thrift-0.11.0.tar.gz && cd thrift-0.11.0 &&
./bootstrap.sh && \
./configure --enable-libs=no && \
make -j$(($(nproc)/2+1)) && make install && cd - && \
- rm -rf thrift-0.11.0 0.11.0.tar.gz
+ rm -rf thrift-0.11.0 thrift-0.11.0.tar.gz
ENV JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
ENV CLASSPATH=$JAVA_HOME/lib/
diff --git a/docker/pegasus-build-env/ubuntu2004/Dockerfile
b/docker/pegasus-build-env/ubuntu2004/Dockerfile
index 73d58e059..3a975a547 100644
--- a/docker/pegasus-build-env/ubuntu2004/Dockerfile
+++ b/docker/pegasus-build-env/ubuntu2004/Dockerfile
@@ -60,11 +60,11 @@ RUN add-apt-repository ppa:git-core/ppa -y; \
RUN pip3 install --no-cache-dir cmake
-RUN wget --progress=dot:giga
https://github.com/apache/thrift/archive/refs/tags/0.11.0.tar.gz -P /opt/thrift
&& \
- cd /opt/thrift && tar xzf 0.11.0.tar.gz && cd thrift-0.11.0 &&
./bootstrap.sh && \
+RUN wget --progress=dot:giga
https://archive.apache.org/dist/thrift/0.11.0/thrift-0.11.0.tar.gz -P
/opt/thrift && \
+ cd /opt/thrift && tar xzf thrift-0.11.0.tar.gz && cd thrift-0.11.0 &&
./bootstrap.sh && \
./configure --enable-libs=no && \
make -j$(($(nproc)/2+1)) && make install && cd - && \
- rm -rf thrift-0.11.0 0.11.0.tar.gz
+ rm -rf thrift-0.11.0 thrift-0.11.0.tar.gz
ENV JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
ENV CLASSPATH=$JAVA_HOME/lib/
diff --git a/docker/pegasus-build-env/ubuntu2204/Dockerfile
b/docker/pegasus-build-env/ubuntu2204/Dockerfile
index d7efdb286..e5a08417d 100644
--- a/docker/pegasus-build-env/ubuntu2204/Dockerfile
+++ b/docker/pegasus-build-env/ubuntu2204/Dockerfile
@@ -56,11 +56,11 @@ RUN apt-get update -y; \
RUN pip3 install --no-cache-dir --upgrade pip
RUN pip3 install --no-cache-dir cmake
-RUN wget --progress=dot:giga
https://github.com/apache/thrift/archive/refs/tags/0.11.0.tar.gz -P /opt/thrift
&& \
- cd /opt/thrift && tar xzf 0.11.0.tar.gz && cd thrift-0.11.0 &&
./bootstrap.sh && \
+RUN wget --progress=dot:giga
https://archive.apache.org/dist/thrift/0.11.0/thrift-0.11.0.tar.gz -P
/opt/thrift && \
+ cd /opt/thrift && tar xzf thrift-0.11.0.tar.gz && cd thrift-0.11.0 &&
./bootstrap.sh && \
./configure --enable-libs=no && \
make -j$(($(nproc)/2+1)) && make install && cd - && \
- rm -rf thrift-0.11.0 0.11.0.tar.gz
+ rm -rf thrift-0.11.0 thrift-0.11.0.tar.gz
ENV JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
ENV CLASSPATH=$JAVA_HOME/lib/
diff --git a/java-client/scripts/download_thrift.sh
b/java-client/scripts/download_thrift.sh
index ea5e4f6ae..53be2a94d 100755
--- a/java-client/scripts/download_thrift.sh
+++ b/java-client/scripts/download_thrift.sh
@@ -21,7 +21,7 @@
function GenThriftTool() {
set -e
- wget --progress=dot:giga
https://github.com/apache/thrift/archive/refs/tags/0.11.0.tar.gz -O
thrift-0.11.0.tar.gz
+ wget --progress=dot:giga
https://archive.apache.org/dist/thrift/0.11.0/thrift-0.11.0.tar.gz -O
thrift-0.11.0.tar.gz
tar xzf thrift-0.11.0.tar.gz
pushd thrift-0.11.0
./bootstrap.sh
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
