fix: merge conflict

kavkaco · Sep 22, 2024 · 3f70f30 · 3f70f30
1 parent 8448b04
commit 3f70f30
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -2,20 +2,18 @@ FROM golang:alpine as builder
 
 RUN apk add make
 
-WORKDIR /build
+WORKDIR /app
 
-COPY . /build
+WORKDIR /build
 
 RUN go mod tidy
 
 RUN make build
 
 FROM golang:alpine as runtime
 
-WORKDIR /server
-
-COPY --from=builder ./build/server /server/server
+COPY --from=builder /app/build/server /usr/bin/server
 
 EXPOSE 8000
 
-CMD ["./build/server"]
+CMD ["/usr/bin/server"]