From 504a7669bfe2f7efc9178000845f81a7060d0c11 Mon Sep 17 00:00:00 2001
From: Tyler Murphy <tylerm@tylerm.dev>
Date: Thu, 29 Jun 2023 11:54:24 -0400
Subject: [PATCH] update dockerfile

---
 .dockerignore                 |   5 ++++-
 client/img/atlas.png.bak      | Bin 5670 -> 0 bytes
 deployments/docker/Dockerfile |  19 +++++++++++++------
 server/src/routes.rs          |   7 +++++--
 4 files changed, 22 insertions(+), 9 deletions(-)
 delete mode 100644 client/img/atlas.png.bak

diff --git a/.dockerignore b/.dockerignore
index fa3945f..fa5cb4c 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,3 +1,6 @@
 /deployments
-/target
+/server/target
+/client/node_modules
+/client/package.json
+/client/package-lock.json
 /.git
diff --git a/client/img/atlas.png.bak b/client/img/atlas.png.bak
deleted file mode 100644
index 3cb5dfc8c9839c3e2740159792f13e5062aa94b3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5670
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
TR5n<G!wd@a3*jI2iOv2CW3XA2

diff --git a/deployments/docker/Dockerfile b/deployments/docker/Dockerfile
index 0565b6b..b189e13 100644
--- a/deployments/docker/Dockerfile
+++ b/deployments/docker/Dockerfile
@@ -1,16 +1,23 @@
-FROM rust:alpine AS builder
+FROM rust:alpine AS builder-rs
 
-COPY Cargo.toml Cargo.lock /app/
-COPY src /app/src
+COPY server/Cargo.toml server/Cargo.lock /app/
+COPY server/src /app/src
 WORKDIR /app
 RUN apk add musl-dev
 RUN cargo build --release
 
+FROM node:alpine AS builder-ts
+COPY client /app/
+WORKDIR /app
+RUN npm install typescript
+RUN npx tsc
+
 FROM alpine
 RUN apk add --no-cache tini
-
 RUN adduser -DH block
 USER block
-COPY --from=builder /app/target/release/rollback /rollback
-COPY client /client
+COPY --from=builder-rs /app/target/release/rollback /rollback
+COPY --from=builder-ts /app /client
+
+ENV CLIENT_DIR=/client
 ENTRYPOINT ["/sbin/tini", "--", "/rollback"]
diff --git a/server/src/routes.rs b/server/src/routes.rs
index a8c96a3..ca55c8f 100644
--- a/server/src/routes.rs
+++ b/server/src/routes.rs
@@ -11,12 +11,15 @@ use super::rooms;
 
 pub fn routes() -> Router {
 	let room_server: rooms::RoomService = rooms::start_room_server();
-	
+
+    let client_dir = std::env::var("CLIENT_DIR").unwrap_or_else(|_| String::from("./client"));
+    println!("Service client data from: {client_dir}");
+
 	Router::new()
 		.route("/api/check", get(|| async {"ok"}))
 		.route("/api/exists/:code", get(game_exists))
 		.route("/api/join/:code", get(game_join))
-		.nest_service("/", ServeDir::new("../client"))
+		.nest_service("/", ServeDir::new(client_dir))
 		.layer(Extension(room_server))
 }