Merge pull request #571 from sebadob/dockerfile-cleanup

Dockerfile cleanup
sebadob · Sep 25, 2024 · 67e7811 · 67e7811
2 parents b36a796 + 7d2b762
commit 67e7811
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 221 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -19,7 +19,7 @@ strip = true
 panic = "abort"
 
 [patch.crates-io]
-hiqlite = { git = "https://github.com/sebadob/hiqlite.git", package = "hiqlite" }
+#hiqlite = { git = "https://github.com/sebadob/hiqlite.git", package = "hiqlite" }
 #hiqlite = { path = "../hiqlite/hiqlite", package = "hiqlite" }
 
 [workspace.dependencies]
@@ -54,7 +54,7 @@ futures = "0.3"
 futures-util = "0.3"
 gethostname = "0.5.0"
 hex = { version = "0.4", features = ["serde"] }
-hiqlite = { version = "0.2.0", default-features = false, features = ["cache", "listen_notify"] }
+hiqlite = { version = "0.2.1", default-features = false, features = ["cache", "listen_notify"] }
 hmac-sha256 = { version = "1.1.7", features = ["traits010"] }
 hmac-sha512 = { version = "1.1.5", features = ["traits010", "sha384"] }
 image = { version = "0.25.1", default-features = false, features = [

diff --git a/Dockerfile_builder b/Dockerfile_builder
@@ -2,6 +2,7 @@ ARG IMAGE
 
 FROM $IMAGE AS openssl
 
+ENV DEBIAN_FRONTEND=noninteractive
 ENV LD_LIBRARY_PATH="${PATH}:/usr/local/lib64"
 ENV PKG_CONFIG_PATH="/usr/local/lib64/pkgconfig"
 ENV MAKEFLAGS="-j32"
@@ -35,6 +36,7 @@ EOF
 
 FROM $IMAGE
 
+ENV DEBIAN_FRONTEND=noninteractive
 ENV PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig
 ENV LD_LIBRARY_PATH="${PATH}:/usr/local/lib64"
 ENV PKG_CONFIG_PATH="/usr/local/lib64/pkgconfig"

diff --git a/Dockerfile_builder_musl b/Dockerfile_builder_musl
diff --git a/Dockerfile_builder_openssl_manual b/Dockerfile_builder_openssl_manual