Commit Graph

21804 Commits

Author SHA1 Message Date
b3054dc35d add make test-integration
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 4326e541f843e5c053221f15fef546b42ba29e25
Component: engine
2014-01-30 23:50:23 +00:00
af03824925 Merge pull request #3859 from rogaha/add_missing_attributes
- Fixed the last cli.call's parameter from CmdSearch
Upstream-commit: 9ae51c7403c75dfa746afc0a50d7c28b87d72d97
Component: engine
2014-01-30 15:44:36 -08:00
91d61b7621 - Fixed the last cli.call's parameter from CmdSearch
Docker-DCO-1.1-Signed-off-by: Roberto Hashioka <roberto.hashioka@docker.com> (github: rogaha)
Upstream-commit: 2655a108e1950534f0fa1d6034ab61444fe35ee5
Component: engine
2014-01-30 23:21:42 +00: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
38ee88c4ce fix TestExitCode
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 720f64af1855235b6f518ad97dbb89eb61191222
Component: engine
2014-01-30 22:59:21 +00:00
26a8ad8626 Merge pull request #3854 from vieux/fix_tests
remove TestAllocateTCPPortLocalhost faillure in tests
Upstream-commit: 9481afa6172c8d50ffe6d5c9eff80d36361fa11e
Component: engine
2014-01-30 13:59:32 -08:00
d1401083fb remove TestAllocateTCPPortLocalhost faillure in tests
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 8e619e13ca3906e849944a4b015b676b93c9f145
Component: engine
2014-01-30 21:53:32 +00:00
827d047fb2 Merge pull request #3833 from vieux/fix_env_conversion_issues
Fix env conversion issues in env
Upstream-commit: 0c8ddd502e90d5e35c04179f98f29fc4550af5c9
Component: engine
2014-01-30 13:31:25 -08:00
deac379ef5 refactor all *FromJob functions
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 9261511aa509423432f4e22f6235719deadc0969
Component: engine
2014-01-30 20:45:32 +00:00
f121a9a07b Fix fun Travis DCO check YAML parsing issues (especially with commit messages that start with any kind of whitespace, like this one intentionally does)
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: c8d1596902704076c8d85a30e80f90f8efb3e175
Component: engine
2014-01-30 12:27:45 -07:00
aea7223441 Merge pull request #3842 from jpoimboe/iptables-insert-masq
network: insert masq rule
Upstream-commit: 0942e5c89cb8554cb50a680df0004abee63bb0d1
Component: engine
2014-01-30 11:26:32 -08:00
113400b4e9 Use lxc-stop -k when lxc-kill is not found
lxc-kill was removed in lxc/lxc@33ddfc2

Docker-DCO-1.1-Signed-off-by: Chia-liang Kao <clkao@clkao.org> (github: clkao)
Upstream-commit: b111fc364611d755ac791c5c51c82c5754fe545b
Component: engine
2014-01-31 03:22:22 +08:00
41e844d181 Merge pull request #3836 from SvenDowideit/mint-cgroups-lite-docs
Add troubleshooting for missing cgroups on mint 16
Upstream-commit: 43b7667dccc4a08cf12a17548df359e0ba118ae1
Component: engine
2014-01-30 10:58:26 -08:00
40e944384d Merge pull request #3846 from tianon/unclejack-maintainer
Make unclejack the official Vagrantfile maintainer
Upstream-commit: c7b415d3b4904ba5b00ed60e544bf9eadccd2219
Component: engine
2014-01-30 10:55:38 -08:00
1cbb6220de Make unclejack the official Vagrantfile maintainer
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 238dba831a74c89fe8f5aabc836e6b75da577c97
Component: engine
2014-01-30 11:51:25 -07:00
c5b80fe410 Merge pull request #3718 from alexlarsson/btrfs
Add btrfs support to docker
Upstream-commit: 637a1dcab65c7335d979d42af190a53d9bbea9f7
Component: engine
2014-01-30 10:00:44 -08:00
a2aa12eced network: insert masq rule
This fixes IP masquerading on systems with reject rules at the end of
the POSTROUTING table, by inserting the rule at the beginning of the
table instead of adding it at the end.

Docker-DCO-1.1-Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com> (github: jpoimboe)
Upstream-commit: cc382ec62848855f6fe7302fe7a37ac62af35a9c
Component: engine
2014-01-30 11:06:28 -06:00
6d81dd5d9b Separate out graphdriver mount and container root
This separates out the directory as returned from the graphdriver (the
"base" fs) from the root filesystem of the live container. This is
necessary as the "diff" operation needs access to the base filesystem
without all the mounts that the running container needs (/.dockerinit,
volumes, etc).

