diff --git a/.dockerignore b/.dockerignore deleted file mode 100644 index 6bcbfcc7a9..0000000000 --- a/.dockerignore +++ /dev/null @@ -1,24 +0,0 @@ -# Binaries for programs and plugins -*.exe -*.exe~ -*.dll -*.so -*.dylib -bin - -# Test binary, build with `go test -c` -*.test - -# Output of the go coverage tool, specifically when used with LiteIDE -*.out - -# editor and IDE paraphernalia -.idea -*.swp -*.swo -*~ -.vscode -.envrc - -.git -.kube diff --git a/.gitignore b/.gitignore index b5fe48429f..3b364714b0 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ tools/bin .kube /kubeconfig +.dockerignore diff --git a/Dockerfile.fast b/Dockerfile.fast new file mode 100644 index 0000000000..806ea57c15 --- /dev/null +++ b/Dockerfile.fast @@ -0,0 +1,3 @@ +FROM quay.io/openshift/origin-base:4.7 +COPY bin/* /usr/bin/ +ENTRYPOINT /usr/bin/hypershift diff --git a/Makefile b/Makefile index 519ce5cfdf..28262894d0 100644 --- a/Makefile +++ b/Makefile @@ -95,11 +95,16 @@ deps: $(GO) mod vendor $(GO) mod verify -# Build the docker image +# Build the docker image with official golang image .PHONY: docker-build docker-build: ${RUNTIME} build . -t ${IMG} +# Build the docker image copying binaries from workspace +.PHONY: docker-build-fast +docker-build-fast: build + ${RUNTIME} build . -t ${IMG} -f Dockerfile.fast + # Push the docker image .PHONY: docker-push docker-push: