Skip to content

Commit 1d86a68

Browse files
adamretteradamretter
committed
Use CentOS 7 ZStd package instead of building ZStd from source
1 parent 9742ad9 commit 1d86a68

File tree

5 files changed

+5
-60
lines changed

5 files changed

+5
-60
lines changed

‎centos7_arm64v8/Dockerfile‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@ ARG GIT_VERSION=2.48.1
2424
ARG CMAKE_VERSION_SHORT=3.31
2525
ARG CMAKE_VERSION=3.31.8
2626

27-
# version of zstd to compile
28-
ARG ZSTD_VERSION=1.5.7
29-
3027
# version of gflags to compile
3128
ARG GFLAGS_VERSION=2.2.2
3229

@@ -198,7 +195,7 @@ RUN \
198195
&& ln -s libcurl.so.4.8.0 libcurl.so.4 \
199196
&& ldconfig \
200197
&& popd \
201-
&& yum --setopt=tsflags=nodocs -y install bzip2-devel lz4-devel snappy-devel \
198+
&& yum --setopt=tsflags=nodocs -y install bzip2-devel lz4-devel snappy-devel libzstd-devel \
202199
&& yum --setopt=tsflags=nodocs -y install bellsoft-java8 \
203200
&& yum -y clean all \
204201
&& wget https://cmake.org/files/v$CMAKE_VERSION_SHORT/cmake-$CMAKE_VERSION.tar.gz \
@@ -209,13 +206,6 @@ RUN \
209206
&& scl enable devtoolset-7 'make install' \
210207
&& popd \
211208
&& rm -rf cmake-$CMAKE_VERSION cmake-$CMAKE_VERSION.tar.gz \
212-
&& wget https://github.com/facebook/zstd/releases/download/v$ZSTD_VERSION/zstd-$ZSTD_VERSION.tar.gz \
213-
&& tar zxvf zstd-$ZSTD_VERSION.tar.gz \
214-
&& pushd zstd-$ZSTD_VERSION \
215-
&& scl enable devtoolset-7 'make -j $JOBS' \
216-
&& scl enable devtoolset-7 'make prefix=/usr install' \
217-
&& popd \
218-
&& rm -rf zstd-$ZSTD_VERSION zstd-$ZSTD_VERSION.tar.gz \
219209
&& wget -O gflags-$GFLAGS_VERSION.tar.gz https://github.com/gflags/gflags/archive/refs/tags/v$GFLAGS_VERSION.tar.gz \
220210
&& tar zxvf gflags-$GFLAGS_VERSION.tar.gz \
221211
&& mkdir gflags-$GFLAGS_VERSION/build \
@@ -229,4 +219,3 @@ RUN \
229219

230220
ENV JAVA_HOME=/usr/lib/jvm/bellsoft-java8.aarch64
231221
ENV PATH=$JAVA_HOME/bin:$PATH
232-
ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib

‎centos7_ppc64le/Dockerfile‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@ ARG GIT_VERSION=2.48.1
2424
ARG CMAKE_VERSION_SHORT=3.31
2525
ARG CMAKE_VERSION=3.31.8
2626

27-
# version of zstd to compile
28-
ARG ZSTD_VERSION=1.5.7
29-
3027
# version of gflags to compile
3128
ARG GFLAGS_VERSION=2.2.2
3229

@@ -198,7 +195,7 @@ RUN \
198195
&& ln -s libcurl.so.4.8.0 libcurl.so.4 \
199196
&& ldconfig \
200197
&& popd \
201-
&& yum --setopt=tsflags=nodocs -y install bzip2-devel lz4-devel snappy-devel \
198+
&& yum --setopt=tsflags=nodocs -y install bzip2-devel lz4-devel snappy-devel libzstd-devel \
202199
&& yum --setopt=tsflags=nodocs -y install bellsoft-java8 \
203200
&& yum -y clean all \
204201
&& wget https://cmake.org/files/v$CMAKE_VERSION_SHORT/cmake-$CMAKE_VERSION.tar.gz \
@@ -209,13 +206,6 @@ RUN \
209206
&& scl enable devtoolset-7 'make install' \
210207
&& popd \
211208
&& rm -rf cmake-$CMAKE_VERSION cmake-$CMAKE_VERSION.tar.gz \
212-
&& wget https://github.com/facebook/zstd/releases/download/v$ZSTD_VERSION/zstd-$ZSTD_VERSION.tar.gz \
213-
&& tar zxvf zstd-$ZSTD_VERSION.tar.gz \
214-
&& pushd zstd-$ZSTD_VERSION \
215-
&& scl enable devtoolset-7 'make -j $JOBS' \
216-
&& scl enable devtoolset-7 'make prefix=/usr install' \
217-
&& popd \
218-
&& rm -rf zstd-$ZSTD_VERSION zstd-$ZSTD_VERSION.tar.gz \
219209
&& wget -O gflags-$GFLAGS_VERSION.tar.gz https://github.com/gflags/gflags/archive/refs/tags/v$GFLAGS_VERSION.tar.gz \
220210
&& tar zxvf gflags-$GFLAGS_VERSION.tar.gz \
221211
&& mkdir gflags-$GFLAGS_VERSION/build \
@@ -229,4 +219,3 @@ RUN \
229219