We change container in the following way:

Container.RootfsPath() returns the the directory which will be used as
the root in a running container. It is always of the form
"/var/lib/docker/container/<id>/root" and is a private bind mount to
the base filesystem. It is only available while the container is running.

Container.BasefsPath() returns the raw directory from the graph driver
without the container runtime mounts. It is availible whenever the
container is mounted (in between a container.Mount()/Unmount() pair,
which are properly refcounted).

This fixes issue #3840

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: fab19d197c6cc362182f6cee4d0a6e65e799875f
Component: engine
2014-01-30 16:43:53 +01:00
03793e4950 pkg/mount: Add "private" flag
This allows "mount --make-private" functionallity.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: fc1169a220196b78b73d5c1874d3c7bdc38d9fe3
Component: engine
2014-01-30 16:41:45 +01:00
29c6c509be Add troubleshooting for missing cgroups on mint 16 #3602
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: 626a2e1112b6e802415f80ff7a3682296636f55a
Component: engine
2014-01-30 20:53:27 +10:00
d5c4282d8f Merge pull request #3835 from thinkingbox/master
Fix typo
Upstream-commit: 41c10fb25632ba5bc65a78e84c2f851e93f80ee4
Component: engine
2014-01-29 23:55:36 -08:00
be70505326 Fix typo
Docker-DCO-1.1-Signed-off-by: Piergiuliano Bossi <pgbossi@gmail.com> (github: thinkingbox)
Upstream-commit: 7d95ce6ddda89a392b94c6dcfcb7774b2a19cf1a
Component: engine
2014-01-29 23:07:23 -05:00
bc598f32f3 Merge pull request #3834 from philips/fix-socket-activation-systemd
contrib: systemd: make socket-activation Restart same as the main service file
Upstream-commit: ab50985ac944bc6ae427b6331908ad0441ab364d
Component: engine
2014-01-29 17:46:25 -08:00
0e8d28d6ec contrib: systemd: make socket-activation Restart=always
Do as was done to f09a78cd219b24d4308034c8dd13410cfe5fbec7 in the
socket-activation example.

Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
Upstream-commit: 4dab34c2045b7bcc735227867126f0796cbb09c1
Component: engine
2014-01-29 17:42:32 -08:00
805774b4d2 Merge pull request #3531 from lsm5/docker-systemd
ExecStartPre commands updated in systemd service file
Upstream-commit: de8480f6567778516a371fa8405df0409181cc32
Component: engine
2014-01-29 17:38:10 -08:00
a56f23222b Prevent Tests from creating users on Prod Index
The integration tests had previously used the environment variable
DOCKER_INDEX_URL but it was apparently removed several months ago.

