merge docker-build

.gitignore

@@ -25,10 +25,6 @@ testbin/*
 *~
 .vscode
 
-<<<<<<< HEAD
-=======
-
->>>>>>> docker-build
 # binaries
 build/
 manager

Dockerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.18 AS builder
+FROM golang:1.18 as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests
@@ -23,7 +23,7 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o manager main.go
 
 # Use distroless as minimal base image to package the manager binary
 # Refer to https://github.com/GoogleContainerTools/distroless for more details
-FROM gcr.io/distroless/static:nonroot AS distroless
+FROM gcr.io/distroless/static:nonroot as distroless
 WORKDIR /
 COPY --from=builder /workspace/manager .
 # copy channels
@@ -33,7 +33,7 @@ USER 65532:65532
 ENTRYPOINT ["/manager"]
 
 
-FROM busybox AS local-dev
+FROM busybox as local-dev
 WORKDIR /
 COPY build/manager .
 USER 65532:65532