Fixed merge conflicts, support multistage builds

Author: Priya Wadhwa

Gopkg.lock

@@ -18,11 +18,6 @@
   revision = "83389a148052d74ac602f5f1d62f86ff2f3c4aa5"
   source = "github.com/docker/distribution"
 
-[[constraint]]
-  name = "github.com/GoogleContainerTools/container-diff"
-  branch = "master"
-  source = "github.com/GoogleContainerTools/container-diff"
-
 [[constraint]]
   name = "github.com/docker/docker"
   revision = "b1a1234c60cf87048814aa37da523b03a7b0d344"

Gopkg.toml

@@ -47,7 +47,7 @@ test: out/executor
 	@ ./test.sh
 
 .PHONY: integration-test
-integration-test: out/executor
+integration-test:
 	@ ./integration-test.sh
 
 .PHONY: images

Makefile

@@ -10,14 +10,15 @@ Please let us know if you have any feature requests or find any bugs!
 
 
 - [Kaniko](#kaniko)
-  - [How does kaniko work?](#how-does-kaniko-work?)
+  - [How does kaniko work?](#how-does-kaniko-work)
   - [Known Issues](#known-issues)
 - [Development](#development)
   - [kaniko Build Contexts](#kaniko-build-contexts) 
   - [Running kaniko in a Kubernetes cluster](#running-kaniko-in-a-kubernetes-cluster)
   - [Running kaniko in Google Container Builder](#running-kaniko-in-google-container-builder)
   - [Running kaniko locally](#running-kaniko-locally)
   - [Pushing to Different Registries](#pushing-to-different-registries)
+  - [Debug Image](#debug-image)
 - [Security](#security)
 - [Comparison with Other Tools](#comparison-with-other-tools)
 - [Community](#community)
@@ -40,6 +41,8 @@ The majority of Dockerfile commands can be executed with kaniko, but we're still
 
 Multi-Stage Dockerfiles are also unsupported currently, but will be ready soon.
 
+kaniko also does not support building Windows containers.
+
 ## 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.
@@ -143,6 +146,10 @@ kaniko uses Docker credential helpers to push images to a registry.
 
 kaniko comes with support for GCR, but configuring another credential helper should allow pushing to a different registry.
 
+### Debug Image
+
+We provide `gcr.io/kaniko-project/executor:debug` as a a version of the executor image based off a Debian image. 
+This provides a shell and can be useful for debugging.
 
 ## Security
 

README.md

@@ -25,21 +25,19 @@ import (
 
 	"github.com/GoogleContainerTools/kaniko/pkg/constants"
 	"github.com/GoogleContainerTools/kaniko/pkg/executor"
-	"github.com/GoogleContainerTools/kaniko/pkg/image"
 	"github.com/GoogleContainerTools/kaniko/pkg/util"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
 
 var (
-	dockerfilePath              string
-	destination                 string
-	srcContext                  string
-	snapshotMode                string
-	bucket                      string
-	dockerInsecureSkipTLSVerify bool
-	logLevel                    string
-	force                       bool
+	dockerfilePath string
+	destination    string
+	srcContext     string
+	snapshotMode   string
+	bucket         string
+	logLevel       string
+	force          bool
 )
 
 func init() {
@@ -48,7 +46,6 @@ func init() {
 	RootCmd.PersistentFlags().StringVarP(&bucket, "bucket", "b", "", "Name of the GCS bucket from which to access build context as tarball.")
 	RootCmd.PersistentFlags().StringVarP(&destination, "destination", "d", "", "Registry the final image should be pushed to (ex: gcr.io/test/example:latest)")
 	RootCmd.PersistentFlags().StringVarP(&snapshotMode, "snapshotMode", "", "full", "Set this flag to change the file attributes inspected during snapshotting")
-	RootCmd.PersistentFlags().BoolVarP(&dockerInsecureSkipTLSVerify, "insecure-skip-tls-verify", "", false, "Push to insecure registry ignoring TLS verify")
 	RootCmd.PersistentFlags().StringVarP(&logLevel, "verbosity", "v", constants.DefaultLogLevel, "Log level (debug, info, warn, error, fatal, panic")
 	RootCmd.PersistentFlags().BoolVarP(&force, "force", "", false, "Force building outside of a container")
 }
@@ -72,12 +69,16 @@ var RootCmd = &cobra.Command{
 			}
 			logrus.Warn("kaniko is being run outside of a container. This can have dangerous effects on your system")
 		}
-		buildImage, err := executor.DoBuild(dockerfilePath, srcContext, snapshotMode)
+		if err := os.Chdir("/"); err != nil {
+			logrus.Error(err)
+			os.Exit(1)
+		}
+		ref, image, err := executor.DoBuild(dockerfilePath, srcContext, snapshotMode)
 		if err != nil {
 			logrus.Error(err)
 			os.Exit(1)
 		}
-		if err := image.PushImage(buildImage, destination, dockerInsecureSkipTLSVerify); err != nil {
+		if err := executor.DoPush(ref, image, destination); err != nil {
 			logrus.Error(err)
 			os.Exit(1)
 		}

cmd/executor/cmd/root.go

@@ -15,12 +15,13 @@
 # Builds the static Go image to execute in a Kubernetes job
 
 FROM scratch
-ADD out/executor /kaniko/executor
-ADD files/ca-certificates.crt /kaniko/ssl/certs/
-ADD files/docker-credential-gcr /usr/local/bin/
-ADD files/config.json /root/.docker/
+COPY out/executor /kaniko/executor
+COPY files/ca-certificates.crt /kaniko/ssl/certs/
+COPY files/docker-credential-gcr /usr/local/bin/
+COPY files/config.json /root/.docker/
 RUN ["docker-credential-gcr", "config", "--token-source=env"]
 ENV HOME /root
+ENV USER /root
 ENV PATH /usr/local/bin
 ENV SSL_CERT_DIR=/kaniko/ssl/certs
 ENTRYPOINT ["/kaniko/executor"]

deploy/Dockerfile

@@ -0,0 +1,25 @@
+# Copyright 2018 Google, Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Builds the executor from debian
+
+FROM gcr.io/google-appengine/debian9:latest
+COPY out/executor /kaniko/executor
+COPY files/ca-certificates.crt /kaniko/ssl/certs/
+COPY files/docker-credential-gcr /usr/local/bin/
+COPY files/config.json /root/.docker/
+RUN ["docker-credential-gcr", "config", "--token-source=env"]
+ENV HOME /root
+ENV SSL_CERT_DIR=/kaniko/ssl/certs
+ENTRYPOINT ["/kaniko/executor"]

deploy/Dockerfile_debug

@@ -18,8 +18,14 @@ steps:
       path: "/usr/bin"
     dir: go/src/github.com/GoogleContainerTools/kaniko
     env: ["GOPATH=/workspace/go/"]
-  # Then, build kaniko with kaniko
-  - name: "gcr.io/kaniko-project/executor:latest"
-    args: ["--dockerfile=/workspace/deploy/Dockerfile",
-           "--context=/workspace/go/src/github.com/GoogleContainerTools/kaniko/",
-           "--destination=gcr.io/kaniko-project/executor:${COMMIT_SHA}"]
+  # First, build kaniko
+  - name: "gcr.io/cloud-builders/docker"
+    args: ["build", "-f", "deploy/Dockerfile",
+           "-t", "gcr.io/kaniko-project/executor:${COMMIT_SHA}", "."]
+    dir: go/src/github.com/GoogleContainerTools/kaniko  
+  # Then, build kaniko:debug
+  - name: "gcr.io/cloud-builders/docker"
+    args: ["build", "-f", "deploy/Dockerfile_debug",
+           "-t", "gcr.io/kaniko-project/executor:debug-${COMMIT_SHA}", "."] 
+    dir: go/src/github.com/GoogleContainerTools/kaniko
+images: ["gcr.io/kaniko-project/executor:${COMMIT_SHA}", "gcr.io/kaniko-project/executor:debug-${COMMIT_SHA}"]

deploy/executor-release.yaml

@@ -0,0 +1,3 @@
+FROM busybox
+ADD context/tars /tmp/tars
+RUN mv /tmp/tars /foo

integration_tests/dockerfiles/Dockerfile_test_mv_add

@@ -14,6 +14,6 @@
 
 FROM gcr.io/google-appengine/debian9
 RUN echo "hey" > /etc/foo
-RUN apt-get update && apt-get install -y \
-  bzr \
-  cvs \
+RUN echo "baz" > /etc/baz
+RUN cp /etc/baz /etc/bar
+RUN rm /etc/baz