Merge pull request #777 from Huang-Wei/fix-build

Author: Huang-Wei

Makefile

@@ -51,11 +51,11 @@ build: build-controller build-scheduler
 
 .PHONY: build-controller
 build-controller:
-	go build -ldflags '-w' -o bin/controller cmd/controller/controller.go
+	$(GO_BUILD_ENV) go build -ldflags '-X k8s.io/component-base/version.gitVersion=$(VERSION) -w' -o bin/controller cmd/controller/controller.go
 
 .PHONY: build-scheduler
 build-scheduler:
-	go build -ldflags '-X k8s.io/component-base/version.gitVersion=$(VERSION) -w' -o bin/kube-scheduler cmd/scheduler/main.go
+	$(GO_BUILD_ENV) go build -ldflags '-X k8s.io/component-base/version.gitVersion=$(VERSION) -w' -o bin/kube-scheduler cmd/scheduler/main.go
 
 .PHONY: build-images
 build-images:
@@ -73,8 +73,6 @@ build-images:
 .PHONY: local-image
 local-image: PLATFORMS="linux/$$(uname -m)"
 local-image: RELEASE_VERSION="v0.0.0"
-local-image: IMAGE="kube-scheduler:latest"
-local-image: CONTROLLER_IMAGE="controller:latest"
 local-image: REGISTRY="localhost:5000/scheduler-plugins"
 local-image: EXTRA_ARGS="--load"
 local-image: clean build-images

build/controller/Dockerfile

@@ -13,16 +13,17 @@
 # limitations under the License.
 ARG GO_BASE_IMAGE
 ARG DISTROLESS_BASE_IMAGE=gcr.io/distroless/static:nonroot
-FROM --platform=${BUILDPLATFORM} $GO_BASE_IMAGE as go_builder
+FROM --platform=${BUILDPLATFORM} $GO_BASE_IMAGE as builder
 
-WORKDIR /go/src/sigs.k8s.io/scheduler-plugins
+WORKDIR /workspace
 COPY . .
 ARG TARGETARCH
 RUN make build-controller GO_BUILD_ENV='CGO_ENABLED=0 GOOS=linux GOARCH=${TARGETARCH}'
 
 FROM --platform=${BUILDPLATFORM} $DISTROLESS_BASE_IMAGE
 
-COPY --from=go_builder /go/src/sigs.k8s.io/scheduler-plugins/bin/controller /bin/controller
+WORKDIR /
+COPY --from=builder /workspace/bin/controller .
+USER 65532:65532
 
-WORKDIR /bin
-CMD ["controller"]
+ENTRYPOINT ["/controller"]

build/scheduler/Dockerfile

@@ -13,16 +13,17 @@
 # limitations under the License.
 ARG GO_BASE_IMAGE
 ARG DISTROLESS_BASE_IMAGE=gcr.io/distroless/static:nonroot
-FROM --platform=${BUILDPLATFORM} $GO_BASE_IMAGE as go-builder
+FROM --platform=${BUILDPLATFORM} $GO_BASE_IMAGE as builder
 
-WORKDIR /go/src/sigs.k8s.io/scheduler-plugins
+WORKDIR /workspace
 COPY . .
 ARG TARGETARCH
 RUN make build-scheduler GO_BUILD_ENV='CGO_ENABLED=0 GOOS=linux GOARCH=${TARGETARCH}'
 
 FROM --platform=${BUILDPLATFORM} $DISTROLESS_BASE_IMAGE
 
-COPY --from=go-builder /go/src/sigs.k8s.io/scheduler-plugins/bin/kube-scheduler /bin/kube-scheduler
+WORKDIR /
+COPY --from=builder /workspace/bin/kube-scheduler .
+USER 65532:65532
 
-WORKDIR /bin
-CMD ["kube-scheduler"]
+ENTRYPOINT ["/kube-scheduler"]