Change the integration auth tests to specify the ServerAddress field
of the AuthConfig struct to use the staging deployment of the index.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: c914abaf15634d8039927176dfc5ff3c765f30d0
Component: engine
2014-01-29 17:18:11 -08:00
c7071fbcda fix convertion issues
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 187646127fa80a5ba39a53619b410eb2a13f0ffd
Component: engine
2014-01-30 00:56:42 +00:00
5eea23ed5b add tests
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 5b82a1b726291d4aaaad797df5b29a74de28d318
Component: engine
2014-01-30 00:55:29 +00:00
0a0316537a Merge pull request #3734 from stpierre/mkimage-yum
Added new mkimage-yum.sh script to create CentOS base images
Upstream-commit: 95dff84728493ff8d5ac2805473686afb70323f3
Component: engine
2014-01-29 14:52:51 -08:00
af8535454e fix ID -> Id api
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 54072dbbd6260a9d8a7249cae0bd17513f15c3fc
Component: engine
2014-01-29 20:31:49 +00:00
3aa25b2dbe Add dummy "user.email" setting in our Dockerfile for smooth in-container merge commits
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 94c5f51c4a38422489f0f629d43958b282600111
Component: engine
2014-01-29 13:13:32 -07:00
91a0b7d691 Merge pull request #3810 from jpoimboe/iptables-forward-public-ports
network: add publicly mapped ports to FORWARD table
Upstream-commit: 6013cbdce85b18a963750195c53f8676c5979690
Component: engine
2014-01-29 11:53:26 -08:00
3fc86028ff move api to it's own package
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: f556cd4186dfdb5e96b2e58b5caf9edbe7e2d7df
Component: engine
2014-01-29 19:26:54 +00:00
6076f1f3f8 Merge pull request #3819 from crosbymichael/move-port-mapper
Move port mapper out of core and into network drivers
Upstream-commit: 6fdc5434436f5c3807274f524e8eaa3f0a009613
Component: engine
2014-01-29 11:16:51 -08:00
3f744f45d9 add setSubEnv and getSubEnv
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 7b7f7e443637d8303f03316ee437012b71936c12
Component: engine
2014-01-29 18:53:43 +00:00
edaa89a4ad job.error\* now return engine.StatusErr
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 55d7aa1b49a49a27d77cd4011d921e340ec99f9f
Component: engine
2014-01-29 18:52:55 +00:00
58d0cfe3cb Remove api_params.go
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 217ad5e5e673aa09471e95f4726ddab2422fe5d1
Component: engine
2014-01-29 18:52:54 +00:00
87c7be2925 Merge pull request #3808 from alexlarsson/execdriver-get-pids-for-container
execdriver: Make GetPidsForContainer() a driver call
Upstream-commit: c00cb1aca15c4dea4198c4e488a986fa6ad9636c
Component: engine
2014-01-29 10:38:10 -08:00
a3e4de072b Merge pull request #3820 from vieux/remove_runtime_from_api
Remove runtime from api
Upstream-commit: 4a351464614a40e9056007e5fa60e134eaeb6781
Component: engine
2014-01-29 10:35:27 -08:00
86c10c5a7d Merge pull request #3588 from tianon/debootstrap-tweaks
Add a few small tweaks to mkimage-debootstrap, especially to help with lucid
Upstream-commit: e1b210bee95b894c21f74f1df0efdfe0d6e93c56
Component: engine
2014-01-29 08:42:14 -08:00
667c92d38b remove ip fowarding from systemd (fixed: commit #3801)
Docker-DCO-1.1-Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com> (github: lsm5)
Upstream-commit: a9d0bbcfc6e45817f39f15a7c9b11305b4c04bad
Component: engine
2014-01-29 11:06:23 -05:00
5e880285ec ExecStartPre commands updated
Docker-DCO-1.1-Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com> (github: lsm5)

systemd service no longer does '/bin/mount/ --make-rprivate /'.
Core issue fixed by Alex Larsson (commit 157d99a).

ip forwarding enabled.
Upstream-commit: f09a78cd219b24d4308034c8dd13410cfe5fbec7
Component: engine
2014-01-29 11:06:23 -05:00
e43c065db4 Make get.docker.io install directions slightly better by telling user exactly how to add themselves to the "docker" group
As a bonus, if the user has run this script the way we recommend (ie, without "sudo" or "su", run as their user), we can actually give them the exact command they'll need with their correct username substituted appropriately.

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 6cfe778c2cb6359b47cf646dc12824b58cc8d887
Component: engine
2014-01-29 00:10:39 -07:00
ea8660fa0f Merge pull request #3813 from jpoimboe/update-ip_forward-docs
docs: remove ip_forward enabling step
Upstream-commit: c82a2d1adfb2b2a838a12e0c3baea1d42fe7f3ad
Component: engine
2014-01-28 18:08:22 -08:00
ec0c7b9842 Address feedback from @jamtur01.
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net> (github: metalivedev)
Upstream-commit: f3a032f27b80e8194cb7f14df848f063a56c5f26
Component: engine
2014-01-28 17:32:05 -08:00
2a8b1349cd move warnings to the job
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: abd64a2b00a57dda2f24326fc49b7ca10e950dff
Component: engine
2014-01-29 01:17:55 +00:00
4971da5034 Move port mapper tests out of core and into portmapper
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: b3b12f00593d96c6d0e93f9e333ee368278e871d
Component: engine
2014-01-28 17:10:13 -08:00
4f8cce969a remove enableCors from the config and move it as a job arg
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: d41844ed2d946fc963f9977991233b5d9daf86fd
Component: engine
2014-01-29 00:20:51 +00:00
b8f930d15c Initial move of port mapper code into sub pkg
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 99756ef11fc2a3ae821bb412607e7e9b322f278a
Component: engine
2014-01-28 15:42:46 -08:00
28cc283384 fix(CONTRIBUTING): Developer Certificate of Origin w/o Grant
In 7fb55f77250a9b52b0515a7e655ecc605ae452ca the DCO lost the grant so
change the title back to just DCO.

Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
Upstream-commit: 8458f99a387ae70cfaa1e43759919fe414c55505
Component: engine
2014-01-28 13:50:03 -08:00