chore(docker): remove OpenSSL from Docker build scripts

cartridge-gg · Sep 4, 2024 · 35c420d · 35c420d
1 parent 60e075b
commit 35c420d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/build/cargo-build.sh b/build/cargo-build.sh
@@ -5,8 +5,6 @@ elif [[ "${TARGETARCH}" == "arm64" ]]; then
     PKG_CONFIG_ALLOW_CROSS=1 \
     RUSTFLAGS="-C linker=aarch64-linux-gnu-gcc -L/usr/aarch64-linux-gnu/lib -L/build/sysroot/usr/lib/aarch64-linux-gnu" \
     C_INCLUDE_PATH=/build/sysroot/usr/include \
-    OPENSSL_LIB_DIR=/build/sysroot/usr/lib/aarch64-linux-gnu \
-    OPENSSL_INCLUDE_DIR=/build/sysroot/usr/include/aarch64-linux-gnu \
     JEMALLOC_SYS_WITH_LG_PAGE=16 \
     cargo build --target aarch64-unknown-linux-gnu $*
 fi
diff --git a/build/cargo-chef-cook.sh b/build/cargo-chef-cook.sh
@@ -5,8 +5,6 @@ elif [[ "${TARGETARCH}" == "arm64" ]]; then
     PKG_CONFIG_ALLOW_CROSS=1 \
     RUSTFLAGS="-C linker=aarch64-linux-gnu-gcc -L/usr/aarch64-linux-gnu/lib -L/build/sysroot/usr/lib/aarch64-linux-gnu" \
     C_INCLUDE_PATH=/build/sysroot/usr/include \
-    OPENSSL_LIB_DIR=/build/sysroot/usr/lib/aarch64-linux-gnu \
-    OPENSSL_INCLUDE_DIR=/build/sysroot/usr/include/aarch64-linux-gnu \
     JEMALLOC_SYS_WITH_LG_PAGE=16 \
     cargo chef cook --target aarch64-unknown-linux-gnu $*
 fi
diff --git a/build/prepare.sh b/build/prepare.sh
@@ -1,15 +1,13 @@
 #!/bin/bash -e
 if [[ "${TARGETARCH}" == "amd64" ]]; then
     apt-get update
-    DEBIAN_FRONTEND=noninteractive apt-get install -y pkg-config libssl-dev libzstd-dev protobuf-compiler make
+    DEBIAN_FRONTEND=noninteractive apt-get install -y pkg-config libzstd-dev protobuf-compiler make
 elif [[ "${TARGETARCH}" == "arm64" ]]; then
     echo "deb [arch=arm64] http://deb.debian.org/debian bookworm main" >>/etc/apt/sources.list
     apt-get update
-    DEBIAN_FRONTEND=noninteractive apt-get install -y pkg-config libssl-dev libzstd-dev protobuf-compiler gcc-aarch64-linux-gnu libc6-arm64-cross libc6-dev-arm64-cross make
-    apt-get download libssl-dev:arm64 libssl3:arm64 libzstd-dev:arm64
+    DEBIAN_FRONTEND=noninteractive apt-get install -y pkg-config libzstd-dev protobuf-compiler gcc-aarch64-linux-gnu libc6-arm64-cross libc6-dev-arm64-cross make
+    apt-get download libzstd-dev:arm64
     mkdir -p /build/sysroot
-    dpkg -x libssl-dev_*.deb /build/sysroot/
-    dpkg -x libssl3_*.deb /build/sysroot/
     dpkg -x libzstd-dev_*.deb /build/sysroot/
     rustup target add aarch64-unknown-linux-gnu
 fi