Testing removal of OpenSSL vendored option

Author: jclapis

Cargo.lock

@@ -7,9 +7,6 @@ edition = "2021"
 rust-version = "1.83"
 version = "0.7.0-rc.2"
 
-[workspace.features]
-openssl-vendored = ["crates/common/openssl-vendored"]
-
 [workspace.dependencies]
 aes = "0.8"
 alloy = { version = "0.12", features = [

Cargo.toml

@@ -41,7 +41,3 @@ tree_hash_derive.workspace = true
 unicode-normalization.workspace = true
 url.workspace = true
 jsonwebtoken.workspace = true
-openssl = { version = "0.10", optional = true, features = ["vendored"] }
-
-[features]
-openssl-vendored = ["openssl/vendored"]

crates/common/Cargo.toml

@@ -1,15 +1,15 @@
 # This will be the main build image
 FROM --platform=${BUILDPLATFORM} lukemathwalker/cargo-chef:latest-rust-1.83 AS chef
-ARG TARGETOS TARGETARCH BUILDPLATFORM OPENSSL_VENDORED TARGET_CRATE
+ARG TARGETOS TARGETARCH BUILDPLATFORM TARGET_CRATE
 WORKDIR /app
 
 FROM --platform=${BUILDPLATFORM} chef AS planner
-ARG TARGETOS TARGETARCH BUILDPLATFORM OPENSSL_VENDORED TARGET_CRATE
+ARG TARGETOS TARGETARCH BUILDPLATFORM TARGET_CRATE
 COPY . .
 RUN cargo chef prepare --recipe-path recipe.json
 
 FROM --platform=${BUILDPLATFORM} chef AS builder
-ARG TARGETOS TARGETARCH BUILDPLATFORM OPENSSL_VENDORED TARGET_CRATE
+ARG TARGETOS TARGETARCH BUILDPLATFORM TARGET_CRATE
 RUN test -n "$TARGET_CRATE" || (echo "TARGET_CRATE must be set to the service / binary you want to build" && false)
 ENV BUILD_VAR_SCRIPT=/tmp/env.sh
 COPY --from=planner /app/recipe.json recipe.json
@@ -18,43 +18,33 @@ COPY --from=planner /app/recipe.json recipe.json
 RUN if [ "$BUILDPLATFORM" = "linux/amd64" -a "$TARGETARCH" = "arm64" ]; then \
       # We're on x64, cross-compiling for arm64
       rustup target add aarch64-unknown-linux-gnu && \
+      dpkg --add-architecture arm64 && \
       apt update && \
-      apt install -y gcc-aarch64-linux-gnu && \
+      apt install -y gcc-aarch64-linux-gnu libssl-dev:arm64 zlib1g-dev:arm64 && \
       echo "#!/bin/sh" > ${BUILD_VAR_SCRIPT} && \
       echo "export TARGET=aarch64-unknown-linux-gnu" >> ${BUILD_VAR_SCRIPT} && \
       echo "export TARGET_FLAG=--target=aarch64-unknown-linux-gnu" >> ${BUILD_VAR_SCRIPT} && \
       echo "export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=/usr/bin/aarch64-linux-gnu-gcc" >> ${BUILD_VAR_SCRIPT} && \
       echo "export RUSTFLAGS=\"-L /usr/aarch64-linux-gnu/lib -L $(dirname $(aarch64-linux-gnu-gcc -print-libgcc-file-name))\"" >> ${BUILD_VAR_SCRIPT} && \
-      if [ "$OPENSSL_VENDORED" != "true" ]; then \
-        # If we're linking to OpenSSL dynamically, we have to set it up for cross-compilation
-        dpkg --add-architecture arm64 && \
-        apt update && \
-        apt install -y libssl-dev:arm64 zlib1g-dev:arm64 && \
-        echo "export PKG_CONFIG_ALLOW_CROSS=true" >> ${BUILD_VAR_SCRIPT} && \
-        echo "export PKG_CONFIG_LIBDIR=/usr/lib/aarch64-linux-gnu/pkgconfig" >> ${BUILD_VAR_SCRIPT} && \
-        echo "export OPENSSL_INCLUDE_DIR=/usr/include/aarch64-linux-gnu" >> ${BUILD_VAR_SCRIPT} && \
-        echo "export OPENSSL_LIB_DIR=/usr/lib/aarch64-linux-gnu" >> ${BUILD_VAR_SCRIPT}; \
-      fi; \
+      echo "export PKG_CONFIG_ALLOW_CROSS=true" >> ${BUILD_VAR_SCRIPT} && \
+      echo "export PKG_CONFIG_LIBDIR=/usr/lib/aarch64-linux-gnu/pkgconfig" >> ${BUILD_VAR_SCRIPT} && \
+      echo "export OPENSSL_INCLUDE_DIR=/usr/include/aarch64-linux-gnu" >> ${BUILD_VAR_SCRIPT} && \
+      echo "export OPENSSL_LIB_DIR=/usr/lib/aarch64-linux-gnu" >> ${BUILD_VAR_SCRIPT}; \
     elif [ "$BUILDPLATFORM" = "linux/arm64" -a "$TARGETARCH" = "amd64" ]; then \
       # We're on arm64, cross-compiling for x64
       rustup target add x86_64-unknown-linux-gnu && \
+      dpkg --add-architecture amd64 && \
       apt update && \
-      apt install -y gcc-x86-64-linux-gnu && \
+      apt install -y gcc-x86-64-linux-gnu libssl-dev:amd64 zlib1g-dev:amd64 && \
       echo "#!/bin/sh" > ${BUILD_VAR_SCRIPT} && \
       echo "export TARGET=x86_64-unknown-linux-gnu" >> ${BUILD_VAR_SCRIPT} && \
       echo "export TARGET_FLAG=--target=x86_64-unknown-linux-gnu" >> ${BUILD_VAR_SCRIPT} && \
       echo "export CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER=/usr/bin/x86_64-linux-gnu-gcc" >> ${BUILD_VAR_SCRIPT} && \
       echo "export RUSTFLAGS=\"-L /usr/x86_64-linux-gnu/lib -L $(dirname $(x86_64-linux-gnu-gcc -print-libgcc-file-name))\"" >> ${BUILD_VAR_SCRIPT} && \
-      if [ "$OPENSSL_VENDORED" != "true" ]; then \
-        # If we're linking to OpenSSL dynamically, we have to set it up for cross-compilation
-        dpkg --add-architecture amd64 && \
-        apt update && \
-        apt install -y libssl-dev:amd64 zlib1g-dev:amd64 && \
-        echo "export PKG_CONFIG_ALLOW_CROSS=true" >> ${BUILD_VAR_SCRIPT} && \
-        echo "export PKG_CONFIG_LIBDIR=/usr/lib/x86_64-linux-gnu/pkgconfig" >> ${BUILD_VAR_SCRIPT} && \
-        echo "export OPENSSL_INCLUDE_DIR=/usr/include/x86_64-linux-gnu" >> ${BUILD_VAR_SCRIPT} && \
-        echo "export OPENSSL_LIB_DIR=/usr/lib/x86_64-linux-gnu" >> ${BUILD_VAR_SCRIPT}; \
-      fi; \
+      echo "export PKG_CONFIG_ALLOW_CROSS=true" >> ${BUILD_VAR_SCRIPT} && \
+      echo "export PKG_CONFIG_LIBDIR=/usr/lib/x86_64-linux-gnu/pkgconfig" >> ${BUILD_VAR_SCRIPT} && \
+      echo "export OPENSSL_INCLUDE_DIR=/usr/include/x86_64-linux-gnu" >> ${BUILD_VAR_SCRIPT} && \
+      echo "export OPENSSL_LIB_DIR=/usr/lib/x86_64-linux-gnu" >> ${BUILD_VAR_SCRIPT}; \
     fi
 
 # Run cook to prep the build 
@@ -64,14 +54,8 @@ RUN if [ -f ${BUILD_VAR_SCRIPT} ]; then \
     else \
       echo "No cross-compilation needed"; \
     fi && \
-    if [ "$OPENSSL_VENDORED" = "true" ]; then \
-      echo "Using vendored OpenSSL" && \
-      FEATURE_OPENSSL_VENDORED='--features openssl-vendored'; \
-    else \
-      echo "Using system OpenSSL"; \
-    fi && \
     export GIT_HASH=$(git rev-parse HEAD) && \
-    cargo chef cook ${TARGET_FLAG} --release --recipe-path recipe.json ${FEATURE_OPENSSL_VENDORED}
+    cargo chef cook ${TARGET_FLAG} --release --recipe-path recipe.json
 
 # Get the latest Protoc since the one in the Debian repo is incredibly old
 COPY provisioning/protoc.sh provisioning/protoc.sh
@@ -88,14 +72,8 @@ RUN if [ -f ${BUILD_VAR_SCRIPT} ]; then \
     else \
       echo "No cross-compilation needed"; \
     fi && \
-    if [ "$OPENSSL_VENDORED" = "true" ]; then \
-      echo "Using vendored OpenSSL" && \
-      FEATURE_OPENSSL_VENDORED='--features openssl-vendored'; \
-    else \
-      echo "Using system OpenSSL"; \
-    fi && \
     export GIT_HASH=$(git rev-parse HEAD) && \
-    cargo build ${TARGET_FLAG} --release --bin ${TARGET_CRATE} ${FEATURE_OPENSSL_VENDORED} && \
+    cargo build ${TARGET_FLAG} --release --bin ${TARGET_CRATE} && \
     if [ ! -z "$TARGET" ]; then \
       # If we're cross-compiling, we need to move the binary out of the target dir
       mv target/${TARGET}/release/${TARGET_CRATE} target/release/${TARGET_CRATE}; \