Skip to content

Commit 53f3a21

Browse files
committed
Update dockerfiles
1 parent c75887d commit 53f3a21

File tree

2 files changed

+15
-17
lines changed

2 files changed

+15
-17
lines changed

Dockerfile

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
1-
FROM node:10.22.0-jessie AS build_node
2-
WORKDIR /tmp/ssl-vision-client
3-
COPY . .
4-
RUN yarn install
5-
RUN yarn build
1+
FROM node:18-alpine AS build_node
2+
COPY frontend /tmp/ssl-vision-client/frontend
3+
WORKDIR /tmp/ssl-vision-client/frontend
4+
RUN npm install
5+
RUN npm run build
66

7-
FROM golang:1.18-alpine AS build_go
7+
FROM golang:1.20-alpine AS build_go
88
WORKDIR /go/src/github.com/RoboCup-SSL/ssl-vision-client
99
COPY . .
10-
COPY --from=build_node /tmp/ssl-vision-client/dist dist
11-
RUN go get -v -t -d ./...
12-
RUN go get -v github.com/gobuffalo/packr/packr
13-
WORKDIR cmd/ssl-vision-client
14-
RUN GOOS=linux GOARCH=amd64 packr build -o ../../release/ssl-vision-client_linux_amd64
10+
COPY --from=build_node /tmp/ssl-vision-client/frontend/dist dist
11+
RUN go install -v ./cmd/ssl-vision-client
1512

1613
# Start fresh from a smaller image
17-
FROM alpine:3.15
18-
COPY --from=build_go /go/src/github.com/RoboCup-SSL/ssl-vision-client/release/ssl-vision-client_linux_amd64 /app/ssl-vision-client
14+
FROM alpine:3
15+
COPY --from=build_go /go/bin/ssl-vision-client /app/ssl-vision-client
16+
USER 1000
1917
EXPOSE 8082
2018
ENTRYPOINT ["/app/ssl-vision-client"]
2119
CMD []

cli.Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
FROM golang:1.18-alpine AS build
1+
FROM golang:1.20-alpine AS build
22
WORKDIR /go/src/github.com/RoboCup-SSL/ssl-vision-client
33
COPY cmd cmd
44
COPY pkg pkg
55
COPY go.mod go.mod
6-
RUN go get -v -t -d ./...
7-
RUN go install ./...
6+
COPY go.sum go.sum
7+
RUN go install -v ./cmd/ssl-vision-cli
88

99
# Start fresh from a smaller image
10-
FROM alpine:3.15
10+
FROM alpine:3
1111
COPY --from=build /go/bin/ssl-vision-cli /app/ssl-vision-cli
1212
ENTRYPOINT ["/app/ssl-vision-cli"]
1313
CMD []

0 commit comments

Comments
 (0)