From 7194eb88fabd6e14ec58fb7c6374f60e834dcbd6b799364b0dad6a658d365e69 Mon Sep 17 00:00:00 2001
From: raven <7156279+RavenX8@users.noreply.github.com>
Date: Sat, 14 Dec 2024 05:54:32 -0500
Subject: [PATCH] - fix: docker libssl in slim image - fix: api service default
 rest api address and port was incorrect - update: database service to use
 dedicated function for running the health check api

---
 api-service/src/axum_gateway.rs | 4 ++--
 character-service/Dockerfile    | 2 +-
 database-service/Dockerfile     | 2 +-
 database-service/src/main.rs    | 7 +------
 packet-service/Dockerfile       | 2 +-
 world-service/Dockerfile        | 2 +-
 6 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/api-service/src/axum_gateway.rs b/api-service/src/axum_gateway.rs
index aeb3371..30569fe 100644
--- a/api-service/src/axum_gateway.rs
+++ b/api-service/src/axum_gateway.rs
@@ -62,8 +62,8 @@ pub async fn serve_rest_api(
         .with_state(grpc_client)
         .layer(cors);
 
-    let addr = env::var("LISTEN_ADDR").unwrap_or_else(|_| "127.0.0.1".to_string());
-    let port = env::var("API_SERVICE_PORT").unwrap_or_else(|_| "50050".to_string());
+    let addr = env::var("LISTEN_ADDR").unwrap_or_else(|_| "0.0.0.0".to_string());
+    let port = env::var("API_SERVICE_PORT").unwrap_or_else(|_| "8080".to_string());
     let listener = tokio::net::TcpListener::bind(format!("{}:{}", addr, port))
         .await
         .unwrap();
diff --git a/character-service/Dockerfile b/character-service/Dockerfile
index fdc8bb4..e775f99 100644
--- a/character-service/Dockerfile
+++ b/character-service/Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.83 as builder
+FROM rust:1.83 AS builder
 LABEL authors="raven"
 
 WORKDIR /usr/src/proto
diff --git a/database-service/Dockerfile b/database-service/Dockerfile
index 037abcb..8a08c55 100644
--- a/database-service/Dockerfile
+++ b/database-service/Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.83 as builder
+FROM rust:1.83 AS builder
 LABEL authors="raven"
 
 WORKDIR /usr/src/proto
diff --git a/database-service/src/main.rs b/database-service/src/main.rs
index 4e19b0d..2792c63 100644
--- a/database-service/src/main.rs
+++ b/database-service/src/main.rs
@@ -53,12 +53,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     )
         .await?;
 
-    // Start health-check endpoint
-    let health_route = warp::path!("health")
-        .map(|| warp::reply::with_status("OK", warp::http::StatusCode::OK));
-
-
-    tokio::spawn(warp::serve(health_route).run(health_check_endpoint_addr.to_socket_addrs()?.next().unwrap()));
+    consul_registration::start_health_check(addr.as_str()).await?;
 
     let full_addr = format!("{}:{}", &addr, port);
     let address = full_addr.parse().expect("Invalid address");
diff --git a/packet-service/Dockerfile b/packet-service/Dockerfile
index e81bfcf..e4767b4 100644
--- a/packet-service/Dockerfile
+++ b/packet-service/Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.83 as builder
+FROM rust:1.83 AS builder
 LABEL authors="raven"
 
 WORKDIR /usr/src/proto
diff --git a/world-service/Dockerfile b/world-service/Dockerfile
index f68dc4b..f2fb28f 100644
--- a/world-service/Dockerfile
+++ b/world-service/Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.83 as builder
+FROM rust:1.83 AS builder
 LABEL authors="raven"
 
 WORKDIR /usr/src/proto