Merge pull request #932 from tursodatabase/fix-docker-build

fix docker build
tursodatabase · Jan 24, 2024 · 076fb28 · 076fb28
2 parents 7970efd + dd0e23c
commit 076fb28
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -3,7 +3,7 @@ FROM rust:slim-bullseye AS chef
 RUN apt update \
     && apt install -y libclang-dev clang \
         build-essential tcl protobuf-compiler file \
-        libssl-dev pkg-config git tcl \
+        libssl-dev pkg-config git tcl cmake \
     && apt clean \
     && rm -rf /var/lib/apt/lists/*
 

diff --git a/libsql-ffi/build.rs b/libsql-ffi/build.rs
@@ -252,7 +252,8 @@ fn build_multiple_ciphers(out_dir: &str, out_path: &Path) {
     #[cfg(feature = "libsql-wasm-experimental")]
     cmd.arg("-DLIBSQL_ENABLE_WASM_RUNTIME");
 
-    cmd.output().unwrap();
+    let out = cmd.output().unwrap();
+    assert!(out.status.success(), "{:?}", out);
     std::fs::copy(
         format!("{BUNDLED_DIR}/SQLite3MultipleCiphers/build/libsqlite3mc_static.a"),
         format!("{out_dir}/libsqlite3mc.a"),

diff --git a/libsql-ffi/bundled/SQLite3MultipleCiphers/CMakeLists.txt b/libsql-ffi/bundled/SQLite3MultipleCiphers/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.24.0.0)
+cmake_minimum_required(VERSION 3.18.0.0)
 project(sqlite3mc)
 
 # Helper macro