p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
6,900 Commits 2 Branches 295 Tags
ba77c9041d513b53c3d70c166dcafe47e46b11c0
Commit Graph

166 Commits

Author SHA1 Message Date
Michael Crosby
fc0f37e6e1 Move image into sub pkg 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 82a5439835b0bff3ab3dfb169415948dae504d56
Component: engine
 2014-03-09 22:59:29 -07:00
unclejack
04d68b69ad handle symlinks for Docker's root dir & TMPDIR 
This removes the incomplete symlink handling from engine.go and it adds
it one place in docker.go.

It also enables handling symlinks for TMPDIR.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 611acf7a7c1c3a6796e862fb94143890a9aa4573
Component: engine
 2014-03-03 23:00:53 +02:00
unclejack
8b72c046df Merge pull request #4412 from crosbymichael/fix-env-clobber 
Don't always just append env vars, replace defaults with ones from confi...
Upstream-commit: aac9542a68ee59c62c2cf15df69f77640113bb95
Component: engine
 2014-03-03 22:52:03 +02:00
Michael Crosby
e8666de768 Don't always just append env vars, replace defaults with ones from config 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: b02b933c6292c539833c15c15299628ac3360572
Component: engine
 2014-03-01 03:46:45 -08:00
Guillaume J. Charmes
48d86198db Make the chan for utils.Go buffered in order to avoid goroutine leak 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: d3a6ee1e55a53ee54b91ffb6c53ba674768cf9de
Component: engine
 2014-02-28 16:35:43 -08:00
Tianon Gravi
e085e22f6b Adjust kernel version parsing to be more lenient of strange things like "3.12-1-amd64" 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 2ae8180de2d814e04834d41f20b2c96a06995678
Component: engine
 2014-02-24 13:38:58 -07:00
Michael Crosby
690b93143a Move proxy into pkg 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 8c39db8f96ac2a7ec479a679bc060410cee1a567
Component: engine
 2014-02-14 15:48:05 -08:00
unclejack
171ba8d692 disallow tcp:// from defaulting to 127.0.0.1:4243 
This stops docker from accepting tcp:// as a valid bind address.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 31dde3ea05e1cf4c1f45083c1b6129e8c2a362df
Component: engine
 2014-02-13 13:54:37 +02:00
Tianon Gravi
9ed97b673b Move even more stuff into dockerversion 
Also, use it in all the places. :)

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: da04f49b383c02ee28c32f948048b9e9a402bb4f
Component: engine
 2014-02-11 17:26:54 -07:00
Tianon Gravi
1ed42315f3 Move UserLookup functionality into a separate pkg/user submodule that implements proper parsing of /etc/passwd and /etc/group, and use that to add support for "docker run -u user:group" and for getting supplementary groups (if ":group" is not specified) 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: ee93f6185be3ae73c16cf41ae397bae3ce2f6c55
Component: engine
 2014-01-31 20:15:24 -07:00
Brandon Philips
93246312a1 server: add socket activation 
This adds the ability to socket activate docker by passing in
`-H fd://*` along with examples systemd configuration files.

The fastest way to test this is to run:

```
/usr/lib/systemd/systemd-activate -l 127.0.0.1:2001 /usr/bin/docker -d -H 'fd://*'
docker -H tcp://127.0.0.1:2001 ps
```

Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
Upstream-commit: 87fb2c973d8f9a8a1868ab0c2da504095d04715b
Component: engine
 2014-01-27 17:17:07 -08:00
Charles Lindsay
c462b24e66 Add comment about ignoring Sscanf error 
Docker-DCO-1.1-Signed-off-by: Charles Lindsay <chaz@chazomatic.us> (github: chazomaticus)
Upstream-commit: dea3c2655dc02c03cf7dc03d058068cf9f0d0970
Component: engine
 2014-01-22 09:32:50 -08:00
Charles Lindsay
17cbc16b08 Re-add Flavor to KernelVersionInfo 
Docker-DCO-1.1-Signed-off-by: Charles Lindsay <chaz@chazomatic.us> (github: chazomaticus)
Upstream-commit: b78ae3b652d609a895cf36886e053124d2f8ae80
Component: engine
 2014-01-20 21:26:23 -08:00
Charles Lindsay
e8c0aaecc5 Use Sscanf instead of regexp 
Docker-DCO-1.1-Signed-off-by: Charles Lindsay <chaz@chazomatic.us> (github: chazomaticus)
Upstream-commit: 5b97e00438b094db608f350732f7e4d426c50999
Component: engine
 2014-01-20 21:02:37 -08:00
Charles Lindsay
3fbfa38dfc Fix apparent typo 
Docker-DCO-1.1-Signed-off-by: Charles Lindsay <chaz@chazomatic.us> (github: chazomaticus)
Upstream-commit: 14b2b2b7c2db83ef1413a7469608f655cd15958e
Component: engine
 2014-01-20 19:49:40 -08:00
Charles Lindsay
185397ce27 Remove Flavor from KernelVersionInfo 
Also change to parsing it with regexp to keep things simple.

