feat(Docker): ci nginx

Author: lazhenyi

Dockerfile

@@ -10,10 +10,12 @@ RUN apk add --no-cache git && npm install -g pnpm && pnpm install
 COPY views/ .
 RUN pnpm build
 FROM ubuntu:22.04
-RUN apt-get update && apt-get install -y git
+RUN apt-get update && apt-get install -y git nginx
 COPY --from=backend-builder /app/target/release/jzfs /explore/
 RUN chmod +x /explore/jzfs
 COPY --from=frontend-builder /app/views/dist /explore/html
+COPY script/nginx.conf /etc/nginx/nginx.conf
 EXPOSE 80
-ENV PORT=80
-CMD ["sh", "-c", "/explore/jzfs"]
+COPY script/start.sh /explore/start.sh
+RUN chmod +x /explore/start.sh
+ENTRYPOINT ["sh", "-c", "/explore.sh"]

api/src/lib.rs

@@ -70,11 +70,11 @@ impl ApiService {
 
         )
             .configure(shell::http::git_route)
-            .route("{tail:.*}",get().to(dist::dist))
+            // .route("{tail:.*}",get().to(dist::dist))
         ;
     }
 }
 mod auth;
 mod repo;
 mod error;
-mod dist;
+// mod dist;

script/nginx.conf

@@ -1,6 +1,6 @@
 server { 
     listen 80; 
-    root /usr/share/nginx/html; 
+    root /explore/html;
     index index.html; 
     location /api/ { 
         proxy_pass http://localhost:8080;

script/start.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+function start_jzfs_git() {
+  echo "Starting jzfs_git..."
+  sh -c /explore/jzfs & > /dev/null 2>&1
+}
+
+function start_nginx() {
+  echo "Starting nginx..."
+  nginx -g "daemon off;"
+}
+
+start_jzfs_git();
+start_nginx();