230220
ENV JAVA_HOME=/usr/lib/jvm/bellsoft-java8.ppc64le
231221
ENV PATH=$JAVA_HOME/bin:$PATH
232-
ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib

‎centos7_s390x/Dockerfile‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@ ARG GIT_VERSION=2.48.1
2424
ARG CMAKE_VERSION_SHORT=3.31
2525
ARG CMAKE_VERSION=3.31.8
2626

27-
# version of zstd to compile
28-
ARG ZSTD_VERSION=1.5.7
29-
3027
# version of gflags to compile
3128
ARG GFLAGS_VERSION=2.2.2
3229

@@ -191,7 +188,7 @@ RUN \
191188
&& ln -s libcurl.so.4.8.0 libcurl.so.4 \
192189
&& ldconfig \
193190
&& popd \
194-
&& yum --setopt=tsflags=nodocs -y install bzip2-devel lz4-devel snappy-devel \
191+
&& yum --setopt=tsflags=nodocs -y install bzip2-devel lz4-devel snappy-devel libzstd-devel \
195192
&& yum --setopt=tsflags=nodocs -y install java-1.8.0-openjdk-devel \
196193
&& yum -y clean all \
197194
&& wget https://cmake.org/files/v$CMAKE_VERSION_SHORT/cmake-$CMAKE_VERSION.tar.gz \
@@ -202,13 +199,6 @@ RUN \
202199
&& scl enable devtoolset-7 'make install' \
203200
&& popd \
204201
&& rm -rf cmake-$CMAKE_VERSION cmake-$CMAKE_VERSION.tar.gz \
205-
&& wget https://github.com/facebook/zstd/releases/download/v$ZSTD_VERSION/zstd-$ZSTD_VERSION.tar.gz \
206-
&& tar zxvf zstd-$ZSTD_VERSION.tar.gz \
207-
&& pushd zstd-$ZSTD_VERSION \
208-
&& scl enable devtoolset-7 'make -j $JOBS' \
209-
&& scl enable devtoolset-7 'make prefix=/usr install' \
210-
&& popd \
211-
&& rm -rf zstd-$ZSTD_VERSION zstd-$ZSTD_VERSION.tar.gz \
212202
&& wget -O gflags-$GFLAGS_VERSION.tar.gz https://github.com/gflags/gflags/archive/refs/tags/v$GFLAGS_VERSION.tar.gz \
213203
&& tar zxvf gflags-$GFLAGS_VERSION.tar.gz \
214204
&& mkdir gflags-$GFLAGS_VERSION/build \
@@ -222,4 +212,3 @@ RUN \
222212

223213
ENV JAVA_HOME=/usr/lib/jvm/java-1.8.0
224214
ENV PATH=$JAVA_HOME:$PATH
225-
ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib

‎centos7_x64/Dockerfile‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@ ARG GIT_VERSION=2.48.1
2424
ARG CMAKE_VERSION_SHORT=3.31
2525
ARG CMAKE_VERSION=3.31.8
2626

27-
# version of zstd to compile
28-
ARG ZSTD_VERSION=1.5.7
29-
3027
# version of gflags to compile
3128
ARG GFLAGS_VERSION=2.2.2
3229

