public_git
/
kaniko
mirror of https://github.com/GoogleContainerTools/kaniko
1
0
Fork 0
Code Issues Releases Wiki Activity

Changed directory to /workspace

This commit is contained in:
Priya Wadhwa 2018-02-28 10:05:00 -08:00
parent 30860b2c17
commit 2dc8eb27d6
No known key found for this signature in database
GPG Key ID: 0D0DAFD8F7AA73AE
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -15,5 +15,5 @@
# Builds the static Go image to execute in a Kubernetes job # Builds the static Go image to execute in a Kubernetes job
FROM scratch FROM scratch
ADD out/executor /work-dir/executor ADD out/executor /workspace/executor
ADD files/ca-certificates.crt /etc/ssl/certs/ ADD files/ca-certificates.crt /etc/ssl/certs/

2
Gopkg.lock generated
View File

@ -292,6 +292,6 @@
[solve-meta] [solve-meta]
analyzer-name = "dep" analyzer-name = "dep"
analyzer-version = 1 analyzer-version = 1
inputs-digest = "c5933c09ead2842baa85dcb4321cef9623f4ab6ec4f6c84b6579071aa1baf3e4" inputs-digest = "6e9d101389852c13c0a3dc486d69b0438b6518c42d9031e3bf0c41d7d1943438"
solver-name = "gps-cdcl" solver-name = "gps-cdcl"
solver-version = 1 solver-version = 1

2
integration_tests/integration_test.go
View File

@ -36,7 +36,7 @@ var imageTests = []struct {
{ {
description: "test extract filesystem", description: "test extract filesystem",
repo: "extract-filesystem", repo: "extract-filesystem",
added: []string{"/work-dir", "/work-dir/executor", "/dockerfile", "/dockerfile/Dockerfile"}, added: []string{"/workspace", "/workspace/executor", "/workspace/Dockerfile"},
deleted: []string{"/proc", "/sys", "/dev", "/etc/hosts", "/etc/resolv.conf"}, deleted: []string{"/proc", "/sys", "/dev", "/etc/hosts", "/etc/resolv.conf"},
}, },
} }

6
integration_tests/integration_test_yaml.go
View File

@ -47,7 +47,7 @@ type testyaml struct {
} }
var executorImage = "executor-image" var executorImage = "executor-image"
var executorCommand = "/work-dir/executor" var executorCommand = "/workspace/executor"
var dockerImage = "gcr.io/cloud-builders/docker" var dockerImage = "gcr.io/cloud-builders/docker"
var testRepo = "gcr.io/kbuild-test/" var testRepo = "gcr.io/kbuild-test/"
var dockerPrefix = "docker-" var dockerPrefix = "docker-"
@ -85,7 +85,7 @@ func main() {
var commitID = "test" var commitID = "test"
kbuild := step{ kbuild := step{
Name: dockerImage, Name: dockerImage,
Args: []string{"run", "-v", dockerfilePath + ":/dockerfile/Dockerfile", "--name", commitID, executorImage, executorCommand}, Args: []string{"run", "-v", dockerfilePath + ":/workspace/Dockerfile", "--name", commitID, executorImage, executorCommand},
} }
commit := step{ commit := step{
@ -98,7 +98,7 @@ func main() {
integrationTests := step{ integrationTests := step{
Name: "gcr.io/cloud-builders/go:debian", Name: "gcr.io/cloud-builders/go:debian",
Args: []string{"test", "integration_tests/integration_test.go"}, Args: []string{"test", "integration_tests/integration_test.go"},
Env: []string{"GOPATH=/", "PATH=/builder/bin:/go/bin:/usr/local/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/workspace"}, Env: []string{"GOPATH=/", "PATH=/builder/bin:/go/bin:/usr/local/go/bin:/workspace"},
} }
y.Steps = append(y.Steps, integrationTests) y.Steps = append(y.Steps, integrationTests)