Merge pull request #298 from isucon/move-built_front

[frontend,infra] フロントのソースコードを競技者 VM に載せないようにした

development/backend-go/ci.dockerfile

@@ -28,7 +28,7 @@ COPY webapp/go/go.mod webapp/go/go.sum ./
 RUN go mod download
 
 COPY webapp/go/ .
-COPY --from=frontend /app /webapp/frontend
+COPY --from=frontend /public /webapp/public
 RUN go build -o app .
 
 ENTRYPOINT ["dockerize", "-wait=tcp://mysql-backend:3306", "-timeout=60s", "./app"]

development/backend-go/dev.dockerfile

@@ -30,4 +30,4 @@ COPY webapp/go/go.sum .
 
 RUN go mod download
 
-COPY --from=frontend /app /webapp/frontend
+COPY --from=frontend /public /webapp/public

provisioning/ansible/roles/contestant/tasks/isucondition-frontend.yml

@@ -15,8 +15,9 @@
     PATH: "/home/isucon/local/node/bin:{{ ansible_env.PATH }}"
   command: npm run build
 
-- name: "roles/contestant/tasks/isucondition-frontend: Deploy static files"
+- name: "roles/contestant/tasks/isucondition-frontend: Remove frontend source code"
   become_user: root
-  shell: |
-    mkdir -p /www/data && cp -pR /home/isucon/webapp/frontend/dist/* /www/data/
+  file:
+    path: /home/isucon/webapp/frontend
+    state: absent
 

webapp/.gitignore

@@ -0,0 +1 @@
+/public

webapp/frontend/package.json

@@ -2,7 +2,7 @@
   "version": "0.0.0",
   "scripts": {
     "dev": "vite --port 3333",
-    "build": "tsc && vite build",
+    "build": "tsc && vite build --outDir ../public",
     "serve": "vite preview",
     "lint": "eslint . --ext .js,.ts,.jsx,.tsx",
     "fmt": "prettier . --write",

webapp/go/main.go

@@ -34,7 +34,7 @@ const (
 	searchLimit               = 20
 	conditionLimit            = 20
 	isuListLimit              = 200 // TODO 修正が必要なら変更
-	frontendContentsPath      = "../frontend/dist"
+	frontendContentsPath      = "../public"
 	jwtVerificationKeyPath    = "../ec256-public.pem"
 	defaultIconFilePath       = "../NoImage.png"
 	defaultJIAServiceURL      = "http://localhost:5000"