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
e353a77e4f
Merge pull request #3287 from vieux/fix_progressbar_display_push
...
fix progressbar in docker push
Upstream-commit: 81e596e27288c1dd9c48273fcd131742ef8e2d89
Component: engine
2014-01-02 13:38:11 -08:00
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
e485023364
Change BuildFile in order to use TarSum instead of custom checksum
...
Upstream-commit: 894d4a23fba1a67087ae5bbe9c50c56e6dc09289
Component: engine
2013-12-26 16:16:26 -08:00
ad15888099
Log files name along with their checksum in TarSum + add a Method to retrieve the checksum map
...
Upstream-commit: fc9f4d8bad975ffe060eb741b38c5502dd9886a4
Component: engine
2013-12-26 16:01:36 -08:00
d755e22ee6
Remove old debug from tarsum
...
Upstream-commit: 360078d7613e1939c6d2f949ccac14c6ab9d568e
Component: engine
2013-12-26 15:39:06 -08:00
a481c1b450
Move utility package 'term' to pkg/term
...
Upstream-commit: 7ce7516c12f58aa71cd055b7c0bef6585d3f2ab3
Component: engine
2013-12-23 23:42:37 +00:00
6071fba45d
fix progressbar in docker push
...
Upstream-commit: 85f9b778f54a823566dd5d81e0e0a9875a64569d
Component: engine
2013-12-20 16:55:41 -08:00
9e800ce4e1
Add arch/os info to user agent (Registry)
...
Upstream-commit: e4561438f1156a96ee7fd2e25a8b9e6a3831fa83
Component: engine
2013-12-20 08:19:25 -08:00
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
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
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
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
d49fddb652
Improve TestParseHost
...
Upstream-commit: 69a31c33864abeaacbe9a07e50dd0cd8d406b15e
Component: engine
2013-12-16 16:35:56 -08:00
706b718f39
Allow to use -H unix:// like -H tcp://
...
Upstream-commit: 20605eb310f0b57bd06eea80ec63c5022fc83bde
Component: engine
2013-12-16 16:30:23 -08:00
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
bf9ceb198b
Improve FollowLink to handle recursive link and be more strick
...
Upstream-commit: 8fd9633a6bb136af6666626a76056b1592fef0c7
Component: engine
2013-12-11 17:19:02 -08:00
19acae63e7
Fix volumes on the host by following symlinks in a scope
...
Upstream-commit: f396c42cad2b23dae5e3296c18fd6190f210c022
Component: engine
2013-12-11 16:31:02 -08:00
e5b8f32fec
disable progressbar in non-terminal
...
Upstream-commit: 2c646b2d466b1401fccbfd453a68f0023dd5e300
Component: engine
2013-12-06 14:09:27 -08:00
d92518e8b2
fix jsonmessage in build
...
Upstream-commit: 05f416d869777aa613a5a197ad287c18b77366d3
Component: engine
2013-12-06 14:09:27 -08:00
dbb1b9b6d5
fix jsonmessage
...
Upstream-commit: 4bc100b494022901d4d7f51cba303ae3562b1303
Component: engine
2013-12-04 11:57:18 -08:00
8eac8d89db
remove unused parameter in Download
...
Upstream-commit: 12180948be8040a4cdf99a0e660098cd33e32832
Component: engine
2013-12-04 11:54:11 -08:00
f2f4f227e1
Merge pull request #2790 from proppy/fix-tar
...
utils: remove dotcloud/tar dep
Upstream-commit: dc9f8bf072dfb65f32c6dc569d133361030daa0a
Component: engine
2013-12-04 11:06:13 -08:00
0171e1cc75
Merge pull request #2339 from shin-/private_reg_auth
...
Private registry auth
Upstream-commit: 258d707548619eae7517b39ff0bc9541ebec566c
Component: engine
2013-12-03 15:29:38 -08:00
71ac3b3d2a
Handle small screens
...
Upstream-commit: f50fe14e13160c7c823613710a6fa12c9fc13bcb
Component: engine
2013-12-03 14:21:33 -08:00
13eb2fe87b
Added HTTPAuthDecorator
...
Upstream-commit: bbf9135adcaec9edc2e9d0ebce6a78ba3ade3689
Component: engine
2013-12-03 16:24:47 +01:00
16982ec76d
small reformatting jsonmessage
...
Upstream-commit: 5cd09dc1158c62754641dce9c59a735c41e59722
Component: engine
2013-12-02 11:49:11 -08:00
134dbf8c6a
Fix displayJson behavior (dont add newline)
...
Upstream-commit: 6ea3b9651b3793e31a320926472ff23383a7b915
Component: engine
2013-12-02 11:47:13 -08:00
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
26b3fb6752
Merge pull request #2829 from dotcloud/refactor_opts
...
Refactor opts
Upstream-commit: fe571dd29328efe5f5318c0b146d0aa5a66217a2
Component: engine
2013-12-02 10:41:30 -08:00
