'Generic Commit'

Dockerfile.dropshell-build

@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM gitea.jde.nz/public/dropshell-build-base:latest AS builder
+FROM gitea.jde.nz/public/dropshell-build-base:latest AS builder
 
 ARG PROJECT
 ARG CMAKE_BUILD_TYPE=Debug
@@ -6,11 +6,25 @@ ARG CMAKE_BUILD_TYPE=Debug
 # Set working directory
 WORKDIR /app
 
+# Create cache directories
+RUN mkdir -p /ccache /build-cache
+
+# Set up ccache
+ENV CCACHE_DIR=/ccache
+ENV CCACHE_COMPILERCHECK=content
+ENV CCACHE_MAXSIZE=2G
+
 COPY . .
 
-# Configure and build with ccache
-RUN  --mount=type=cache,target=/build \
+# Multi-architecture OpenSSL detection handled in cmake step
+
+# Configure and build with ccache using cache mounts
+RUN --mount=type=cache,target=/ccache \
+    --mount=type=cache,target=/build \
     mkdir -p /build && \
+    SSL_LIB=$(find /usr/local -name "libssl.a" | head -1) && \
+    CRYPTO_LIB=$(find /usr/local -name "libcrypto.a" | head -1) && \
+    echo "Found SSL: $SSL_LIB, Crypto: $CRYPTO_LIB" && \
     cmake -G Ninja -S /app -B /build \
     -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
     -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
@@ -25,16 +39,25 @@ RUN  --mount=type=cache,target=/build \
     -DPROJECT_NAME="${PROJECT}" \
     -DCMAKE_STRIP=OFF \
     -DIGNORE_DYNAMIC_LOADING=ON \
+    -DOPENSSL_ROOT_DIR=/usr/local \
+    -DOPENSSL_USE_STATIC_LIBS=TRUE \
+    -DOPENSSL_SSL_LIBRARY="$SSL_LIB" \
+    -DOPENSSL_CRYPTO_LIBRARY="$CRYPTO_LIB" \
+    -DOPENSSL_INCLUDE_DIR=/usr/local/include \
     ${CMAKE_TOOLCHAIN_FILE:+-DCMAKE_TOOLCHAIN_FILE=$CMAKE_TOOLCHAIN_FILE}
 
+# Build with cache mounts
+RUN --mount=type=cache,target=/ccache \
+    --mount=type=cache,target=/build \
+    cmake --build /build --target run_prebuild_script
 
-# Explicitly build dependencies first (cached separately)
-RUN --mount=type=cache,target=/build cmake --build /build --target run_prebuild_script
-
-RUN --mount=type=cache,target=/build cmake --build /build
+RUN --mount=type=cache,target=/ccache \
+    --mount=type=cache,target=/build \
+    cmake --build /build
 
 # Copy the built executable to a regular directory for the final stage
-RUN --mount=type=cache,target=/build mkdir -p /output && \
+RUN --mount=type=cache,target=/build \
+    mkdir -p /output && \
     find /build -type f -executable -name "*${PROJECT}*" -exec cp {} /output/${PROJECT} \; || \
     find /build -type f -executable -exec cp {} /output/${PROJECT} \;