public_git/kaniko
1
0
Fork 0
mirror of https://github.com/GoogleContainerTools/kaniko synced 2026-10-21 11:04:24 +02:00
Code Issues Releases Wiki Activity

Fixed merge conflicts, support multistage builds

Browse Source
This commit is contained in:
Priya Wadhwa
2018-04-26 16:39:02 -07:00
parent cf713fe0cd 904575d0cb
commit 48688df7a6
1012 changed files with 5596 additions and 141672 deletions
Download Patch File Download Diff File Expand all files Collapse all files
integration_tests/dockerfiles/Dockerfile_test_mv_add
+3
View File
@@ -0,0 +1,3 @@
FROM busybox
ADD context/tars /tmp/tars
RUN mv /tmp/tars /foo
integration_tests/dockerfiles/Dockerfile_test_run
+3 -3
View File
@@ -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
integration_tests/dockerfiles/Dockerfile_test_scratch
-4
View File
@@ -1,4 +0,0 @@
FROM scratch
ADD context/foo /foo
ENV hello hello
ADD context/foo /$hello
integration_tests/dockerfiles/config_test_mv_add.json
+12
View File
@@ -0,0 +1,12 @@
[
{
"Image1": "gcr.io/kaniko-test/docker-test-mv-add:latest",
"Image2": "gcr.io/kaniko-test/kaniko-test-mv-add:latest",
"DiffType": "File",
"Diff": {
"Adds": null,
"Dels": null,
"Mods": null
}
}
]
integration_tests/dockerfiles/config_test_run.json
+1 -37
View File
@@ -6,43 +6,7 @@
"Diff": {
"Adds": null,
"Dels": null,
"Mods": [
{
"Name": "/var/log/dpkg.log",
"Size1": 57481,
"Size2": 57481
},
{
"Name": "/var/log/apt/term.log",
"Size1": 23671,
"Size2": 23671
},
{
"Name": "/var/cache/ldconfig/aux-cache",
"Size1": 8057,
"Size2": 8057
},
{
"Name": "/var/log/apt/history.log",
"Size1": 5661,
"Size2": 5661
},
{
"Name": "/var/log/alternatives.log",
"Size1": 2579,
"Size2": 2579
},
{
"Name": "/usr/lib/python2.7/dist-packages/keyrings/__init__.pyc",
"Size1": 140,
"Size2": 140
},
{
"Name": "/usr/lib/python2.7/dist-packages/lazr/__init__.pyc",
"Size1": 136,
"Size2": 136
}
]
"Mods": null
}
}
]
integration_tests/dockerfiles/config_test_scratch.json
-12
View File
@@ -1,12 +0,0 @@
[
{
"Image1": "gcr.io/kaniko-test/docker-test-scratch:latest",
"Image2": "gcr.io/kaniko-test/kaniko-test-scratch:latest",
"DiffType": "File",
"Diff": {
"Adds": null,
"Dels": null,
"Mods": null
}
}
]