Docker-DCO-1.1-Signed-off-by: Charles Lindsay <chaz@chazomatic.us> (github: chazomaticus)
Upstream-commit: d2c9c1036b94b0c3e7fa3f591fa83f9c95f49406
Component: engine
 2014-01-20 19:49:39 -08:00
Michael Crosby
c2c845ecd8 Merge branch 'fix-registry-push-tags' of https://github.com/codeaholics/docker into codeaholics-fix-registry-push-tags 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 03a25c0800691806534d96f108856097e9c18d6b
Component: engine
 2014-01-20 11:23:09 -08:00
Michael Crosby
38c89dc581 Stream the cp operation on the client 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: fdd8d4b7d9dbc32a76a708d0d51c201cf9c977f0
Component: engine
 2014-01-17 10:51:29 -08:00
James Allen
82c7a6024b Add RWMutex lock into TruncIndex to fix race condition when inserting values 
The idx.index array is overwritten when a new value is inserted to the index.
When two containers are created concurrently, their ids are inserted to the
index and one can overwrite the other leaving one of ids missing from the
index. Adding a RWMutex lock around read/write operations fixes this.

Docker-DCO-1.1-Signed-off-by: James Allen <jamesallen0108@gmail.com> (github: jpallen)
Upstream-commit: 37fcbfa1f4586e4437664239fc271dda31ac1837
Component: engine
 2014-01-15 17:30:00 +00:00
Fabio Falci
be95f4675e Use https to get the latest docker version 
To avoid unexpected results since docker was using http.
For instance, my broadband doesn't return not found when it's down but
a html page saying that the internet is down. Docker was showing that
html instead of ignoring it.

Fix #3570

Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com> (github: fabiofalci)
Upstream-commit: 89bed4337d2314c3ffaac231c141b635ecc65ac5
Component: engine
 2014-01-13 20:37:29 +00:00
Guillaume J. Charmes
806b082861 Cleanup utils.Download 
Docker-DCO-1.0-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: 762a0cc4723917b4e6ca3731356e43c5e9a13f5f
Component: engine
 2014-01-08 14:22:49 -08:00
Danny Yates
38f9c632bb Remove unneeded DependencyGraph 
Docker-DCO-1.0-Signed-off-by: Danny Yates <danny@codeaholics.org> (github: codeaholics)
Upstream-commit: 6b48761ce92e5f9590fd8b2723176ab72d297e6c
Component: engine
 2014-01-08 10:14:14 +00:00
Tianon Gravi
af7e2d6bbd Run 'gofmt -s -w' 
Upstream-commit: 8f3b8f383519452001cc05bf6505e9c301ebe954
Component: engine
 2014-01-06 22:14:35 -07:00
Victor Vieux
54d230777d Merge pull request #3377 from cpuguy83/3333-fix_-H_default 
Make blank -H option default to the same as no -H was sent
Upstream-commit: 4e414f62052fd0389d79122db5b0071ddab5d027
Component: engine
 2014-01-06 11:30:27 -08:00
Paul Nasrat
0ccbdf155d Extract cgroups utilities to own submodule. 
Use mountinfo rather than for cgroups parsing.
Make helper method private and change name.
Makes method naming more explicit rather than GetThisCgroup.
Use upstream term subsystem rather than cgroupType.
Upstream-commit: c561212b837735213f146c2fac291f84dbcbc8c3
Component: engine
 2014-01-02 17:54:57 -05:00
Brian Goff
cc877515e3 Make blank -H option default to the same as no -H was sent 
Upstream-commit: 8b82b0dfe74684b5ea30b7487475f7ca4abcc58e
Component: engine
 2013-12-29 14:36:46 -05:00
Guillaume J. Charmes
cf1704f27a Merge pull request #3064 from tianon/custom-dockerinit-path 
Allow custom dockerinit path
Upstream-commit: 636dfc82b0c9aaddd5b0f5fb0f70797d5068c93e
Component: engine
 2013-12-19 14:31:41 -08:00
Andy Rothfusz
7df1c5a0f0 Merge pull request #3234 from creack/default_unix_path 
Default unix path
Upstream-commit: 1acefac97eafdb8e701763da8616b607be4f0510
Component: engine
 2013-12-17 16:24:01 -08:00
Tianon Gravi
a7db351ec0 Allow packagers to specify a custom dockerinit lookup location via DOCKER_INITPATH in dynbinary 
Only necessary if distro policy dictates that the path deviate from the paths already listed in utils/utils.go - please refrain from using it otherwise.
Upstream-commit: 2ed1001c57646f6869016739a8e177bb52f32e2a
Component: engine
 2013-12-16 22:29:08 -07:00
Tianon Gravi
af74b97c6a Always copy dockerinit locally, regardless of whether our docker binary is static, because even it might get deleted or moved/renamed 
Upstream-commit: 2035af44aae3664b217d6903cbf39c259f568490
Component: engine
 2013-12-16 22:29:00 -07:00
Guillaume J. Charmes
706b718f39 Allow to use -H unix:// like -H tcp:// 
Upstream-commit: 20605eb310f0b57bd06eea80ec63c5022fc83bde
Component: engine
 2013-12-16 16:30:23 -08:00
