feat(frontend): build 成果物配置先の変更: ./dist > ../public

isucon · Jul 8, 2021 · 1fb65f3 · 1fb65f3
1 parent daaa625
commit 1fb65f3
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/development/backend-go/ci.dockerfile b/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"]
diff --git a/development/backend-go/dev.dockerfile b/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
diff --git a/webapp/.gitignore b/webapp/.gitignore
@@ -0,0 +1 @@
+/public
diff --git a/webapp/frontend/package.json b/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",

diff --git a/webapp/go/main.go b/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"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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