test this fing shit on pi wohoo

8 files changed, 54 insertions, 18 deletions

diff --git a/Dockerfile.arm.build b/Dockerfile.arm.build
new file mode 100644
index 0000000..1845afe
--- /dev/null
+++ b/Dockerfile.arm.build
@@ -0,0 +1,16 @@
+FROM rust:1.73 as builder
+WORKDIR /usr/src/webol
+COPY . .
+#RUN rustup target add armv7-unknown-linux-gnueabihf
+#RUN apt update && apt install gcc-arm-linux-gnueabihf -y
+#RUN CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-linux-gnueabihf-gcc cargo install --path . --target armv7-unknown-linux-gnueabihf
+RUN cargo install --path .
+
+#FROM --platform=arm64 debian:bookworm-slim
+FROM debian:bookworm-slim
+RUN apt update && apt install -y libc6 && rm -rf /var/lib/apt/lists/*
+WORKDIR /usr/local/webol
+COPY --from=builder /usr/local/cargo/bin/webol /usr/local/bin/webol
+
+EXPOSE 7229
+CMD ["webol"]
diff --git a/Dockerfile.build b/Dockerfile.build
index 3bbaf39..0158b8a 100644
--- a/Dockerfile.build
+++ b/Dockerfile.build
@@ -1,16 +1,18 @@
+FROM debian:bookworm AS deb_extractor
+RUN cd /tmp && \
+    apt-get update && apt-get download \
+        libc6 && \
+    mkdir /dpkg && \
+    for deb in *.deb; do dpkg --extract $deb /dpkg || exit 10; done
+
 FROM rust:1.73 as builder
-WORKDIR /usr/src/webol
+WORKDIR /app
 COPY . .
-# RUN rustup target add armv7-unknown-linux-gnueabihf
-# RUN apt update && apt install gcc-arm-linux-gnueabihf -y
-# RUN CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-linux-gnueabihf-gcc cargo install --path . --target armv7-unknown-linux-gnueabihf
-RUN cargo install --path . 
+RUN cargo build --release
 
-# FROM --platform=arm64 debian:bullseye-slim
-FROM debian:trixie-slim
-# RUN apt-get update && apt-get install -y libc6 && rm -rf /var/lib/apt/lists/*
-WORKDIR /usr/local/webol
-COPY --from=builder /usr/local/cargo/bin/webol /usr/local/bin/webol
+FROM gcr.io/distroless/cc
+COPY --from=builder /app/target/release/webol /
+COPY --from=deb_extractor /dpkg /
 
 EXPOSE 7229
-CMD ["webol"]
+ENTRYPOINT ["./webol"]
diff --git a/README.md b/README.md
index f062819..fdc7ad2 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,9 @@
-# webol
\ No newline at end of file
+# webol
+
+DATABASE_URL: `String`
+
+WEBOL_APIKEY: `String`
+
+WEBOL_SERVERADDR: `Option<String>`
+
+WEBOL_BINDADDR: `Option<String>`
diff --git a/docker-compose.yml b/docker-compose.yml
index 1980356..9d73e9b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,6 +3,7 @@ version: '3.1'
 services:
   db:
     image: postgres
+    container_name: webol_dev_postgres
     restart: no
     environment:
       POSTGRES_PASSWORD: postgres
diff --git a/build.rs b/nobuild.rs.old
index 7609593..7609593 100644
--- a/build.rs
+++ b/nobuild.rs.old
diff --git a/src/main.rs b/src/main.rs
index e6c746c..b7306ea 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -7,6 +7,7 @@ use sqlx::postgres::PgPoolOptions;
 use time::util::local_offset;
 use tracing::{debug, info, level_filters::LevelFilter};
 use tracing_subscriber::{EnvFilter, fmt::{self, time::LocalTime}, prelude::*};
+use crate::config::SETTINGS;
 use crate::routes::device::{get_device, post_device, put_device};
 use crate::routes::start::start;
 
@@ -37,13 +38,12 @@ async fn main() {
 
     let version = env!("CARGO_PKG_VERSION");
 
-    info!("starting webol v{}", version);
+    info!("start webol v{}", version);
 
     let db = init_db_pool().await;
 
     let shared_state = Arc::new(AppState { db });
 
-    // build our application with a single route
     let app = Router::new()
         .route("/start", post(start))
         .route("/device", get(get_device))
@@ -51,8 +51,9 @@ async fn main() {
         .route("/device", post(post_device))
         .with_state(shared_state);
 
-    // TODO: Add to config
-    axum::Server::bind(&"0.0.0.0:3000".parse().unwrap())
+    let addr = SETTINGS.get_string("serveraddr").unwrap_or("0.0.0.0:7229".to_string());
+    info!("start server on {}", addr);
+    axum::Server::bind(&addr.parse().unwrap())
         .serve(app.into_make_service())
         .await
         .unwrap();
@@ -63,9 +64,13 @@ pub struct AppState {
 }
 
 async fn init_db_pool() -> PgPool {
+    #[cfg(not(debug_assertions))]
+    let db_url = SETTINGS.get_string("database.url").unwrap();
+
+    #[cfg(debug_assertions)]
     let db_url = env::var("DATABASE_URL").unwrap();
 
-    debug!("attempting to connect dbPool to '{}'", db_url);
+    debug!("attempt to connect dbPool to '{}'", db_url);
 
     let pool = PgPoolOptions::new()
         .max_connections(5)
diff --git a/src/routes/device.rs b/src/routes/device.rs
index d5d7144..025c7d0 100644
--- a/src/routes/device.rs
+++ b/src/routes/device.rs
@@ -4,11 +4,13 @@ use axum::headers::HeaderMap;
 use axum::Json;
 use serde::{Deserialize, Serialize};
 use serde_json::{json, Value};
+use tracing::info;
 use crate::auth::auth;
 use crate::db::Device;
 use crate::error::WebolError;
 
 pub async fn get_device(State(state): State<Arc<crate::AppState>>, headers: HeaderMap, Json(payload): Json<GetDevicePayload>) -> Result<Json<Value>, WebolError> {
+    info!("GET request");
     let secret = headers.get("authorization");
     if auth(secret).map_err(WebolError::Auth)? {
         let device = sqlx::query_as!(
@@ -33,6 +35,7 @@ pub struct GetDevicePayload {
 }
 
 pub async fn put_device(State(state): State<Arc<crate::AppState>>, headers: HeaderMap, Json(payload): Json<PutDevicePayload>) -> Result<Json<Value>, WebolError> {
+    info!("PUT request");
     let secret = headers.get("authorization");
     if auth(secret).map_err(WebolError::Auth)? {
         sqlx::query!(
@@ -64,6 +67,7 @@ pub struct PutDeviceResponse {
 }
 
 pub async fn post_device(State(state): State<Arc<crate::AppState>>, headers: HeaderMap, Json(payload): Json<PostDevicePayload>) -> Result<Json<Value>, WebolError> {
+    info!("POST request");
     let secret = headers.get("authorization");
     if auth(secret).map_err(WebolError::Auth)? {
         let device = sqlx::query_as!(
diff --git a/src/routes/start.rs b/src/routes/start.rs
index d16ea4e..2e6a648 100644
--- a/src/routes/start.rs
+++ b/src/routes/start.rs
@@ -28,7 +28,7 @@ pub async fn start(State(state): State<Arc<crate::AppState>>, headers: HeaderMap
 
         let bind_addr = SETTINGS
             .get_string("bindaddr")
-            .map_err(|err| WebolError::Server(Box::new(err)))?;
+            .unwrap_or("0.0.0.0:1111".to_string());
 
         let _ = send_packet(
             &bind_addr.parse().map_err(|err| WebolError::Server(Box::new(err)))?,