Johannes 'fish' Ziemke
d5accda95c Reimplement lxc-ps 
Instead of calling lxc-ps in top endpoint, we reimplement it by
calling ps and filter for pids running in a given container.
Upstream-commit: 4faba4fae78ab216f2cfd90b1ef23706d933b731
Component: engine
 2013-12-16 13:30:35 +01:00
Victor Vieux
8eac8d89db remove unused parameter in Download 
Upstream-commit: 12180948be8040a4cdf99a0e660098cd33e32832
Component: engine
 2013-12-04 11:54:11 -08:00
Michael Crosby
4ad49ae63e Merge pull request #2924 from tianon/strict-fhs-compatibility 
Add proper dockerinit path support for distros that use FHS 2.3
Upstream-commit: 8cc524996a0d29a5b11a14ef17950193d45c1e05
Component: engine
 2013-12-02 11:35:36 -08:00
Michael Crosby
26b3fb6752 Merge pull request #2829 from dotcloud/refactor_opts 
Refactor opts
Upstream-commit: fe571dd29328efe5f5318c0b146d0aa5a66217a2
Component: engine
 2013-12-02 10:41:30 -08:00
Michael Crosby
92e4ac1dc3 Merge pull request #2945 from dotcloud/refactor_stream 
Refactor stream
Upstream-commit: e1414a4c3999362c97ad66ed1dd9cd64678df9af
Component: engine
 2013-12-02 10:31:09 -08:00
Johannes 'fish' Ziemke
85e4b81e0c Make docker build return exit code of build step 
If a command during build fails, `docker build` now returns with
the exit code of that command.

This makes it necessary to change the build api endpoint to
return a json object stream.
Upstream-commit: b04c6466cdc89a107879af7a22b0917006b38730
Component: engine
 2013-12-02 17:52:37 +01:00
Guillaume J. Charmes
04d46060bc Make CopyEscapable consistent with Copy and return nil in case of success instead of io.EOF 
Upstream-commit: 77c94175bdc387e7f43876f7097b970f67116054
Component: engine
 2013-11-28 16:57:51 -08:00
Victor Vieux
ee50ddf929 split in 3 files 
Upstream-commit: 597e0e69b4c8521f39691d0a07d1f31b7116a337
Component: engine
 2013-11-28 12:16:57 -08:00
Tianon Gravi
dc3ebf1a2f Add proper dockerinit path support for distros that use FHS 2.3 
Upstream-commit: 438607ecc321a0256b7597cf278d4356632aac2f
Component: engine
 2013-11-28 11:11:30 -07:00
Guillaume J. Charmes
f211a9a21d Refactor Opts 
Upstream-commit: 1ba11384bf82f824b0efbab31aaca439cfba1b4f
Component: engine
 2013-11-26 17:46:06 +00:00
Victor Vieux
db32c4ebfa create a copy of dockerinit 
Upstream-commit: 110c4f20434af89d81580670f2cec25b1e82633a
Component: engine
 2013-11-25 20:21:54 -08:00
Guillaume J. Charmes
020e2aed63 Merge branch 'master' into use_utc_time 
Conflicts:
	image.go
Upstream-commit: 19df6c32c03a649795415bcdf2fd062715557be1
Component: engine
 2013-11-25 19:01:13 -08:00
Guillaume J. Charmes
c04337f42e Reformatting parseRun and partParse 
Upstream-commit: 476559458d49b6d4eacfdbe9025ddf69947ae2b7
Component: engine
 2013-11-22 11:58:02 -08:00
Mark Allen
65390c08ce Pass terminal setting to display utils 
Upstream-commit: 8b0cd60019b33488f8819da5c7bdd28d1d3fc737
Component: engine
 2013-11-22 00:05:55 -06:00
Guillaume J. Charmes
eec0335af0 Use UTC for time 
Upstream-commit: 806abe90ba38741707f58e98ecdcdd4bc19f52e2
Component: engine
 2013-11-21 16:43:36 -08:00
Guillaume J. Charmes
6e0c243c2e Lintify code with confidence=1 
Upstream-commit: 5e941f1ca035bb1ec014c18d277aecaa41deba85
Component: engine
 2013-11-18 16:24:11 -08:00
Michael Crosby
b91918adb1 Merge pull request #2694 from shykes/separate-integration-tests 
Separate integration tests
Upstream-commit: 51576069ad7470d308402536306c35f47cf89edb
Component: engine
 2013-11-15 18:21:34 -08:00
Michael Crosby
bf15883f56 Merge pull request #2445 from alexlarsson/fix-shared-root-from-dm 
Fix lxc start for shared root filesystems 
Upstream-commit: 629c6e36492336f01fd4e25426a5c875f52628e2
Component: engine
 2013-11-14 11:20:53 -08:00
Solomon Hykes
13d08cbd03 gofmt 
Upstream-commit: 2a209afe5fe0f27296e3e06a199bb5305910e1cf
Component: engine
 2013-11-14 10:50:43 -08:00