Skip to content

Commit dcbb490

Browse files
committed
merge docker-build
2 parents e276f19 + 0948164 commit dcbb490

2 files changed

Lines changed: 3 additions & 7 deletions

File tree

.gitignore

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@ testbin/*
2525
*~
2626
.vscode
2727

28-
<<<<<<< HEAD
29-
=======
30-
31-
>>>>>>> docker-build
3228
# binaries
3329
build/
3430
manager

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM golang:1.18 AS builder
2+
FROM golang:1.18 as builder
33

44
WORKDIR /workspace
55
# Copy the Go Modules manifests
@@ -23,7 +23,7 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o manager main.go
2323

2424
# Use distroless as minimal base image to package the manager binary
2525
# Refer to https://github.com/GoogleContainerTools/distroless for more details
26-
FROM gcr.io/distroless/static:nonroot AS distroless
26+
FROM gcr.io/distroless/static:nonroot as distroless
2727
WORKDIR /
2828
COPY --from=builder /workspace/manager .
2929
# copy channels
@@ -33,7 +33,7 @@ USER 65532:65532
3333
ENTRYPOINT ["/manager"]
3434

3535

36-
FROM busybox AS local-dev
36+
FROM busybox as local-dev
3737
WORKDIR /
3838
COPY build/manager .
3939
USER 65532:65532

0 commit comments

Comments
 (0)