public_git/kaniko
1
0
Fork 0
mirror of https://github.com/GoogleContainerTools/kaniko synced 2026-10-07 23:00:15 +02:00
Code Issues Releases Wiki Activity

Add config as point to ExecuteCommand, fix snapshots

Browse Source
This commit is contained in:
Priya Wadhwa
2018-03-09 11:30:35 -08:00
parent 55314cef9c
commit 27b09f28be
6 changed files with 61 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
executor/cmd/root.go
+11 -18
View File
@@ -23,7 +23,6 @@ import (
"github.com/GoogleCloudPlatform/k8s-container-builder/pkg/image"
"github.com/GoogleCloudPlatform/k8s-container-builder/pkg/snapshot"
"github.com/GoogleCloudPlatform/k8s-container-builder/pkg/util"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"io/ioutil"
@@ -90,41 +89,35 @@ func execute() error {
return err
}
// Execute commands here
// Set environment variables within the image
if err := image.SetEnvVariables(sourceImage); err != nil {
return err
}
imageConfig := sourceImage.Config()
// Currently only supports single stage builds
for _, stage := range stages {
for _, cmd := range stage.Commands {
dockerCommand := commands.GetCommand(cmd)
if dockerCommand == nil {
return errors.Errorf("Invalid or unsupported docker command: %v", cmd)
}
if err := dockerCommand.ExecuteCommand(); err != nil {
dockerCommand, err := commands.GetCommand(cmd)
if err != nil {
return err
}
// Now, we get the files to snapshot from this command
// If this is nil, snapshot the entire filesystem
// Else take a snapshot of the specific files
snapshotFiles := dockerCommand.FilesToSnapshot()
var contents []byte
if snapshotFiles == nil {
contents, err = snapshotter.TakeSnapshot()
} else {
contents, err = snapshotter.TakeSnapshotOfFiles(snapshotFiles)
if err := dockerCommand.ExecuteCommand(imageConfig); err != nil {
return err
}
// Now, we get the files to snapshot from this command and take the snapshot
snapshotFiles := dockerCommand.FilesToSnapshot()
contents, err := snapshotter.TakeSnapshot(snapshotFiles)
if err != nil {
return err
}
if contents == nil {
logrus.Info("No files were changed, appending empty layer to config.")
sourceImage.AppendConfigHistory(dockerCommand.Author(), true)
sourceImage.AppendConfigHistory(constants.Author, true)
continue
}
// Append the layer to the image
if err := sourceImage.AppendLayer(contents, dockerCommand.Author()); err != nil {
if err := sourceImage.AppendLayer(contents, constants.Author); err != nil {
return err
}
}