Merge pull request #45 from NCTUCSUnion/dev

Dev

Author: gainsborouo

backend/Dockerfile.dev

@@ -0,0 +1,24 @@
+FROM ghcr.io/astral-sh/uv:python3.12-bookworm-slim
+
+WORKDIR /app
+
+ENV UV_COMPILE_BYTECODE=1
+
+ENV UV_LINK_MODE=copy
+
+RUN --mount=type=cache,target=/root/.cache/uv \
+    --mount=type=bind,source=uv.lock,target=uv.lock \
+    --mount=type=bind,source=pyproject.toml,target=pyproject.toml \
+    uv sync --locked --no-install-project --no-dev
+
+COPY . /app
+RUN --mount=type=cache,target=/root/.cache/uv \
+    uv sync --locked --no-dev
+
+ENV PATH="/app/.venv/bin:$PATH"
+
+ENTRYPOINT []
+
+# CMD ["fastapi", "dev", "--host", "0.0.0.0", "main.py", "--root-path", "/api"]
+CMD ["uvicorn", "app.main:app", "--host", "0.0.0.0", "--root-path", "/api", "--reload"]
+

docker/docker-compose.dev.yml

@@ -1,32 +1,43 @@
 name: pastexam-dev
 
 services:
-  # frontend:
-  #   build: ../frontend
-  #   container_name: pastexam-dev-frontend
-  #   ports:
-  #     - "5173:80"
-  #   env_file:
-  #     - ../frontend/.env
-  #   networks:
-  #     - app_network
+  frontend:
+    build:
+      context: ../frontend
+      dockerfile: Dockerfile.dev
+    container_name: pastexam-dev-frontend
+    ports:
+      # - "5173:80"
+      - "24678:24678"
+    env_file:
+      - ../frontend/.env
+    volumes:
+      - /app/node_modules
+      - ../frontend:/app
+    networks:
+      - app_network
 
-  # backend:
-  #   build: ../backend
-  #   container_name: pastexam-dev-backend
-  #   depends_on:
-  #     db:
-  #       condition: service_healthy
-  #     redis:
-  #       condition: service_started
-  #     minio:
-  #       condition: service_started
-  #   # ports:
-  #   #   - "8000:8000"
-  #   env_file:
-  #     - ../backend/.env
-  #   networks:
-  #     - app_network
+  backend:
+    build: 
+      context: ../backend
+      dockerfile: Dockerfile.dev
+    container_name: pastexam-dev-backend
+    depends_on:
+      db:
+        condition: service_healthy
+      redis:
+        condition: service_started
+      minio:
+        condition: service_started
+    # ports:
+    #   - "8000:8000"
+    volumes:
+      - /app/.venv
+      - ../backend:/app
+    env_file:
+      - ../backend/.env
+    networks:
+      - app_network
 
   db:
     image: postgres:15.14-alpine3.22
@@ -35,8 +46,8 @@ services:
       POSTGRES_USER: ${POSTGRES_USER}
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
       POSTGRES_DB: ${POSTGRES_DB}
-    ports:
-      - "${POSTGRES_PORT}:${POSTGRES_PORT}"
+    # ports:
+    #   - "${POSTGRES_PORT}:${POSTGRES_PORT}"
     volumes:
       - pg_data:/var/lib/postgresql/data
     healthcheck:
@@ -51,9 +62,9 @@ services:
     image: quay.io/minio/minio:RELEASE.2025-05-24T17-08-30Z
     container_name: pastexam-dev-minio
     command: server /data --console-address ":9001"
-    ports:
-      - "9000:9000"
-      - "9001:9001" # 9000 for S3 API, 9001 for MinIO Console
+    # ports:
+    #   - "9000:9000"
+    #   - "9001:9001" # 9000 for S3 API, 9001 for MinIO Console
     environment:
       - MINIO_ROOT_USER=${MINIO_ROOT_USER}
       - MINIO_ROOT_PASSWORD=${MINIO_ROOT_PASSWORD}
@@ -70,28 +81,27 @@ services:
 
   redis:
     image: redis:7.4.5-alpine3.21
-    restart: always
     container_name: pastexam-dev-redis
-    ports:
-      - "6379:6379"
+    # ports:
+    #   - "6379:6379"
     volumes:
       - redis_data:/data
     networks:
       - app_network
 
-  # nginx:
-  #   image: nginx:1.29.1-perl
-  #   container_name: pastexam-dev-nginx
-  #   ports:
-  #     - "8080:8080"
-  #   volumes:
-  #     - ../proxy/nginx.conf:/etc/nginx/nginx.conf:ro
-  #   depends_on:
-  #     - frontend
-  #     - backend
-  #     - minio
-  #   networks:
-  #     - app_network
+  nginx:
+    image: nginx:1.29.1-perl
+    container_name: pastexam-dev-nginx
+    ports:
+      - "8080:8080"
+    volumes:
+      - ../proxy/nginx.conf:/etc/nginx/nginx.conf:ro
+    depends_on:
+      - frontend
+      - backend
+      - minio
+    networks:
+      - app_network
 
 networks:
   app_network:

docker/docker-compose.yml

@@ -5,8 +5,8 @@ services:
     image: ghcr.io/nctucsunion/pastexam:frontend
     container_name: pastexam-frontend
     restart: always
-    ports:
-      - "5173:80"
+    # ports:
+    #   - "5173:80"
     networks:
       - app_network
 

frontend/Dockerfile.dev

@@ -0,0 +1,12 @@
+FROM node:18-alpine AS build
+WORKDIR /app
+
+RUN corepack enable && corepack prepare pnpm@9.0.0 --activate
+
+COPY package.json pnpm-lock.yaml ./
+
+RUN pnpm install --frozen-lockfile
+
+COPY . .
+
+CMD ["pnpm", "run", "dev", "--host", "0.0.0.0", "--port", "80"]

frontend/src/components/NotificationModal.vue

@@ -5,7 +5,6 @@
     modal
     :style="{ width: '480px', maxWidth: '90vw' }"
     :draggable="false"
-    :dismissableMask="true"
     :showHeader="true"
     header="系統公告"
     :blockScroll="true"

frontend/vite.config.js

@@ -9,6 +9,15 @@ import Sitemap from 'vite-plugin-sitemap'
 
 // https://vitejs.dev/config/
 export default defineConfig({
+  server: {
+    host: true,
+    port: 80,
+    strictPort: true,
+    hmr: {
+      port: 24678,
+      clientPort: 24678,
+    },
+  },
   plugins: [
     vue(),
     vueDevTools({

proxy/nginx.conf

@@ -7,6 +7,7 @@ http {
     map $http_origin $cors_origin {
         default "";
         "http://localhost:5173" $http_origin;
+        "http://localhost:8080" $http_origin;
         "https://pastexam.nctucsunion.me" $http_origin;
     }