@@ -198,7 +195,7 @@ RUN \
198195
&& ln -s libcurl.so.4.8.0 libcurl.so.4 \
199196
&& ldconfig \
200197
&& popd \
201-
&& yum --setopt=tsflags=nodocs -y install bzip2-devel lz4-devel snappy-devel \
198+
&& yum --setopt=tsflags=nodocs -y install bzip2-devel lz4-devel snappy-devel libzstd-devel \
202199
&& yum --setopt=tsflags=nodocs -y install bellsoft-java8-full \
203200
&& yum -y clean all \
204201
&& wget https://cmake.org/files/v$CMAKE_VERSION_SHORT/cmake-$CMAKE_VERSION.tar.gz \
@@ -209,13 +206,6 @@ RUN \
209206
&& scl enable devtoolset-7 'make install' \
210207
&& popd \
211208
&& rm -rf cmake-$CMAKE_VERSION cmake-$CMAKE_VERSION.tar.gz \
212-
&& wget https://github.com/facebook/zstd/releases/download/v$ZSTD_VERSION/zstd-$ZSTD_VERSION.tar.gz \
213-
&& tar zxvf zstd-$ZSTD_VERSION.tar.gz \
214-
&& pushd zstd-$ZSTD_VERSION \
215-
&& scl enable devtoolset-7 'make -j $JOBS' \
216-
&& scl enable devtoolset-7 'make prefix=/usr install' \
217-
&& popd \
218-
&& rm -rf zstd-$ZSTD_VERSION zstd-$ZSTD_VERSION.tar.gz \
219209
&& wget -O gflags-$GFLAGS_VERSION.tar.gz https://github.com/gflags/gflags/archive/refs/tags/v$GFLAGS_VERSION.tar.gz \
220210
&& tar zxvf gflags-$GFLAGS_VERSION.tar.gz \
221211
&& mkdir gflags-$GFLAGS_VERSION/build \
@@ -229,4 +219,3 @@ RUN \
229219

230220
ENV JAVA_HOME=/usr/lib/jvm/bellsoft-java8-full.x86_64
231221
ENV PATH=$JAVA_HOME/bin:$PATH
232-
ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib

‎centos7_x86/Dockerfile‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@ ARG GIT_VERSION=2.48.1
2727
ARG CMAKE_VERSION_SHORT=3.31
2828
ARG CMAKE_VERSION=3.31.8
2929

30-
# version of zstd to compile
31-
ARG ZSTD_VERSION=1.5.7
32-
3330
# version of gflags to compile
3431
ARG GFLAGS_VERSION=2.2.2
3532

@@ -193,7 +190,7 @@ RUN \
193190
&& ln -s libcurl.so.4.8.0 libcurl.so.4 \
194191
&& ldconfig \
195192
&& popd \
196-
&& linux32 yum --setopt=tsflags=nodocs -y install bzip2-devel lz4-devel snappy-devel \
193+
&& linux32 yum --setopt=tsflags=nodocs -y install bzip2-devel lz4-devel snappy-devel libzstd-devel \
197194
&& linux32 yum --setopt=tsflags=nodocs -y install bellsoft-java8-full \
198195
&& linux32 yum -y clean all \
199196
&& wget https://cmake.org/files/v$CMAKE_VERSION_SHORT/cmake-$CMAKE_VERSION.tar.gz \
@@ -204,13 +201,6 @@ RUN \
204201
&& linux32 scl enable devtoolset-8 'make install' \
205202
&& popd \
206203
&& rm -rf cmake-$CMAKE_VERSION cmake-$CMAKE_VERSION.tar.gz \
207-
&& wget https://github.com/facebook/zstd/releases/download/v$ZSTD_VERSION/zstd-$ZSTD_VERSION.tar.gz \
208-
&& tar zxvf zstd-$ZSTD_VERSION.tar.gz \
209-
&& pushd zstd-$ZSTD_VERSION \
210-
&& linux32 scl enable devtoolset-8 'make -j $JOBS' \
211-
&& linux32 scl enable devtoolset-8 'make prefix=/usr install' \
212-
&& popd \
213-
&& rm -rf zstd-$ZSTD_VERSION zstd-$ZSTD_VERSION.tar.gz \
214204
&& wget -O gflags-$GFLAGS_VERSION.tar.gz https://github.com/gflags/gflags/archive/refs/tags/v$GFLAGS_VERSION.tar.gz \
215205
&& tar zxvf gflags-$GFLAGS_VERSION.tar.gz \
216206
&& mkdir gflags-$GFLAGS_VERSION/build \
@@ -224,4 +214,3 @@ RUN \
224214

225215
ENV JAVA_HOME=/usr/lib/jvm/bellsoft-java8-full.i386
226216
ENV PATH=$JAVA_HOME/bin:$PATH
227-
ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib

0 commit comments

Comments
 (0)