starred/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-09-06 18:14:30 -05:00
Code Issues Packages Projects Releases Wiki Activity
21,804 Commits 13 Branches 322 Tags
ddec0cfa1640501530e2e808bcc4268eb02dba97
Commit Graph
20395 Commits
Author SHA1 Message Date
Matthias Kühnle e867f9248c Reworded description of the environment variables 
Removed the "test now..." b/c the code example is only about inspection
of env-variables.
Test follows in the next section.

Docker-DCO-1.1-Signed-off-by: Matthias Kühnle <git.nivoc@neverbox.com> (github: float64)
Upstream-commit: d73d3b03e4216bf6cf44b393108dd520acac9670
Component: engine
 2014-02-18 12:36:14 +01:00
Matthias KühnleandMatthias Kühnle efed40e022 Fixed misspelling 
Docker-DCO-1.1-Signed-off-by: Matthias Kühnle <git.nivoc@neverbox.com> (github: float64)
Upstream-commit: 8a3cb0c65e7940e928e31d6e64cce5d81d9975a6
Component: engine
 2014-02-18 11:38:23 +01:00
Matthias KühnleandMatthias Kühnle e8870b2f18 Env Clarification 
Clarified that the env variables here are an example output of env. The user should not set them to the example values.

Docker-DCO-1.1-Signed-off-by: Matthias Kühnle <git.nivoc@neverbox.com> (github: float64)
Upstream-commit: a7f1b74dd812fbc86beefea6fcd3ba4c4abaa7e2
Component: engine
 2014-02-18 11:36:46 +01:00
Sven Dowideit 90a166ff8b try out @metalivedev's suggestion, including FQIN 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: a049e93a4c164de25ce1fc1113f2929aa0aa0b5b
Component: engine
 2014-02-18 20:16:09 +10:00
