Merge branch 'master' of github.com:GoogleContainerTools/kaniko into aws

README.md

@@ -12,6 +12,7 @@ Please let us know if you have any feature requests or find any bugs!
 - [Kaniko](#kaniko)
   - [How does kaniko work?](#how-does-kaniko-work)
   - [Known Issues](#known-issues)
+- [Demo](#demo)
 - [Development](#development)
   - [kaniko Build Contexts](#kaniko-build-contexts) 
   - [Running kaniko in a Kubernetes cluster](#running-kaniko-in-a-kubernetes-cluster)
@@ -41,6 +42,10 @@ Multi-Stage Dockerfiles are also unsupported currently, but will be ready soon.
 
 kaniko also does not support building Windows containers.
 
+## Demo
+
+![Demo](/docs/demo.gif)
+
 ## Development
 ### kaniko Build Contexts
 kaniko supports local directories and GCS buckets as build contexts. To specify a local directory, pass in the `--context` flag as an argument to the executor image.

deploy/Dockerfile

@@ -28,7 +28,7 @@ RUN make -C /go/src/github.com/awslabs/amazon-ecr-credential-helper linux-amd64
 FROM scratch
 COPY --from=0 /go/src/github.com/GoogleContainerTools/kaniko/out/executor /kaniko/executor
 COPY --from=0 /usr/local/bin/docker-credential-gcr /usr/local/bin/docker-credential-gcr
-COPY --from=0 /go/src/github.com/awslabs/amazon-ecr-credential-helper/bin/linux-amd64/ /usr/local/bin/
+COPY --from=0 /go/src/github.com/awslabs/amazon-ecr-credential-helper/bin/linux-amd64/docker-credential-ecr-login /usr/local/bin/docker-credential-ecr-login
 COPY files/ca-certificates.crt /kaniko/ssl/certs/
 COPY files/config.json /root/.docker/
 RUN ["docker-credential-gcr", "config", "--token-source=env"]