added building of frontend in dockerfile

HackerDom · Oct 30, 2023 · 14b4edc · 14b4edc
1 parent 2652628
commit 14b4edc
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 1 deletion.
diff --git a/services/rustest/.dockerignore b/services/rustest/.dockerignore
@@ -1 +1,3 @@
 /**/target/
+/**/build/
+/**/node_modules/
diff --git a/services/rustest/Dockerfile b/services/rustest/Dockerfile
@@ -16,6 +16,23 @@ COPY ./src ./src
 RUN rm ./target/release/deps/rustest-* && \ 
     cargo build --release
 
+###############################################################
+
+FROM node:18.18.2-alpine as front_builder
+
+WORKDIR /front
+
+COPY ./front/package*.json ./
+
+RUN npm install
+
+COPY ./front/src ./src/
+COPY ./front/public ./public
+
+RUN npm run build
+
+################################################################
+
 FROM debian:buster-slim
 ARG APP=/usr/src/app
 
@@ -32,6 +49,8 @@ RUN groupadd $APP_USER \
 
 COPY --from=builder /rustest/target/release/rustest ${APP}/rustest
 
+COPY --from=front_builder /front/ ${APP}/front
+
 RUN chown -R $APP_USER:$APP_USER ${APP}
 
 USER $APP_USER

diff --git a/services/rustest/src/routes.rs b/services/rustest/src/routes.rs
@@ -86,7 +86,7 @@ pub fn build_router(state: AppState) -> Router {
         .merge(unauthenticated_routes);
 
     let serve_dir =
-        ServeDir::new("static").not_found_service(ServeFile::new("static/index.html"));
+        ServeDir::new("front/build").not_found_service(ServeFile::new("front/build/index.html"));
 
     ApiRouter::new()
         .nest("/api", merged_api)