You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by do...@apache.org on 2022/01/05 09:42:09 UTC
[incubator-inlong] branch master updated: [INLONG-2097][Agent] change wget command (#2101)
This is an automated email from the ASF dual-hosted git repository.
dockerzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-inlong.git
The following commit(s) were added to refs/heads/master by this push:
new 561aa20 [INLONG-2097][Agent] change wget command (#2101)
561aa20 is described below
commit 561aa209bcbd36cfdebdea00b78b730ef583aed8
Author: dockerzhang <do...@apache.org>
AuthorDate: Wed Jan 5 17:42:01 2022 +0800
[INLONG-2097][Agent] change wget command (#2101)
Co-authored-by: dockerzhang <do...@tencent.com>
---
inlong-tubemq/tubemq-docker/tubemq-build/Dockerfile | 8 ++++----
inlong-tubemq/tubemq-docker/tubemq-cpp/Dockerfile | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/inlong-tubemq/tubemq-docker/tubemq-build/Dockerfile b/inlong-tubemq/tubemq-docker/tubemq-build/Dockerfile
index c531bce..70b9ecd 100644
--- a/inlong-tubemq/tubemq-docker/tubemq-build/Dockerfile
+++ b/inlong-tubemq/tubemq-docker/tubemq-build/Dockerfile
@@ -21,11 +21,11 @@ FROM gcc:5.4.0 as protobuf
RUN apt-get update && apt-get install -y unzip \
&& rm -rf /var/lib/apt/lists/
ARG PROTOBUF_VERSION=2.5.0
-RUN wget -O "/tmp/protobuf-${PROTOBUF_VERSION}.zip" "https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOBUF_VERSION}/protobuf-${PROTOBUF_VERSION}.zip" \
- && unzip "/tmp/protobuf-${PROTOBUF_VERSION}.zip" -d "/opt/" \
+RUN curl -LOk "https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOBUF_VERSION}/protobuf-${PROTOBUF_VERSION}.zip" \
+ && unzip "protobuf-${PROTOBUF_VERSION}.zip" -d "/opt/" \
&& cd /opt/protobuf-${PROTOBUF_VERSION} \
&& ./configure --prefix=/usr && make && make DESTDIR=/protobuf/ install \
- && rm -f "/tmp/protobuf-${PROTOBUF_VERSION}.zip"
+ && rm -f "protobuf-${PROTOBUF_VERSION}.zip"
# for building tubemq
FROM maven:3-openjdk-8
WORKDIR /tubemq/
@@ -34,4 +34,4 @@ COPY --from=protobuf /protobuf/usr/include/* /usr/include/
COPY --from=protobuf /protobuf/usr/lib/* /usr/lib/
# ADD settings.xml /root/.m2/
# mvn command
-ENTRYPOINT ["/usr/bin/mvn"]
\ No newline at end of file
+ENTRYPOINT ["/usr/bin/mvn"]
diff --git a/inlong-tubemq/tubemq-docker/tubemq-cpp/Dockerfile b/inlong-tubemq/tubemq-docker/tubemq-cpp/Dockerfile
index 5fa16ee..4c38c18 100644
--- a/inlong-tubemq/tubemq-docker/tubemq-cpp/Dockerfile
+++ b/inlong-tubemq/tubemq-docker/tubemq-cpp/Dockerfile
@@ -18,15 +18,15 @@
#
FROM rikorose/gcc-cmake:gcc-4
RUN apt-get remove openssl -y
-RUN wget https://www.openssl.org/source/openssl-1.1.0f.tar.gz --no-check-certificate \
+RUN curl -LOk https://www.openssl.org/source/openssl-1.1.0f.tar.gz \
&& tar -xzvf openssl-1.1.0f.tar.gz \
&& rm openssl-1.1.0f.tar.gz && cd openssl-1.1.0f \
&& ./config && make && make install
-RUN wget https://github.com/protocolbuffers/protobuf/releases/download/v3.13.0/protobuf-cpp-3.13.0.tar.gz \
+RUN curl -LOk https://github.com/protocolbuffers/protobuf/releases/download/v3.13.0/protobuf-cpp-3.13.0.tar.gz \
&& tar -xzvf protobuf-cpp-3.13.0.tar.gz && rm protobuf-cpp-3.13.0.tar.gz \
&& cd protobuf-3.13.0 && ./autogen.sh \
&& ./configure CXXFLAGS=-fPIC && make \
&& make install && cd /usr/local/lib \
&& ln -snf libprotobuf.so libprotobuf.so.24
ENV LD_LIBRARY_PATH=/usr/local/lib:/usr/local/lib64/
-WORKDIR /tubemq-cpp/
\ No newline at end of file
+WORKDIR /tubemq-cpp/