Skip to content

Commit

Permalink
Merge pull request #198 from lichuqiang/image_rollback
Browse files Browse the repository at this point in the history
Rollback base image to ubuntu
  • Loading branch information
droot committed May 22, 2018
2 parents b2722c7 + e4f95e9 commit 71e189d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion cmd/kubebuilder/initproject/dockerfile.go
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o controller-manager ./cm
RUN go test ./pkg/... ./cmd/...
# Copy the controller-manager into a thin image
FROM scratch
FROM ubuntu:latest
# RUN apk --no-cache add ca-certificates
WORKDIR /root/
COPY --from=builder /go/src/{{ .Repo }}/controller-manager .
Expand Down
2 changes: 1 addition & 1 deletion samples/memcached-api-server/Dockerfile.controller
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o controller-manager ./cm
RUN go test ./pkg/... ./cmd/...

# Copy the controller-manager into a thin image
FROM scratch
FROM ubuntu:latest
# RUN apk --no-cache add ca-certificates
WORKDIR /root/
COPY --from=builder /go/src/github.com/kubernetes-sigs/kubebuilder/samples/memcached-api-server/controller-manager .
Expand Down

0 comments on commit 71e189d

Please sign in to comment.