feat: version update & docker fix

ADORSYS-GIS · Jan 22, 2025 · cba67fd · cba67fd
1 parent d03339b
commit cba67fd
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 10 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,8 @@
+.github
+.idea
+helm
+scripts
+.dockerignore
+.gitignore
+compose.yaml
+target
diff --git a/Dockerfile b/Dockerfile
@@ -10,7 +10,15 @@ COPY ./ ./
 
 RUN cargo build --manifest-path wazuh-cert-oauth2/Cargo.toml --release
 
-FROM gcr.io/distroless/base-debian12
+FROM debian:12 as dep
+
+RUN apt-get update && apt-get install -y gcc
+
+# Dependencies for libpq (used by 
+RUN mkdir /deps && \
+  cp /usr/lib/*-linux-gnu/libgcc_s.so.* /deps
+
+FROM gcr.io/distroless/base-debian12:nonroot
 
 LABEL maintainer="[email protected]"
 LABEL org.opencontainers.image.description="adorsys Cameroon"
@@ -20,6 +28,7 @@ ENV RUST_LOG=warn
 WORKDIR /app
 
 COPY --from=builder /app/wazuh-cert-oauth2/target/release/wazuh-cert-oauth2 /app/wazuh-cert-oauth2
+COPY --from=dep /deps /usr/lib/
 
 EXPOSE 8000
 

diff --git a/wazuh-cert-oauth2-client/Cargo.lock b/wazuh-cert-oauth2-client/Cargo.lock
diff --git a/wazuh-cert-oauth2-model/Cargo.lock b/wazuh-cert-oauth2-model/Cargo.lock
diff --git a/wazuh-cert-oauth2/Cargo.lock b/wazuh-cert-oauth2/Cargo.lock
diff --git a/wazuh-cert-oauth2/Cargo.toml b/wazuh-cert-oauth2/Cargo.toml
@@ -7,7 +7,6 @@ edition = "2021"
 tokio = { version = "1.38.1", features = ["full"] }
 anyhow = "1.0.86"
 thiserror = { version = "1.0.62" }
-log = "0.4.22"
 env_logger = "0.11.3"
 rocket = { version = "0.5.1", features = ["tls", "json", "http2"] }
 reqwest = { version = "0", features = ["json"] }
@@ -16,7 +15,6 @@ openssl = "0.10.66"
 rand = "0.8.5"
 wazuh-cert-oauth2-model = { path = "../wazuh-cert-oauth2-model" }
 serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
 
 [default.tls]
 certs = "/usr/share/wazuh-cert-oauth2/certs/cert.pem"