Sven Dowideit 3700ea5ec4 my attempt to disentagle repository and registry (Issue #1439) 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: 940c381dd5898df4dd863a2d76a122b6610f2940
Component: engine
 2014-02-18 20:16:08 +10:00
Alexander Larsson f829291e78 archive: Fix the storing of setuid bits, etc 
In commit 3dfc910d7774d57c533b067fbe59d6b24dd803cd we changed from
syscall.Chmod() to os.Chmod(), but these take a different form of the
Mode argument. The sycall one takes the raw linux form, wheras
os.Chmod takes the os.FileMode form, and they differ for the higher
bits (setuid, setgid, etc). The raw tar header uses a form which
is compatible with the syscalls, but not the go calls.

We fix this by using hdr.FileInfo() which properly converts the mode
to what go expects.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 5ba24629610c27f08b54ff4c1f000ad6d787c156
Component: engine
 2014-02-18 09:53:30 +01:00
James Turnbull 5633a3d1c6 Merge pull request #4196 from mahata/fixTypo 
Fix typo in 'Using Supervisor with Docker' example
Upstream-commit: ef844adc3e2ba7ae702109c1bae54668a6a74aac
Component: engine
 2014-02-17 22:48:54 -05:00
Yasunori Mahata 92abc1e651 Fix typo in 'Using Supervisor with Docker' example 
Docker-DCO-1.1-Signed-off-by: Yasunori Mahata <mahata777@gmail.com> (github: mahata)
Upstream-commit: 68de32888b6bad84cd37ccd165b0e7bb013574af
Component: engine
 2014-02-17 19:43:56 -08:00
Sven Dowideit ca7b056023 suggested improvements 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 29f7e1bfcbe6654d962a55eb5006e248284b9e0c
Component: engine
 2014-02-18 13:23:28 +10:00
Sven DowideitandSven Dowideit 32cc7c3201 update a new movie: http://asciinema.org/a/7658 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: b05602a0fe6d9b9731cee0008fbac27250f361bd
Component: engine
 2014-02-18 13:23:28 +10:00
Sven Dowideit 244da2b520 swap busybox for ubuntu, its quicker.. 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: f535a58959809dbb613bf529019f26cc6ae0c6f9
Component: engine
 2014-02-18 13:23:28 +10:00
Sven Dowideit 5f957db92e rejig the helloflask example as more advanced, and move it to the end 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 3036b5a196fdbb744f94299c82dc44078361bdae
Component: engine
 2014-02-18 13:23:28 +10:00
Guillaume J. Charmes bf1c684667 Fix remote tar ADD behavior 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: 98ce0cdb4f80550462675ee3bbb927451bb76585
Component: engine
 2014-02-17 17:08:17 -08:00
Vincent Batts c39069efb0 execdriver flag for docker daemon 
like the storage-driver flag, this implements a flag for choosing the
  execdriver to be used, defaulting to lxc.

Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: 5f84d7f3146db1ac15974f1e28f77834de3e63ff
Component: engine
 2014-02-17 20:03:53 -05:00
Guillaume J. Charmes 587e65afdf Merge pull request #4159 from crosbymichael/move-volumes 
Move volumes out of container.go and into volumes.go
Upstream-commit: a3bc3bb8c338f3fb40202681dd8bd933851a651b
Component: engine
 2014-02-17 16:43:20 -08:00
Guillaume J. Charmes bd991a8a29 Merge pull request #4162 from crosbymichael/movelinks 
Move links functionality into pkg
Upstream-commit: e9db157bee3719e9c23779446dd23f84a870c92b
Component: engine
 2014-02-17 16:34:47 -08:00
Victor Vieux e253c6c2c6 Merge pull request #4168 from crosbymichael/add-listenbuffer 
Hold connections until the daemon has fully loaded
Upstream-commit: 4187f4e7504089d11740925a889e923f8adc54a7
Component: engine
 2014-02-17 16:04:49 -08:00
Michael Crosby cf7d93d809 Improve error message only if no body is returned 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: e23190b6b3ddd16b3a5f951a33e05fd75ebb8970
Component: engine
 2014-02-17 15:29:52 -08:00
Michael Crosby 78488bf1e6 Revert "Merge pull request #4151 from crosbymichael/improve-404-client-message" 
This reverts commit 6dd1bb9eb08dc144bc172b0052df7c3904896e56, reversing
changes made to 23aec9d7fcaa72db026c042046102b381e2e9d27.

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: d55cc64c4eb66c4ee536514e35e2e2094aa3d911
Component: engine
 2014-02-17 15:25:00 -08:00
Michael Crosby 7dcf535f27 Move job register into servapi 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: e743021193e589b1358d0eef0521e9d8878dd66d
Component: engine
 2014-02-17 15:10:51 -08:00
Victor Vieux e9b88ec705 Merge pull request #4153 from crosbymichael/move-proxy 
Move proxy into pkg
Upstream-commit: 518670f3d82ad8f0a9568ef5231d5e4af26860b2
Component: engine
 2014-02-17 14:51:16 -08:00
Victor Vieux f0b82b1858 Merge pull request #4188 from unclejack/update_dns_resolver_warning 
update warning about local dns resolvers
Upstream-commit: 14ed82fc892318541ff887ec01c02e6feaa63dcd
Component: engine
 2014-02-17 14:39:59 -08:00
Andy Rothfusz 51cf4f7bfe Merge pull request #4171 from SvenDowideit/4061-remote-api-warning 
change the -H TCP / docker group warning to not reference a resolved issue
Upstream-commit: c7c825d9a5f53be6f868ff401b1d61cda14e83fe
Component: engine
 2014-02-17 14:36:05 -08:00
unclejack 3c1481ab58 Merge pull request #4155 from crosbymichael/remove-reflink 
Remove unused reflink files
Upstream-commit: 66c92140c9792f001972811572e97150bba37a99
Component: engine
 2014-02-18 00:29:35 +02:00
Michael Crosby 5f4d37b73d Remove verbose logging for non errors 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 055f1a1f8181d51d3386b4270f810efd59d51d30
Component: engine
 2014-02-17 13:31:13 -08:00
unclejack 7cfa188a75 update warning about local dns resolvers 
This changes the local DNS resolver warning to explain what the
warning is about and why the default external DNS server is used.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 85b8025a35c29e0832fd13adc55177758ecbb309
Component: engine
 2014-02-17 23:29:36 +02:00
Victor Vieux 740924ecab Merge pull request #3817 from philips/CONTRIBUTING-is-just-a-dco 
fix(CONTRIBUTING): Developer Certificate of Origin w/o Grant
Upstream-commit: b7c2e8f54e6b76ec321c8c9c1f41dbc8b7c66a4e
Component: engine
 2014-02-17 12:28:05 -08:00
Victor Vieux d0ad73b7b0 Merge pull request #4178 from alexlarsson/fix-aufs-plnk 
archive: Handle aufs plink hardlinks in ApplyLayer
Upstream-commit: 8f140b2deddb192f660baa04ab64c76e0b2f1cc2
Component: engine
 2014-02-17 11:48:39 -08:00
Alexander Larsson e821f31734 archive: Handle aufs plink hardlinks in ApplyLayer 
Files in the .wh..wh.plnk directory are ignored, but other files
inside the tarfile can be hardlinks to these files. This is not
something that normally happens, as on aufs unmount such files are
supposed to be dropped via the "auplink" too, yet images on the index
(such as shipyard/shipyard, e.g. layer
f73c835af6d58b6fc827b400569f79a8f28e54f5bb732be063e1aacefbc374d0)
contains such files.

We handle these by extracting these files to a temporary directory
and resolve such hardlinks via the temporary files.

This fixes https://github.com/dotcloud/docker/issues/3884

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 6889cd9f9cfa3a6439b7702d73f27ab3fac3d3ef
Component: engine
 2014-02-17 20:46:32 +01:00
Victor Vieux ec112d1dff Merge pull request #4187 from creack/fix_hostflag_panic 
Fix DOCKER_HOST=tcp:// panic
Upstream-commit: 24498a896f5308c9f85e5ce92741330c85745398
Component: engine
 2014-02-17 11:43:53 -08:00
Michael Crosby 217301fcd0 Merge pull request #4030 from TheDude05/fix-incorrect-ip-test 
Fix IPv4 Subnet Test
Upstream-commit: 2769d66f78dfd94f8cbd4bf1ff50b5c7a039b647
Component: engine
 2014-02-17 14:41:33 -05:00
Guillaume J. Charmes 3192f2a68b Fix DOCKER_HOST=tcp:// panic 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: 513d86488046bfd898f5f1fdab39bfb302607535
Component: engine
 2014-02-17 11:35:26 -08:00
Michael Crosby d3c56b4c4a Make crosbymichael and creack netlink maintainers 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: a75c6907b48f730fe79c6c9ebfe22eeea6389f4a
Component: engine
 2014-02-17 11:17:05 -08:00
unclejack c4d3310b03 Merge pull request #4131 from tianon/vendor-golang-xattrs 
Add vendored archive/tar that includes xattrs patch
Upstream-commit: f3ff19049138afebe4e28e30be2ee60364204f50
Component: engine
 2014-02-17 21:12:28 +02:00
Guillaume J. Charmes 30a1fba1c5 Merge pull request #4167 from shykes/fix-tests-mac 
Fix or document broken tests on mac
Upstream-commit: 19e44217f5a22f94395207f9389c257b433c7c7d
Component: engine
 2014-02-17 11:01:17 -08:00
Daniel Mizyrycki 09b0499627 Merge pull request #4163 from mzdaniel/docker-ci 
docker-ci 0.5.6: Fully dockerize docker-ci. Add build test coverage. Add backup builder.
Upstream-commit: f056a5d8c552a3e7b7a272f01965bef8a5177390
Component: engine
 2014-02-17 18:56:32 +00:00
Tianon Gravi 226c83d1fa Merge pull request #4185 from tmc/fix-building-with-space 
Quote volume path in Makefile to allow spaces
Upstream-commit: 032f45683b95f0669297b5614494b31320c3da50
Component: engine
 2014-02-17 11:53:41 -07:00
Michael Crosby 4573ff0486 Merge pull request #4172 from fabiofalci/test_save_and_load 
Test for save and load commands
Upstream-commit: bc286d651da368e40d076650b2ccd45cb4820d71
Component: engine
 2014-02-17 13:52:44 -05:00
Daniel Mizyrycki d96c323380 docker-ci 0.5.6: Fully dockerize docker-ci. Add build test coverage. Add backup builder. 
Docker-DCO-1.1-Signed-off-by: Daniel Mizyrycki <daniel@docker.com> (github: mzdaniel)
Upstream-commit: b7db2d5f8022e24faff80d312977c49a4c0408f3
Component: engine
 2014-02-17 10:52:39 -08:00
Victor Vieux 4a474363c9 Merge pull request #4113 from SvenDowideit/build-quiet-help 
add a little reenforcement to the help for docker build -q
Upstream-commit: 382659e03a59d68007fee1b54192233f7484c035
Component: engine
 2014-02-17 10:38:43 -08:00
Guillaume J. Charmes 5bf062ee9c Merge pull request #3463 from songgao/patch-2 
Support submodules when building from a gh repo
Upstream-commit: a1fb3b5282248319fb2d1a14dadb2929538475c5
Component: engine
 2014-02-17 10:28:17 -08:00
Travis Cline 077c2ff0d6 Quote volume path to allow spaces 
Docker-DCO-1.1-Signed-off-by: Travis Cline <travis.cline@gmail.com> (github: tmc)
Upstream-commit: 5006509131986093a9529a748e80e023e19548f3
Component: engine
 2014-02-17 10:24:50 -08:00
Michael Crosby dfed24534a Merge pull request #4180 from alexlarsson/fix-restart-race 
Avoid temporarily unmounting the container when restarting it
Upstream-commit: 1f66296c6e725d08be8560f7f2d6ce99413af170
Component: engine
 2014-02-17 13:21:53 -05:00
Song Gao e184f36805 Support submodules when building from a gh repo 
Docker-DCO-1.1-Signed-off-by: Song Gao <song@gao.io> (github: songgao)
Upstream-commit: c9ae66ffe375156ddf39cb41664224d6e1a6f096
Component: engine
 2014-02-17 12:08:23 -06:00
unclejack 7c00aec92f Merge pull request #4164 from fabiofalci/cp_error_message 
`docker cp` error when container doesn't exist
Upstream-commit: 59e88b09676691234bc9323a8aae1bf5c4ec4482
Component: engine
 2014-02-17 19:13:55 +02:00
Tianon Gravi fc1f23f527 Add vendored archive/tar that includes xattrs patch 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: b762d3a7391dd526826a0a1f1c983ea5e54852f5
Component: engine
 2014-02-17 08:20:21 -07:00
Alexander Larsson de5db25585 Avoid temporarily unmounting the container when restarting it 
Stopping the container will typicall cause it to unmount, to keep it mounted
over the stop/start cycle we aquire a temporary reference to it during this time.

This helps with https://github.com/dotcloud/docker/issues/4036

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: ab0f3f86c8d05aa69415e6909a88b621d5b37e81
Component: engine
 2014-02-17 16:10:54 +01:00
Mike MacCana 6180b3b390 Add dockerode NodeJS implementation 
Also correctly case 'JavaScript'

Docker-DCO-1.1-Signed-off-by: Mike MacCana <mike.maccana@gmail.com> (github: mikemaccana)
Upstream-commit: 02d94dcf6ec2541c66b081d4dc251725f994747c
Component: engine
 2014-02-17 14:04:47 +00:00
Sven Dowideit 4dc8b80613 add a little space above h2->h6 - it gets a bit dense in there when there are lots of steps 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 6a5a1d44f5d6c1281a66d562b7a4310dd6c3b997
Component: engine
 2014-02-17 12:24:19 +10:00
Fabio Falci e94461f78a Test for save and load commands 
Improve test for save to tar and load from tar commands.
Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com> (github: fabiofalci)
Upstream-commit: 4ab3c31b155997821d5f75689617235fa7386efa
Component: engine
 2014-02-17 01:52:50 +00:00