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
abbecb8a25
as you could have multiple messages per line with streams, don't \r
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 03f0ec35ae31420dd6a56883535056087b1a75dd
Component: engine
2014-03-13 22:26:42 +00:00
11f1b48016
Merge pull request #4563 from creack/signal-improvment
...
Signal improvments
Upstream-commit: b5a544b02e2d6f5e880064f327bcb1d5d866e30e
Component: engine
2014-03-10 17:59:17 -07:00
357d278b81
Move signal to pkg
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
Upstream-commit: c5632622391921160687f3e0155bdfe3d3cfc07d
Component: engine
2014-03-10 17:36:32 -07:00
9ff573ff6e
Merge pull request #3985 from creack/add_freebsd_support
...
Add freebsd client support
Upstream-commit: 8bcb156694152d90698c3a0cb7b9cf539a838f8e
Component: engine
2014-03-11 00:58:30 +02:00
66069773bc
Merge branch 'master' into add_freebsd_support
...
Conflicts:
archive/archive.go
archive/start_unsupported.go
Upstream-commit: bb43761940848650c1eab3c097d826892bd5b140
Component: engine
2014-03-10 13:20:49 -07:00
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
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
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
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
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
e3db7f47ed
Use a more defensive vendored archive/tar import path to make it clear this isn't upstream's released archive/tar
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 2ca4e0ea60851ff8e9c0a05dc13fa23436c529b6
Component: engine
2014-02-27 09:43:44 -07:00
1796b9151c
Merge pull request #4276 from tianon/json-stream-newlines
...
Add newlines to the JSON stream functions
Upstream-commit: 01dc79b3ea0dcca26acb3c3d6b949084fabd9074
Component: engine
2014-02-26 21:25:42 -05:00
80c2203352
Merge pull request #4297 from dotcloud/add-simple-checksum
...
registry: Added simple checksums (sha256) for layers
Upstream-commit: 389eba4396b2a7341f7aff25d94577c1a33341b7
Component: engine
2014-02-26 18:15:48 -08:00
4e0301e92e
Merge pull request #4316 from tianon/more-lenient-kernel-version
...
Adjust kernel version parsing to be more lenient of strange things like "3.12-1-amd64"
Upstream-commit: a42ef866ed19fc3bd8d1732ee88458e250e7491f
Component: engine
2014-02-26 16:15:56 +02:00
61c173dbcd
fix divide by zero error
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: b7a0f62f0f9079d0d628a284a77af0c474eb9375
Component: engine
2014-02-25 08:01:46 +00:00
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
f208199d26
registry: Added simple checksums (sha256) for layers
...
Docker-DCO-1.1-Signed-off-by: Sam Alba <sam@docker.com > (github: samalba)
Upstream-commit: 8d230cf89cfe3c6c5293d7807c1bffa1cf799d6b
Component: engine
2014-02-23 18:50:04 -08:00
ecb0d90e19
Add newlines to the JSON stream functions
...
This makes the JSON streams a _lot_ easier to parse in less well-baked JSON parsers, and no less so in better ones.
Line-based JSON streams are very, very common, where simply chunk-based is not very common at all.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 060da572d20dfeee4fe02ce6b975a6cb33e50dbe
Component: engine
2014-02-21 00:07:44 -07:00
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
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
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
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
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
b0715e2cd8
Add Freebsd client support
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
Upstream-commit: 547ac421995860f99d1d0803c3c1e7ea51dc681e
Component: engine
2014-02-06 16:40:39 -08:00
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
e8f6d5eb59
Update/fix build tags, Dockerfile, and release.sh for proper building and releasing of linux/386 and linux/arm cross-compiled client binaries
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 065dd231dd7d7858df982a8decfade9df936cf63
Component: engine
2014-01-31 03:16:42 -07:00
185286d85e
Remove all darwin specific files and use more generic _unsupported with build tags.
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
Upstream-commit: 45dd051e8ee2e0e18d8ffec99f65878c20bd11e9
Component: engine
2014-01-30 23:10:56 +00:00
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
10c689f549
move pull and import to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 9dcbdbc4b1addb67c0fdcadab1c8f98f30e58b4c
Component: engine
2014-01-24 14:46:31 -08:00
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
875dd77195
Re-add kernel Flavor tests
...
Docker-DCO-1.1-Signed-off-by: Charles Lindsay <chaz@chazomatic.us > (github: chazomaticus)
Upstream-commit: cce099aa34e9588abc778b5f106bf862d4a838b0
Component: engine
2014-01-21 09:56:53 -08:00
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
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
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
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
7e4afd3263
Add failing test for odd kernel version
...
Docker-DCO-1.1-Signed-off-by: Charles Lindsay <chaz@chazomatic.us > (github: chazomaticus)
Upstream-commit: fc30346086a890687d145c33aa8fb3d0ad6a4b7e
Component: engine
2014-01-20 19:49:39 -08:00
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
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
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
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
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
7e278d9841
Disable compression for build. More space usage but much faster upload
...
Docker-DCO-1.0-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
Upstream-commit: c6350bcc2411dfc5039976239e143f6b9da64444
Component: engine
2014-01-08 14:21:13 -08:00
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
7dedb038c3
Disable compression for build. More space usage but much faster upload
...
Docker-DCO-1.0-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
Upstream-commit: 1137ecf7d1301e7f743978e02d874093bd68dacb
Component: engine
2014-01-07 17:46:04 -08:00
af7e2d6bbd
Run 'gofmt -s -w'
...
Upstream-commit: 8f3b8f383519452001cc05bf6505e9c301ebe954
Component: engine
2014-01-06 22:14:35 -07:00
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
3d5851faf7
Merge pull request #3310 from pnasrat/cgroups-subpackage
...
Extract cgroups utilities to own submodule.
Upstream-commit: 4f31141e13bad1c4494a15dd9f283107fc85eee1
Component: engine
2014-01-06 11:27:29 -08:00
cf9f2e5413
Merge pull request #3353 from creack/improve_add_cache
...
Improve add cache
Upstream-commit: 194eb246efc68647fd5c4efc240b49fc76235a90
Component: engine
2014-01-02 16:07:33 -08:00
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
