updated dockerfile to base image to red hat ubi, renamed binary to regex-detector

Author: resoluteCoder

Cargo.lock

@@ -1,5 +1,5 @@
 [package]
-name = "local-detectors"
+name = "regex-detector"
 version = "0.1.0"
 edition = "2021"
 
@@ -14,5 +14,5 @@ tracing = "0.1.41"
 tracing-subscriber = "0.3.19"
 
 [[bin]]
-name = "local-detectors"
+name = "regex-detector"
 path = "src/main.rs"

Cargo.toml

@@ -1,22 +1,45 @@
-# Use the official Rust image as a base
-FROM rust:latest
+ARG UBI_MINIMAL_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal
+ARG UBI_BASE_IMAGE_TAG=latest
+
+## Rust builder ################################################################
+# Specific debian version so that compatible glibc version is used
+FROM rust:1.84.0-bullseye AS rust-builder
 
-# Set the working directory to /app
 WORKDIR /app
 
-# Copy the Cargo.toml file into the working directory
-COPY Cargo.toml .
+COPY rust-toolchain.toml rust-toolchain.toml
+
+RUN rustup component add rustfmt
+
+## Regex builder #########################################################
+FROM rust-builder AS regex-detector-builder
 
+COPY *.toml /app/
 COPY src/ /app/src/
 
-# Build the Rust application
-RUN cargo build --release
+WORKDIR /app
+
+RUN cargo install --root /app/ --path .
+
+## Tests stage ##################################################################
+FROM regex-detector-builder AS tests
+RUN cargo test
+
+## Lint stage ###################################################################
+FROM regex-detector-builder AS lint
+RUN cargo clippy --all-targets --all-features -- -D warnings
+
+## Formatting check stage #######################################################
+FROM regex-detector-builder AS format
+RUN cargo fmt --check
+
+## Release Image ################################################################
+
+FROM ${UBI_MINIMAL_BASE_IMAGE}:${UBI_BASE_IMAGE_TAG} AS regex-detector-release
 
-# Copy the built application into the working directory
-COPY target/release/* .
+COPY --from=regex-detector-builder /app/bin/ /app/bin/
 
-# Expose the port that the application will listen on
-EXPOSE 8080
+RUN microdnf install -y --disableplugin=subscription-manager shadow-utils compat-openssl11 && \
+    microdnf clean all --disableplugin=subscription-manager
 
-# Run the command to start the application when the container is launched
-CMD ["/app/local-detectors"]
+CMD ["/app/bin/regex-detector"]

Dockerfile

@@ -0,0 +1,3 @@
+[toolchain]
+channel = "1.84.0"
+components = ["rustfmt", "clippy"]

rust-toolchain.toml

@@ -1,8 +1,11 @@
-use std::{env, net::{SocketAddr, IpAddr}};
 use axum::{
     routing::{get, post},
     Router,
 };
+use std::{
+    env,
+    net::{IpAddr, SocketAddr},
+};
 use tower_http::trace::{self, TraceLayer};
 use tracing::Level;
 mod detectors;
@@ -14,8 +17,7 @@ async fn main() {
         .with_target(false)
         .compact()
         .init();
-    
-    // Get port from environment variable or use default
+
     let mut http_port = 8080;
     if let Ok(port) = env::var("HTTP_PORT") {
         match port.parse::<u16>() {
@@ -24,9 +26,8 @@ async fn main() {
         }
     }
 
-    // Get host from environment variable or use default
     let host = env::var("HOST").unwrap_or_else(|_| "0.0.0.0".to_string());
-    
+
     let app = Router::new()
         .route("/health", get(|| async { "Hello, World!" }))
         .route("/api/v1/text/contents", post(handle_text_contents))
@@ -38,8 +39,8 @@ async fn main() {
 
     let ip: IpAddr = host.parse().expect("Failed to parse host IP address");
     let addr = SocketAddr::from((ip, http_port));
-    
+
     tracing::info!("listening on {}", addr);
     let listener = tokio::net::TcpListener::bind(addr).await.unwrap();
     axum::serve(listener, app).await.unwrap();
-}
+}