build: Simplify docker plugin & operator dockerfiles

- remove unused `V` argument - remove unused `PKG_BUILD` variable declaration - `CGO_ENABLED=0` is now the default - `GOOS=linux` is redundant - `-a` is meaningless in contaniner build - `-installsuffix cgo` was a red herring Signed-off-by: Ilya Dmitrichenko <[email protected]>
wangli8850 · Apr 16, 2020 · 6ecdf95 · 6ecdf95
1 parent 8b74e24
commit 6ecdf95
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/cilium-docker-plugin.Dockerfile b/cilium-docker-plugin.Dockerfile
@@ -3,8 +3,7 @@ LABEL maintainer="[email protected]"
 ADD . /go/src/github.com/cilium/cilium
 WORKDIR /go/src/github.com/cilium/cilium/plugins/cilium-docker
 ARG LOCKDEBUG
-ARG V
-RUN make CGO_ENABLED=0 GOOS=linux LOCKDEBUG=$LOCKDEBUG PKG_BUILD=1 EXTRA_GOBUILD_FLAGS="-a -installsuffix cgo"
+RUN make LOCKDEBUG=$LOCKDEBUG
 
 FROM scratch
 LABEL maintainer="[email protected]"

diff --git a/cilium-operator.Dockerfile b/cilium-operator.Dockerfile
@@ -3,8 +3,7 @@ LABEL maintainer="[email protected]"
 ADD . /go/src/github.com/cilium/cilium
 WORKDIR /go/src/github.com/cilium/cilium/operator
 ARG LOCKDEBUG
-ARG V
-RUN make CGO_ENABLED=0 GOOS=linux LOCKDEBUG=$LOCKDEBUG PKG_BUILD=1 EXTRA_GOBUILD_FLAGS="-a -installsuffix cgo -tags operator_aws,operator_azure"
+RUN make LOCKDEBUG=$LOCKDEBUG EXTRA_GOBUILD_FLAGS="-tags operator_aws,operator_azure"
 
 FROM docker.io/library/alpine:3.9.3 as certs
 RUN apk --update add ca-certificates