Skip to content

Commit 9bd14c1

Browse files
committed
Use go proxy and modules
1 parent 6f59e98 commit 9bd14c1

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

Dockerfile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
FROM golang:1.12 as builder
22

3-
RUN mkdir -p /go/src/github.com/stefanprodan/k8s-podinfo/
3+
RUN mkdir -p /podinfo/
44

5-
WORKDIR /go/src/github.com/stefanprodan/k8s-podinfo
5+
WORKDIR /podinfo
66

77
COPY . .
88

9-
RUN go test $(go list ./... | grep -v integration | grep -v /vendor/ | grep -v /template/) -cover
9+
RUN GOPROXY=https://proxy.golang.org go mod download
1010

1111
RUN GIT_COMMIT=$(git rev-list -1 HEAD) && \
1212
CGO_ENABLED=0 GOOS=linux go build -ldflags "-s -w \
13-
-X github.com/stefanprodan/k8s-podinfo/pkg/version.REVISION=${GIT_COMMIT}" \
14-
-a -installsuffix cgo -o podinfo ./cmd/podinfo
13+
-X github.com/stefanprodan/podinfo/pkg/version.REVISION=${GIT_COMMIT}" \
14+
-a -o bin/podinfo cmd/podinfo/*
1515

1616
RUN GIT_COMMIT=$(git rev-list -1 HEAD) && \
1717
CGO_ENABLED=0 GOOS=linux go build -ldflags "-s -w \
18-
-X github.com/stefanprodan/k8s-podinfo/pkg/version.REVISION=${GIT_COMMIT}" \
19-
-a -installsuffix cgo -o podcli ./cmd/podcli
18+
-X github.com/stefanprodan/podinfo/pkg/version.REVISION=${GIT_COMMIT}" \
19+
-a -o bin/podcli cmd/podcli/*
2020

2121
FROM alpine:3.10
2222

@@ -27,8 +27,8 @@ RUN addgroup -S app \
2727

2828
WORKDIR /home/app
2929

30-
COPY --from=builder /go/src/github.com/stefanprodan/k8s-podinfo/podinfo .
31-
COPY --from=builder /go/src/github.com/stefanprodan/k8s-podinfo/podcli /usr/local/bin/podcli
30+
COPY --from=builder /podinfo/bin/podinfo .
31+
COPY --from=builder /podinfo/bin/podcli /usr/local/bin/podcli
3232
COPY ./ui ./ui
3333
RUN chown -R app:app ./
3434

0 commit comments

Comments
 (0)