89ec17d113
Replace "amd64" build tags with "cgo" as appropriate, and remove where unnecessary
...
Signed-off-by: Andrew Page <admwiggin@gmail.com>
2014-08-06 17:20:21 -06:00
bc684fae64
Merge pull request #7430 from tamsky/docfixes
...
style, grammar, spelling fixes.
2014-08-06 16:11:52 -07:00
e86d87e1ce
Merge pull request #7431 from tamsky/fixes-7105
...
add warning re: changing value of `dm.basesize`.
2014-08-06 15:22:42 -07:00
8733cd7c0b
Merge pull request #7428 from crosbymichael/update-libcontainer-aug2
...
Update libcontainer to 5589d4d879f1d7e31967a927d3e
2014-08-06 15:41:35 -06:00
c9ca37dfe9
Merge pull request #7448 from tiborvass/fix-tmpdir-integration-tests
...
Fix tmpdir integration tests
2014-08-06 23:54:09 +03:00
90da088491
Merge pull request #27 from tianon/update-libcontainer
...
Update hack/vendor.sh to use libcontainer's update-vendor.sh script as the source of truth for libcontainer deps and not include them in Docker's repo twice
2014-08-06 13:35:46 -07:00
872db07119
Fix integration tests by adding DOCKER_TMPDIR env in the test init function
...
Signed-off-by: Tibor Vass <teabee89@gmail.com>
2014-08-06 15:55:50 -04:00
fba37a038d
Update vendor with the updated canonical deps from libcontainer
...
Signed-off-by: Andrew Page <admwiggin@gmail.com>
2014-08-06 13:19:41 -06:00
5101173e1f
Update hack/vendor.sh to use libcontainer's update-vendor.sh script as the source of truth for libcontainer deps and not include them in Docker's repo twice
...
Signed-off-by: Andrew Page <admwiggin@gmail.com>
2014-08-06 13:18:24 -06:00
5e20b0027c
Fix TestBuildForbiddenContextPath after TMPDIR change
...
Signed-off-by: Tibor Vass <teabee89@gmail.com>
2014-08-06 14:24:00 -04:00
66c8f87e89
Merge pull request #6456 from rhatdan/tmpdir
...
Docker should use /var/lib/docker/tmp for large temporary files.
2014-08-06 20:31:46 +03:00
bd30746e07
add warning re: changing value of `dm.basesize`.
...
Signed-off-by: Marc Tamsky <mtamsky@gmail.com> (github: tamsky)
2014-08-05 19:28:07 -07:00
6215422286
Update libcontainer to 5589d4d879f1d7e31967a927d3e
...
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-05 18:13:43 -07:00
07099b6256
style, grammar, spelling fixes.
...
Signed-off-by: Marc Tamsky <mtamsky@gmail.com> (github: tamsky)
2014-08-05 18:11:32 -07:00
042b642d40
Merge pull request #7186 from jamtur01/community
...
Added proposed Docker Community Guidelines
2014-08-05 15:44:11 -07:00
0ea5160d2a
Merge pull request #7412 from bfirsh/rename-docker-config
...
Rename DOCKER_CONFIG envvar to DOCKER_CERT_PATH
2014-08-05 14:52:28 -07:00
b4813f2841
Docker should use /var/lib/container/tmp for large temporary files.
...
/tmp is often a tmpfs file system and large temporary files could cause
docker commands to fail. Also using /tmp potentially allows users on the
system to get access to content, or even attack the content. Moving the tmpdir to
/var/lib/container/tmp will protect the data.
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Conflicts:
docker/docker.go
2014-08-05 16:43:42 -04:00
8f4b477c32
Merge pull request #6909 from LK4D4/prune_cmd_on_entrypoint_setting_#5147
...
Cleanup cmd on entrypoint setting
2014-08-05 11:50:18 -07:00
e47415d5f5
Merge pull request #7349 from knan-linpro/master
...
networking.md: Networking between containers works without ip_forward
2014-08-04 23:51:22 -04:00
a49de2c467
Rename DOCKER_CONFIG envvar to DOCKER_CERT_PATH
...
DOCKER_CONFIG was introduced in #6984 .
We may use "config" for other purposes (e.g. #7232 ). Until we
have made a design decision around how configuration files will
work, DOCKER_CERT_PATH is a much safer name to rely on for future
compatibility.
Docker-DCO-1.1-Signed-off-by: Ben Firshman <ben@firshman.co.uk> (github: bfirsh)
2014-08-04 17:36:53 -07:00
3c1212ca30
Merge pull request #7377 from tianon/daemon-build-tag
...
Add a "daemon" build tag and toggle it with the already-existing "DOCKER_CLIENTONLY" build variable
2014-08-04 17:32:03 -07:00
6b94f2d9be
Merge pull request #7310 from stevecrozz/maintainers-grammar-update
...
Correct grammar in MAINTAINERS.md
2014-08-04 17:57:08 -06:00
ba663eac3a
Adjust build tags to be client-only in "make cross" too
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-08-04 15:05:12 -06:00
1b95590d06
Add a "daemon" build tag and toggle it with the already-existing "DOCKER_CLIENTONLY" build variable
...
This works mostly by refactoring our "main" package to be careful about what it imports based on the daemon build tag. :)
Also, I've updated Travis to test "client-only" compilation after it tests the daemon version.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-08-04 15:05:12 -06:00
74212a1565
Correct grammer in MAINTAINERS.md
...
Signed-off-by: Stephen Crosby <stevecrozz@gmail.com>
2014-08-04 13:37:01 -07:00
0af135e906
Merge pull request #7388 from tianon/remove-pkg-system
...
Purge the bits of pkg/system that moved to libcontainer/system
2014-08-04 15:49:13 -04:00
07fce305f7
Merge pull request #7407 from crosbymichael/update-libcontainer-aug1
...
Update libcontainer to version 68ea1234a0b046803aacb2562df0da1
2014-08-04 12:37:13 -07:00
cd6b903825
Ensure thread is locked in sysinit for docker
...
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-04 12:34:27 -07:00
22f373aeda
Update libcontainer to 68ea1234a0b046803aacb2562df
...
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-04 12:34:11 -07:00
aa2d6dbc0c
Inherit Cmd only if no --entrypoint specified on run
...
Fixes #5147
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-08-04 21:17:37 +04:00
1b6546b840
Cleanup Cmd on ENTRYPOINT instruction
...
Fixes #5147
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-08-04 20:48:36 +04:00
7dba5024e8
Remove redundant checks in runconfig.Merge
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-08-04 20:48:09 +04:00
d48492a12e
Merge pull request #7391 from LK4D4/fix_relative_workdir_example
...
Fix example of relative WORKDIR
2014-08-03 10:14:33 -04:00
41a553ca35
Merge pull request #7363 from lcoote/master
...
#1852 Remote API documentation incorrect regarding private registries
2014-08-03 21:21:43 +10:00
5514afcd88
Fix example of relative WORKDIR
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-08-03 12:28:25 +04:00
60341f80d7
Purge the bits of pkg/system that moved to libcontainer/system
...
Signed-off-by: Andrew Page <admwiggin@gmail.com>
2014-08-02 01:35:04 -06:00
bec676e2de
Merge pull request #7380 from tiborvass/merge-7368
...
Accept vanilla Linux Foundation signoffs (Closes 7368)
2014-08-01 16:33:13 -07:00
6b04d597ee
Update CONTRIBUTING.md and test new DCO signature in this commit
...
Signed-off-by: Tibor Vass <teabee89@gmail.com>
2014-08-01 19:30:58 -04:00
4909a70204
Accept vanilla Linux Foundation signoffs
...
This allows signing off commits with `git commit -s`
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Cleaned up DCO regex
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
2014-08-01 19:30:34 -04:00
e9b4cafd8d
Merge pull request #7385 from crosbymichael/return-content-type-error
...
Return error for bad content-type
2014-08-01 16:30:18 -07:00
8266c381d6
Check content type along with content length
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
2014-08-01 15:59:19 -07:00
a5c5dc121c
#1852 Remote API documentation incorrect regarding private registries
...
Issues addressed:
- Remote API doco refers to "registry" parameter which is not supported
- Neglects to mention "tag" parameter which is supported
- Offers no guidance on pushing to private registries
Changes made:
- As directed in review comments, `registry` removed from all api versions (1.0-1.14)
- Have added documentation for `tag` parameter and guidance on private registries for versions 1.10-1.14 (I have only validated this on .10)
Docker-DCO-1.1-Signed-off-by: Lachlan Coote <lachlan.t.coote@gmail.com> (github: lcoote)
2014-08-01 15:58:01 -07:00
78ac75fe00
Return error for bad content-type
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
2014-08-01 15:26:30 -07:00
ca602cd1e5
Merge pull request #7367 from ichik1/btrfs-is-not-experimental
...
Btrfs graph driver is not experimental
2014-08-01 16:49:05 -04:00
69aa07af1e
Merge pull request #7378 from rajdeepd/master
...
Added test cases for no port, -ve port passed to nat.ParsePortSpecs
2014-08-01 13:45:17 -07:00
867ffca84f
Merge pull request #7379 from tiborvass/merge-7366
...
Cleanup: merge container-related jobs into daemon/ (Closes 7366)
2014-08-01 13:43:47 -07:00
f46de04af6
Cleanup daemon/Daemon.Install for readability
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
2014-08-01 14:25:02 -04:00
d037007658
Move "containers" to daemon/list.go
...
This is part of an effort to break apart the deprecated server/ package
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
2014-08-01 14:24:58 -04:00
aa49632fef
Move "top" to daemon/top.go
...
This is part of an effort to break apart the deprecated server/ package
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
2014-08-01 14:24:52 -04:00
49e61f62ce
Move "changes" to daemon/changes.go
...
This is part of an effort to break apart the deprecated server/ package
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Fix issues with renaming changes to container_changes
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
2014-08-01 14:24:46 -04:00
Tianon Gravi
Michael Crosby
unclejack
Tibor Vass
Marc Tamsky
Solomon Hykes
Dan Walsh
James Turnbull
Ben Firshman
Stephen Crosby
Alexandr Morozov
Sven Dowideit
Victor Vieux
Lachlan Coote