p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,206 Commits 2 Branches 295 Tags
bc68396213e78e924eb7ba852a6d94de4ca4f50a
Commit Graph

30 Commits

Author SHA1 Message Date
Alexandr Morozov
53991068e0 Use State waiting functions 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 57d86a5619adae5e08e0e28fba99f6a7c2f5ee54
Component: engine
 2014-06-27 15:07:40 +04:00
Erik Hollensbe
4526ee08e7 fix whitespace that precedes the escape in a multiline string. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 03c5c1930d884f0052b4940643fa5b4fc57bdea7
Component: engine
 2014-06-25 13:39:47 -07:00
cyphar
8e5f8dab9b server: buildfile: ensure that ONBUILD triggers aren't committed 
This patch fixes the bug where ONBUILD triggers are committed each build
step created during the ONBUILD trigger execution, since the triggers are
only wiped *after* all ONBUILD trigger steps have been committed. This was
fixed by simply copying the ONBUILD triggers and wiping the config
*before* committing anything.

Docker-DCO-1.1-Signed-off-by: Aleksa Sarai <cyphar@cyphar.com> (github: cyphar)
Upstream-commit: 7303467c771cc98f0efcdf8cbb2e0538ad496b72
Component: engine
 2014-06-19 20:33:17 +10:00
unclejack
e498aa81c8 add support for COPY to docker build 
This adds a COPY command to docker build which works like ADD, but is
only for local files and it doesn't extract files.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 180c2a678510a93a442f1bcdb6a47287ec88ccd6
Component: engine
 2014-05-29 00:07:52 +03:00
Michael Crosby
0b384856c1 Fix add hang when dest is . 
Fixes #3960
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: c8ada301baf66360af6a3445b7c2abd629da3fd1
Component: engine
 2014-05-23 00:26:38 +00:00
Michael Crosby
456a42e6c9 Merge pull request #5839 from unclejack/improve_build_rm 
add --force-rm to clean up after a failed build
Upstream-commit: db1a3551a34e054ee687545ab4922114d13d29d0
Component: engine
 2014-05-22 10:54:05 -07:00
Tibor Vass
1e7aa2e3c4 remove chmod 755: fixes #5941 
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
Upstream-commit: 56a53c72d285b3f9fa6b34dcb81c9720a1974bde
Component: engine
 2014-05-21 11:35:08 -07:00
Guillaume J. Charmes
9c8b2dfbeb Remove the mtime for temp file. Prevent false negative cache 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: bcfe2ceffb1c4c7006570d4ba21ed2068bb448a1
Component: engine
 2014-05-20 21:31:28 +00:00
Brice Jaglin
76507afd3a force the read of the tarSum so that sums actually get computed 
Docker-DCO-1.1-Signed-off-by: Brice Jaglin <bjaglin@teads.tv> (github: bjaglin)
Upstream-commit: 9810da853bd890b6c963017555c3555ef9e0d842
Component: engine
 2014-05-20 21:31:28 +00:00
unclejack
978fda27ac bump remote api to 1.12 & add --force-rm to build 
This adds a `--force-rm` flag to docker build which makes the Docker
daemon clean up all containers, even when the build has failed.

This new flag requires that we bump the remote API, so we also bump the
remote API version.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 667e2bd4ea5fbc8698c34565f955cb92cff92890
Component: engine
 2014-05-19 23:10:49 +03:00
Alexandr Morozov
20387c224e Make chmod on ADDed files 
Fixes #3979
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 620c8c72535670e8358cebc65a2fb424be58a93c
Component: engine
 2014-05-20 00:09:39 +04:00
Victor Vieux
0eaa2babd7 Merge pull request #5436 from hobofan/master 
reapply Cmd value even if CmdAdd returns early
Upstream-commit: 4b587ac118284fbbc9b10c20319b2dd8c20d4b4f
Component: engine
 2014-05-16 12:45:23 -07:00
Johan Euphrosine
c6f81b2d5f server/buildfile: correct daemon.Create comments 
s/and start it//

Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
Upstream-commit: 8b31824ad6118ed505b43443816c1492e3d81c8c
Component: engine
 2014-05-16 10:50:02 -07:00
Michael Crosby
740073112a Update code to handle new path to Follow Symlink func 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: ca040b1a377c467a9504ffa256ae77d9e3d29f0c
Component: engine
 2014-05-13 10:54:08 -07:00
