Make web folder work with dev and Docker

tma · Apr 3, 2022 · e95015f · e95015f
1 parent a5a5f00
commit e95015f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -6,7 +6,8 @@
             "type": "go",
             "request": "launch",
             "mode": "debug",
-            "program": "main.go"
+            "program": "cmd/main.go",
+            "cwd": "${workspaceFolder}"
         }
     ]
 }
diff --git a/Dockerfile b/Dockerfile
@@ -16,9 +16,8 @@ RUN apk --no-cache add ca-certificates tzdata
 
 WORKDIR /app
 
-COPY --from=builder /go/bin/main /app/main
-COPY --from=builder /go/src/app/web/templates /app/web/templates
-COPY --from=builder /go/src/app/web/public /app/web/public
+COPY --from=builder /go/bin/main /app/cmd/main
+COPY --from=builder /go/src/app/web /app/web
 
-ENTRYPOINT /app/main
+ENTRYPOINT /app/cmd/main
 EXPOSE 3000
diff --git a/internal/app/http.go b/internal/app/http.go
@@ -79,7 +79,7 @@ func WebStart(port string, car Car) {
 
 	router := mux.NewRouter()
 
-	fs := http.FileServer(http.Dir("public"))
+	fs := http.FileServer(http.Dir("web/public"))
 	publicHandler := http.StripPrefix("/public/", fs)
 
 	pathPrefix := os.Getenv("PATH_PREFIX")