Skip to content

Commit c68b2c2

Browse files
committed
try to fix build episode #1
1 parent a5526ee commit c68b2c2

File tree

2 files changed

+13
-25
lines changed

2 files changed

+13
-25
lines changed

Dockerfile

+11-23
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
FROM golang:1.21 as builderGo
1+
# backend build
2+
FROM golang:1.23 as builderGo
23

34
USER root
45
WORKDIR /csgo-2d-demo-player
@@ -14,43 +15,30 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build \
1415
-asmflags all=-trimpath=/ \
1516
main.go
1617

17-
18+
# web build
1819
FROM node:lts-slim as builderNpm
1920

2021
USER root
2122

22-
# index build
23-
WORKDIR /csgo-2d-demo-player/index
23+
WORKDIR /csgo-2d-demo-player/web
2424

25-
COPY web/index/package.json .
26-
COPY web/index/package-lock.json .
25+
COPY web/package.json .
26+
COPY web/package-lock.json .
2727
RUN npm install
2828

29-
COPY web/index/.env.production .
30-
COPY web/index/public public
31-
COPY web/index/src src
29+
COPY web/.env.production .
30+
COPY web/public public
31+
COPY web/src src
3232
RUN npm run build
3333

34-
# player build
35-
WORKDIR /csgo-2d-demo-player/player
36-
37-
COPY web/player/package.json .
38-
COPY web/player/package-lock.json .
39-
RUN npm install
40-
41-
COPY web/player/public public
42-
COPY web/player/src src
43-
RUN npm run build
44-
45-
34+
# dist
4635
FROM debian:buster-slim
4736

4837
RUN apt-get update && apt-get install -y ca-certificates
4938

5039
COPY --from=builderGo /csgo-2d-demo-player/_output/main /csgo-2d-demo-player/
5140
COPY --from=builderGo /csgo-2d-demo-player/assets/ /csgo-2d-demo-player/assets/
52-
COPY --from=builderNpm /csgo-2d-demo-player/player/build/ /csgo-2d-demo-player/web/player/build/
53-
COPY --from=builderNpm /csgo-2d-demo-player/index/build/ /csgo-2d-demo-player/web/index/build/
41+
COPY --from=builderNpm /csgo-2d-demo-player/web/dist/ /csgo-2d-demo-player/web/dist/
5442

5543
WORKDIR /csgo-2d-demo-player
5644

main.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ func server(ctx context.Context) {
7272
}
7373
http.ServeFile(w, r, "./wasm/main.wasm")
7474
})
75-
mux.Handle("/", http.FileServer(http.Dir("web/index/build")))
76-
mux.Handle("/player/", http.StripPrefix("/player", http.FileServer(http.Dir("web/player/build"))))
75+
mux.Handle("/", http.FileServer(http.Dir("web/dist")))
76+
// mux.Handle("/player/", http.StripPrefix("/player", http.FileServer(http.Dir("web/player/build"))))
7777

7878
listService, listServiceErr := list.NewListService(ctx, config)
7979
if listServiceErr != nil {

0 commit comments

Comments
 (0)