Solomon Hykes
626d91d1bd Merge pull request #5116 from LK4D4/chown_only_on_content_#5110 
Upstream-commit: 1736b025eac26f107fbb8502e276c215d8e86336
Component: engine
 2014-05-08 23:16:22 -07:00
Victor Vieux
fda92cf483 Revert "refactor build job to know only configFile" 
This reverts commit b9731bccf2b2cc8c06ef8bdb41f72ca4791e63db.

Conflicts:
	server/server.go

Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 2aff119baa15cff37f9b2004755f144f16a87801
Component: engine
 2014-05-07 22:59:13 +00:00
Victor Vieux
f18c414a67 Revert "rename configFile to auth in the job" 
This reverts commit e9c3e397436221528312c0d3b291ae5a12862ed2.

Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 331e77f9ed938b3a8c7346ef46a9f6f5cd2dc794
Component: engine
 2014-05-07 22:58:09 +00:00
LK4D4
1f5f83d095 Change owner only on copied content 
Fixes #5110
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 91b7d8ebd31dba64b551de85e70786c568cb402a
Component: engine
 2014-05-07 20:40:22 +04:00
Michael Crosby
9343517f87 Move Attach from container to daemon 
This moves the Attach method from the container to the daemon.  This
method mostly supports the http attach logic and does not have anything
to do with the running of a container.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 41cfaa738c2d8583ecca50948c9df5eda3dfd7f1
Component: engine
 2014-05-05 16:48:56 -07:00
Hobofan
73af1a1e6d reapply Cmd value even if CmdAdd returns early 
Docker-DCO-1.1-Signed-off-by: Maximilian Goisser <goisser94@gmail.com> (github: hobofan)
Upstream-commit: 6893689336e3cc325d1e6bcc6d61955418186936
Component: engine
 2014-04-29 00:27:32 +02:00
Alexander Larsson
f7be50364d Rename runtime/* to daemon/* 
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 359b7df5d2af5733b8a1ea6746d062053053b23e
Component: engine
 2014-04-17 14:43:01 -07:00
Victor Vieux
51ab1031ea rename configFile to auth in the job 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: e9c3e397436221528312c0d3b291ae5a12862ed2
Component: engine
 2014-04-14 17:15:22 +00:00
Victor Vieux
f3aecbde7d refactor build job to know only configFile 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: b9731bccf2b2cc8c06ef8bdb41f72ca4791e63db
Component: engine
 2014-04-10 22:29:03 +00:00
unclejack
116769b466 delete containers during build after every step 
This commit changes the way docker build cleans up containers.
Containers get cleaned up right away after they've been committed and
they've become an image.

When the build fails, only the last container of the failing step is
left behind.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 7931be5cba784b36a145af7ed0153ade6474dabd
Component: engine
 2014-04-10 14:46:42 +03:00
Guillaume J. Charmes
9cddc561e1 Change ownership to root for ADD file/directory 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: 026aebdebbaa05eab25134949ed5d5bda655ba67
Component: engine
 2014-04-01 14:17:31 -07:00
unclejack
8972e580e1 Merge pull request #4759 from crosbymichael/comments-in-buildfile 
Strip comments before parsing line continuations
Upstream-commit: 5b9c8607d90c20282eb65b75112f09634bcba277
Component: engine
 2014-03-28 11:16:32 +02:00
Michael Crosby
6fd95365ed Strip comments before parsing line continuations 
Fixes #3898
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 67af7b3fb0b5e40a435b434c57291cb2989275ce
Component: engine
 2014-03-27 02:41:08 +00:00
Michael Crosby
1c550a00a4 Follow symlinks inside container root for build's ADD 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 0fb01fd8fe376a3518b1050ab62f2b3370d62535
Component: engine
 2014-03-27 02:07:35 +00:00
Tianon Gravi
2dba72a6f7 Add proper support for relative WORKDIR instructions 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 054b85a7b25e46935c0d91f544aac69dc3497468
Component: engine
 2014-03-15 14:03:16 -06:00
Michael Crosby
d7147519fc Move server and buildfile into server pkg 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 5239aa1f11c32f3befc25fb2fa8a0ecf75ec4bf6
Component: engine
 2014-03-14 09:37:08 -07:00