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

Merge pull request #60 from priyawadhwa/entrypnt 

Add executable as entrypoint to image
This commit is contained in:
Aaron Prindle 2018-04-02 16:01:11 -07:00 committed by GitHub
parent 99e030c71f 85183aadee
commit 3984d44a6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
deploy/Dockerfile
View File

@ -21,3 +21,4 @@ ADD files/docker-credential-gcr /usr/local/bin/
ADD files/config.json /root/.docker/ ADD files/config.json /root/.docker/
ENV HOME /root ENV HOME /root
ENV PATH /usr/local/bin ENV PATH /usr/local/bin
ENTRYPOINT ["/kbuild/executor"]

5
integration_tests/integration_test_yaml.go
View File

@ -107,7 +107,6 @@ type testyaml struct {
} }
var executorImage = "executor-image" var executorImage = "executor-image"
var executorCommand = "/kbuild/executor"
var dockerImage = "gcr.io/cloud-builders/docker" var dockerImage = "gcr.io/cloud-builders/docker"
var ubuntuImage = "ubuntu" var ubuntuImage = "ubuntu"
var testRepo = "gcr.io/kbuild-test/" var testRepo = "gcr.io/kbuild-test/"
@ -155,7 +154,7 @@ func main() {
kbuildImage := testRepo + kbuildPrefix + test.repo kbuildImage := testRepo + kbuildPrefix + test.repo
kbuild := step{ kbuild := step{
Name: executorImage, Name: executorImage,
Args: []string{executorCommand, "--destination", kbuildImage, "--dockerfile", test.dockerfilePath, "--context", test.context}, Args: []string{"--destination", kbuildImage, "--dockerfile", test.dockerfilePath, "--context", test.context},
} }
// Pull the kbuild image // Pull the kbuild image
@ -199,7 +198,7 @@ func main() {
kbuildImage := testRepo + kbuildPrefix + test.repo kbuildImage := testRepo + kbuildPrefix + test.repo
kbuild := step{ kbuild := step{
Name: executorImage, Name: executorImage,
Args: []string{executorCommand, "--destination", kbuildImage, "--dockerfile", test.dockerfilePath}, Args: []string{"--destination", kbuildImage, "--dockerfile", test.dockerfilePath},
} }
// Pull the kbuild image // Pull the kbuild image
pullKbuildImage := step{ pullKbuildImage := step{