Merge pull request #500 from justinsb/use_the_root_not_root

k8s-ci-robot · web-flow · commit 3ca15af7a0a0 · 2018-11-30T14:21:00.000-08:00
Put the manager binary into /, instead of /root/
diff --git a/pkg/scaffold/manager/config.go b/pkg/scaffold/manager/config.go
@@ -84,7 +84,7 @@ spec:
     spec:
       containers:
       - command:
-        - /root/manager
+        - /manager
         image: {{ .Image }}
         imagePullPolicy: Always
         name: manager
diff --git a/pkg/scaffold/manager/dockerfile.go b/pkg/scaffold/manager/dockerfile.go
@@ -50,7 +50,7 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o manager {{ .Repo }}/cmd
 
 # Copy the controller-manager into a thin image
 FROM ubuntu:latest
-WORKDIR /root/
+WORKDIR /
 COPY --from=builder /go/src/{{ .Repo }}/manager .
-ENTRYPOINT ["./manager"]
+ENTRYPOINT ["/manager"]
 `
diff --git a/test/project/Dockerfile b/test/project/Dockerfile
@@ -12,6 +12,6 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o manager sigs.k8s.io/kub
 
 # Copy the controller-manager into a thin image
 FROM ubuntu:latest
-WORKDIR /root/
+WORKDIR /
 COPY --from=builder /go/src/sigs.k8s.io/kubebuilder/test/project/manager .
-ENTRYPOINT ["./manager"]
+ENTRYPOINT ["/manager"]
diff --git a/test/project/config/manager/manager.yaml b/test/project/config/manager/manager.yaml
@@ -42,7 +42,7 @@ spec:
     spec:
       containers:
       - command:
-        - /root/manager
+        - /manager
         image: controller:latest
         imagePullPolicy: Always
         name: manager

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o manager {{ .Repo }}/cmd`
`50`	`50`
`51`	`51`	`# Copy the controller-manager into a thin image`
`52`	`52`	`FROM ubuntu:latest`
`53`		`-WORKDIR /root/`
	`53`	`+WORKDIR /`
`54`	`54`	`COPY --from=builder /go/src/{{ .Repo }}/manager .`
`55`		`-ENTRYPOINT ["./manager"]`
	`55`	`+ENTRYPOINT ["/manager"]`
`56`	`56`	`