update docker

apache · Dec 5, 2023 · a71cf1c · a71cf1c
1 parent ca7657b
commit a71cf1c
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 28 deletions.
diff --git a/.github/workflows/lint_and_test_cpp.yaml b/.github/workflows/lint_and_test_cpp.yaml
@@ -659,9 +659,6 @@ jobs:
         run: |
           # Preinstalled softwares: https://github.com/actions/virtual-environments/blob/main/images/macos/macos-12-Readme.md
           brew install ccache
-          brew install snappy
-          brew install lz4
-          brew install zstd
           brew install openssl@1.1
       - uses: actions/checkout@v3
       - name: Setup cache

diff --git a/docker/pegasus-build-env/centos7/Dockerfile b/docker/pegasus-build-env/centos7/Dockerfile
@@ -42,12 +42,6 @@ RUN yum -y install centos-release-scl \
                    which \
                    openssl-devel \
                    libaio-devel \
-                   snappy-devel \
-                   bzip2-devel \
-                   zlib \
-                   zlib-devel \
-                   libzstd-devel \
-                   lz4-devel \
                    bison \
                    flex \
                    krb5-devel \

diff --git a/docker/pegasus-build-env/ubuntu1804/Dockerfile b/docker/pegasus-build-env/ubuntu1804/Dockerfile
@@ -30,12 +30,6 @@ RUN apt-get update -y; \
                        openjdk-8-jdk \
                        python3-pip \
                        libaio-dev \
-                       libsnappy-dev \
-                       libbz2-dev \
-                       libzstd-dev \
-                       liblz4-dev \
-                       zlib1g \
-                       zlib1g.dev \
                        patch \
                        netcat \
                        wget \

diff --git a/docker/pegasus-build-env/ubuntu2004/Dockerfile b/docker/pegasus-build-env/ubuntu2004/Dockerfile
@@ -30,12 +30,6 @@ RUN apt-get update -y; \
                        openjdk-8-jdk \
                        python3-pip \
                        libaio-dev \
-                       libsnappy-dev \
-                       libbz2-dev \
-                       libzstd-dev \
-                       liblz4-dev \
-                       zlib1g \
-                       zlib1g.dev \
                        patch \
                        netcat \
                        wget \

diff --git a/docker/pegasus-build-env/ubuntu2204/Dockerfile b/docker/pegasus-build-env/ubuntu2204/Dockerfile
@@ -31,12 +31,6 @@ RUN apt-get update -y; \
                        pkg-config \
                        python3-pip \
                        libaio-dev \
-                       libsnappy-dev \
-                       libbz2-dev \
-                       libzstd-dev \
-                       liblz4-dev \
-                       zlib1g \
-                       zlib1g.dev \
                        patch \
                        netcat \
                        wget \

diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
@@ -465,7 +465,7 @@ ExternalProject_Add(rocksdb
         PATCH_COMMAND patch -p1 < ${TP_DIR}/fix_rocksdb-cmake-PORTABLE-option.patch
         COMMAND rm -rf ${TP_DIR}/build/Source/rocksdb/plugin/encfs
         COMMAND git clone -b main --depth=1 https://github.com/pegasus-kv/encfs.git ${TP_DIR}/build/Source/rocksdb/plugin/encfs
-        DEPENDS googletest jemalloc
+        DEPENDS googletest jemalloc lz4 snappy zstd
         CMAKE_ARGS ${ROCKSDB_OPTIONS}
         DOWNLOAD_EXTRACT_TIMESTAMP true
         DOWNLOAD_NO_PROGRESS true