15209c380c
Bump version to v0.11.0
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-07 09:59:55 -07:00
263d134fff
Merge branch 'master' into bump_v0.11.0
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-06 18:03:23 -07:00
41b2874b99
Merge pull request #5643 from crosbymichael/fix-native-pid
...
Set container pid for process in native driver
2014-05-06 18:02:55 -07:00
62e8ddb579
Set container pid for process in native driver
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-06 17:04:04 -07:00
d7166536e7
Merge pull request #5622 from SvenDowideit/net-host-docs
...
Update the run --net cli help to include the 'host' option
2014-05-07 07:11:41 +10:00
5c12a27838
Merge pull request #5631 from vmarmol/cpuacct-usage
...
Export cpuacct CPU usage in total cores over the sampled period.
2014-05-06 11:47:55 -07:00
8d07c2d1ae
Fix logo in README.md
2014-05-06 11:39:11 -07:00
543e60eb60
Export cpuacct CPU usage in total cores over the sampled period.
...
Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com > (github: vmarmol)
2014-05-06 16:56:39 +00:00
818648ff9f
Merge pull request #5630 from rjnagal/libcontainer-fixes
...
Check supplied hostname before using it.
2014-05-06 09:49:52 -07:00
7e3a1b6521
Merge pull request #5629 from vmarmol/fix-systemd-softlimit
...
Remove support for MemoryReservation in systemd systems.
2014-05-06 09:48:33 -07:00
d16fcc628e
Merge pull request #5627 from cyphar/integration-cli-fixes
...
Fixed completely broken integration-cli tests
2014-05-06 09:35:30 -07:00
5034b658e3
Merge pull request #5626 from cyphar/networkfs-etchosts-tests
...
Fixed broken tests for pkg/networkfs/etchosts
2014-05-06 09:31:06 -07:00
69d43b2674
Remove support for MemoryReservation in systemd systems. This has been
...
deperecated since systemd 208.
Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com > (github: vmarmol)
2014-05-06 15:53:38 +00:00
924979259e
integration-cli: docker_cli_links: fixed broken tests
...
The tests weren't ... tested when last edited, this patch fixes
them so that they run and pass correctly.
Docker-DCO-1.1-Signed-off-by: Aleksa Sarai <cyphar@cyphar.com > (github: cyphar)
2014-05-07 01:05:15 +10:00
14f65ab83b
pkg: networkfs: etchosts: fixed tests
...
This patch fixes the fact that the tests for pkg/networkfs/etchosts
couldn't build due to syntax errors.
Docker-DCO-1.1-Signed-off-by: Aleksa Sarai <cyphar@cyphar.com > (github: cyphar)
2014-05-07 00:42:22 +10:00
ba6a732357
Merge pull request #5616 from nirvdrum/patch-2
...
Use the contraction for "it is."
2014-05-06 11:33:41 +01:00
9eeff6d099
Update the run --net cli help to include the 'host' option
...
and then add that to the run and cli docs
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-05-06 20:26:44 +10:00
95d81dada6
Merge pull request #5056 by Bryan Murphy <bmurphy1976@gmail.com>
...
"add linked containers to hosts file"
2014-05-05 20:04:01 -07:00
dc605c8be7
Simplify integration test for link + hostname.
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-05-05 19:51:47 -07:00
53f38a14cd
add linked containers to hosts file
...
Docker-DCO-1.1-Signed-off-by: Bryan Murphy <bmurphy1976@gmail.com > (github: bmurphy1976)
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Tested-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-05-05 19:40:27 -07:00
cd81895091
Add alex as devmapper and btrfs maintainer
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-05 19:40:27 -07:00
839b06b121
Merge pull request #5601 from crosbymichael/alex-maintainer
...
Add alex as devmapper and btrfs maintainer
2014-05-05 17:10:05 -07:00
2b0f88383a
Use the correct "it's."
2014-05-05 20:08:35 -04:00
affacfab08
Merge pull request #5614 from crosbymichael/move-attach-to-daemon
...
Move Attach from container to daemon
2014-05-05 16:56:11 -07:00
41cfaa738c
Move Attach from container to daemon
...
This moves the Attach method from the container to the daemon. This
method mostly supports the http attach logic and does not have anything
to do with the running of a container.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-05 16:48:56 -07:00
b4ac4228f5
Merge pull request #5613 from vieux/better_error_handling
...
propagate errors write
2014-05-05 16:28:15 -07:00
55f3e72d7f
propagate errors write
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-05-05 23:23:14 +00:00
0b15944cb0
Merge pull request #5354 from alexlarsson/cgroups-systemd-fixes
...
cgroups: Update systemd to match fs backend
2014-05-05 16:00:56 -07:00
df5827dd02
Merge pull request #5597 from jamtur01/docs-simplify-osx-install
...
Fixed the horrible OSX installation docs
2014-05-06 08:55:14 +10:00
0736eb6d16
Merge pull request #5609 from crosbymichael/move-env-gen
2014-05-05 15:52:47 -07:00
ab58dd5a44
Merge pull request #5611 from vieux/networkfs_pkgs
...
add 2 networkfs pkgs
2014-05-05 15:52:14 -07:00
3744452ecf
add resolvconf
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-05-05 22:55:32 +00:00
a1a029f6d7
add etchosts
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-05-05 22:43:38 +00:00
eadf004fcb
Merge pull request #5600 from unclejack/sha512_registry_support
...
import sha512 to make sha512 ssl certs work
2014-05-05 15:27:11 -07:00
4994b0fe54
Move envconfig generation to lxc driver
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-05 14:45:14 -07:00
222605b5fb
Merge pull request #5608 from crosbymichael/net-flag-refactor
...
HOTFIX Update after namespace refactor
2014-05-05 13:58:09 -07:00
01fec73ba4
Update after namespace refactor
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-05 13:56:18 -07:00
70fef1460a
Merge pull request #4441 from crosbymichael/add-net-flag
...
Add --net flag to docker run and allow host network stack
2014-05-05 13:54:55 -07:00
2165a4993b
Merge pull request #5602 from crosbymichael/libcontainer-enable
...
Improve libcontainer namespace and cap format
2014-05-05 13:50:08 -07:00
51933bd5e1
Merge pull request #5575 from vieux/pr-5428
2014-05-05 13:48:36 -07:00
7c3a06634b
Merge pull request #5538 from shykes/pr_out_engine_catchall_handler_is_shadowed_by_specific_handlers
2014-05-05 13:48:11 -07:00
07db13509b
Merge pull request #5596 from dotcloud/contrib-fix
...
Post-commit hook URL fix
2014-05-05 13:44:48 -07:00
99be235332
Merge pull request #5400 from bmatsuo/5398-fix-pkg/graphdb-osx
2014-05-05 13:41:43 -07:00
13c1865541
Merge pull request #5604 from nirvdrum/patch-1
...
It's its.
2014-05-05 21:49:47 +02:00
168452f9b0
Merge pull request #5580 from tianon/update-vendor-versions
...
Update vendored deps that have a proper version number to use said specific versions
2014-05-05 13:45:03 -06:00
b25208ee3e
It's its.
2014-05-05 15:43:11 -04:00
db5f6b4aa0
Improve libcontainer namespace and cap format
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-05 12:34:21 -07:00
34e09afa24
Merge pull request #5544 from vieux/cleanup_api_client
...
Cleanup api client
2014-05-05 11:16:57 -07:00
412324cfbe
Check supplied hostname before using it.
...
Docker-DCO-1.1-Signed-off-by: Rohit Jnagal <jnagal@google.com > (github: rjnagal)
2014-05-05 18:12:25 +00:00
5b094530c0
cgroups: Update systemd to match fs backend
...
This updates systemd.Apply to match the fs backend by:
* Always join blockio controller (for stats)
* Support CpusetCpus
* Support MemorySwap
Also, it removes the generic UnitProperties in favour of a single
option to set the slice.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-05-05 20:06:44 +02:00
f2d7c77c63
Add alex as devmapper and btrfs maintainer
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-05 10:47:55 -07:00
e3d6898da1
Merge pull request #5591 from alexlarsson/fix-expose-parsing
...
nat: Fix --expose protocol parsing
2014-05-05 10:32:26 -07:00
7da186c3e5
import sha512 to make sha512 ssl certs work
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-05-05 20:29:20 +03:00
5f301191cf
Merge pull request #5496 from unclejack/check_if_root
...
check if the daemon is run as root on startup
2014-05-05 10:13:17 -07:00
f369278725
Merge pull request #5569 from vieux/add__ping_to_the_API
...
Add ping to the api
2014-05-05 10:09:31 -07:00
0b187b909b
Address code review feedback
...
Also make sure we copy the joining containers hosts and resolv.conf with
the hostname if we are joining it's network stack.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-05 10:08:59 -07:00
c1c6b3ccd9
Add docs for --net flag
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-05 10:08:59 -07:00
5ca6532011
Update host networking with hostname and files
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-05 10:08:59 -07:00
a785882b29
Setup host networking for lxc and native
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-05 10:08:59 -07:00
2c2cc051d8
Update --net flags and container mode
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-05 10:08:59 -07:00
7118416aee
runconfig/parse: add test for parseNetMode
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
2014-05-05 10:08:59 -07:00
a60159f3b1
runconfig: add -net container:name option
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
2014-05-05 10:08:59 -07:00
d103f0186a
Merge pull request #5562 from rhatdan/master
...
Fix docker man page to reference selinux-enable flag
2014-05-05 10:34:49 -06:00
c34bb099e5
Fixed the horrible OSX installation docs
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-05-05 17:02:03 +02:00
30d458c534
Merge pull request #5592 from SvenDowideit/docs-simplify-osx-install
...
Several OSX install reader issues fixed
2014-05-05 16:46:03 +02:00
10766e1fb4
Post-commit hook URL fix
...
Updating CONTRIBUTING to include the correct URL for the post-commit hook.
Docker-DCO-1.1-Signed-off-by: Aaron Huslage <huslage@gmail.com > (github: huslage)
2014-05-05 10:28:52 -04:00
56d71ae79b
Several reader issues fixed
...
- Fix boot2docker url
- move HomeBrew instructions to a separate section
- fix docker client 5-liner to work (its still ugly)
- fix and update program output
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-05-05 22:52:12 +10:00
e625bad3d7
Fix docker man page to reference selinux-enable flag
...
Docker-DCO-1.1-Signed-off-by: Daniel Walsh <dwalsh@redhat.com > (github: rhatdan)
2014-05-05 08:41:21 -04:00
e9fd8e285e
Merge pull request #5587 from SvenDowideit/docs-examples-style-guide
...
Rearrange the existing info a little, and add example style guide
2014-05-05 13:36:47 +01:00
46755dfc1a
Rearrange the existing info a little, and add example style guide
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-05-05 22:18:12 +10:00
a304dcef00
nat: Fix --expose protocol parsing
...
A command like:
docker run --expose 5353/tcp -P fedora sleep 10
Currently fails with:
Error: Cannot start container 5c558de5f0bd85ff14e13e3691aefbe531346297a27d4b3562732baa8785b34a: unknown protocol
This is because nat.SplitProtoPort() confuses the order of the port and
proto in 5353/tcp, assuming the protocol is first. However, in all other
places in docker the protocol is last, so the fix is just to swap these.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-05-05 12:54:10 +02:00
3230889d24
Merge pull request #5585 from lukemarsden/patch-1
...
git clone should use https URL in devenvironment.md
2014-05-05 08:48:13 +10:00
6799d14cb8
Update devenvironment.md
...
`git clone` should use `https` URL.
2014-05-04 17:52:48 +01:00
9488832c6d
Merge pull request #5579 from jamtur01/linkdashs
...
Fixed a couple of single dashes in links document
2014-05-04 13:28:46 +01:00
8d7ed2cae4
Update vendored deps that have a proper version number to use said specific versions
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-05-03 20:34:21 -06:00
bfac0b24ed
Fixed a couple of single dashes in links document
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-05-04 03:16:21 +02:00
54e20b8f7b
Merge pull request #5578 from msulima/patch-1
...
hello_world.md - $container_id variable case sensitivity
2014-05-03 12:53:14 +01:00
f33298024b
Merge pull request #5568 from felixrabe/patch-6
...
cli.md: More typos
2014-05-03 12:50:57 +01:00
49af92a7a9
Merge pull request #5572 from felixrabe/patch-5
...
run.md: Close braces
2014-05-03 12:42:04 +01:00
d0c97d5bd2
Merge pull request #5564 from felixrabe/patch-4
...
cli.md: sudo at the right place
2014-05-03 12:36:31 +01:00
b2268d1ac0
Merge pull request #5551 from felixrabe/patch-1
...
cli.md: Fix up Markdown formatting by adding one `
2014-05-03 21:02:25 +10:00
a911f42d1e
Merge pull request #5570 from felixrabe/patch-3
...
run.md: Convert some backticks to apo's
2014-05-03 20:39:01 +10:00
dca1c0073f
hello_world.md - $container_id variable case sensitivity
...
If you run the tutorial step-by-step, following error occurs:
```$ sudo docker logs $container_id
Usage: docker logs CONTAINER
Fetch the logs of a container
-f, --follow=false: Follow log output```
This is obviously because bash variables are case-sensitive, so it mustn't be `CONTAINER_ID` above.
Docker-DCO-1.1-Signed-off-by: Mateusz Sulima <sulima.mateusz@email.com > (github: github_handle)
2014-05-03 12:22:33 +02:00
328d65dcff
remove fixme
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-05-03 00:54:52 +00:00
c4089ad80b
Move 'search' to the registry subsystem
...
This continues the effort to separate all registry logic from the
deprecated `Server` object.
* 'search' is exposed by `github.com/dotcloud/docker/registry/Service`
* Added proper documentation of Search while I was at it
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-05-03 00:37:32 +00:00
3d605683b3
Move 'auth' to the registry subsystem
...
This is the first step towards separating the registry subsystem from
the deprecated `Server` object.
* New service `github.com/dotcloud/docker/registry/Service`
* The service is installed by default in `builtins`
* The service only exposes `auth` for now...
* ...Soon to be followed by `pull`, `push` and `search`.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-05-03 00:37:06 +00:00
4a3b0e8d5d
run.md: Close braces
...
Docker-DCO-1.1-Signed-off-by: Felix Rabe <felix@rabe.io > (github: felixrabe)
2014-05-03 02:20:59 +02:00
3a1f0dedc7
Merge pull request #5556 from crosbymichael/no-restrict-lxc
...
Don't restrict lxc because of apparmor
2014-05-02 17:20:27 -07:00
205bd91fca
run.md: Convert some backticks to apo's
2014-05-03 02:11:00 +02:00
5bb430197e
Merge pull request #5063 from vieux/force_rmi_stopped_container
...
docker rmi -f works with stopped containers + revamped error messages
2014-05-02 16:41:13 -07:00
1c48dfebb9
Merge pull request #5537 from shykes/pr_out_api_server_better_error_checking_to_avoid_unnecessary_panics
2014-05-02 16:05:07 -07:00
f37ce76bf6
api/server: better error checking to avoid unnecessary panics
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-05-02 16:03:37 -07:00
015a2abafa
cli.md: More typos
...
I've seen one other missing space that I addressed in another PR already.
I don't know whether that is a common occurrence in the docs.
About the second diff chunk, it looks like some copy-paste mistake to me.
Docker-DCO-1.1-Signed-off-by: Felix Rabe <felix@rabe.io > (github: felixrabe)
2014-05-03 00:52:48 +02:00
cefb0d1277
Merge pull request #5563 from felixrabe/patch-3
...
cli.md: Add space
2014-05-02 23:33:48 +01:00
069400a7ac
Merge pull request #5566 from felixrabe/patch-5
...
cli.md: Add another sudo
2014-05-02 23:32:33 +01:00
3b73c26194
Engine: empty job names are illegal, catchall or not
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-05-02 15:25:33 -07:00
de75af9fe2
engine: catchall handler is shadowed by specific handlers
...
This allows using `Engine.Register` and `Engine.RegisterCatchall` on the
same engine without the catchall hiding all other handlers.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-05-02 15:25:32 -07:00
103d028132
Merge pull request #5560 from gabrtv/deregister-containers-earlier
...
De-register containers before removing driver and containerGraph references
2014-05-02 15:20:51 -07:00
a0cef41061
Merge pull request #5567 from creack/remove_unused_file
2014-05-02 15:08:42 -07:00
c65de2c020
return write error
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-05-02 22:03:59 +00:00
e318af6fb0
cli.md: sudo at the right place
...
Docker-DCO-1.1-Signed-off-by: Felix Rabe <felix@rabe.io > (github: felixrabe)
2014-05-02 23:58:05 +02:00
3c422fe5bf
add doc
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-05-02 21:51:20 +00:00
b3ff1c55e3
Merge pull request #5462 from tianon/hack-dind-style
...
Update hack/dind to match the rest of our scripts
2014-05-02 14:43:56 -07:00
cf0076b92d
add _ping endpoint
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-05-02 21:43:51 +00:00
8913ec4912
Remove unused daemon/sorter.go
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-05-02 14:16:05 -07:00
ac7b2b888d
Merge pull request #5565 from creack/fix_devpts
...
Month devpts before mounting subdirs
2014-05-02 14:14:46 -07:00
4706a1ad76
cli.md: Add another sudo
2014-05-02 23:13:28 +02:00
12a4b376fd
cli.md: Add space
2014-05-02 22:56:35 +02:00
a7ccbfd5f1
Month devpts before mounting subdirs
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-05-02 13:55:45 -07:00
45be6f6dff
fix https
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-05-02 19:49:12 +00:00
9f152aacf8
deregister containers before removing driver and containerGraph references
...
This is required to address a race condition described in #5553 ,
where a container can be partially deleted -- for example, the
root filesystem but not the init filesystem -- which makes
it impossible to delete the container without re-adding the
missing filesystems manually.
This behavior has been witnessed when rebooting boxes that
are configured to remove containers on shutdown in parallel
with stopping the Docker daemon.
Docker-DCO-1.1-Signed-off-by: Gabriel Monroy <gabriel@opdemand.com > (github: gabrtv)
2014-05-02 13:27:17 -06:00
4d521f479b
Merge pull request #5507 from shykes/dind-maintainer
...
Make Jerome Petazzoni a maintainer for dind
2014-05-02 11:25:41 -07:00
59fe77bfa6
Don't restrict lxc because of apparmor
...
We don't have the flexibility to do extra things with lxc because it is
a black box and most fo the magic happens before we get a chance to
interact with it in dockerinit.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-02 11:14:24 -07:00
1c5a3123cc
Merge pull request #5529 from crosbymichael/restrict-proc
...
Mount /proc and /sys read-only, except in privileged containers
2014-05-02 10:52:53 -07:00
8c9192cd76
move hijack to it's own file
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-05-02 17:45:58 +00:00
877ad96d89
cli.md: Fix up Markdown formatting by adding one `
2014-05-02 16:53:59 +02:00
b372c19b38
Merge pull request #5501 from discordianfish/add-commit-message-bp
2014-05-01 23:47:31 -07:00
f4b60a385c
Merge pull request #5536 from vmarmol/add-maintainers-libcontainer
2014-05-01 23:42:50 -07:00
76fa7d588a
Apply apparmor before restrictions
...
There is not need for the remount hack, we use aa_change_onexec so the
apparmor profile is not applied until we exec the users app.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-01 19:09:12 -07:00
b263495f6a
Merge pull request #5541 from SvenDowideit/docs-generate-all-api-docs
...
Force the older API docs to be generated.
2014-05-01 20:58:12 -04:00
41db175626
Force the older API docs to be generated.
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-05-02 10:46:41 +10:00
314bd02d2c
remove when httputil.NewClientConn when not in hijack
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-05-02 00:25:10 +00:00
148e081ded
Merge pull request #5521 from SvenDowideit/doc-auto-section
...
make sure the intermediate index.html files are generated consistently
2014-05-02 10:13:18 +10:00
5a8ffe7ef1
make sure the intermediate index.html files are generated consistently
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-05-02 10:08:25 +10:00
ccbc4f24d6
Merge pull request #5517 from SvenDowideit/5267-make-archived-docs-hidden-but-linkable
...
Bring back archived remote API versions
2014-05-02 02:56:03 +03:00
de49e7c0a6
Bring back archived remote API versions
...
- git mv archived/* .
- put the links back into the summary document
- reduce the header depth by 1 so the TOC lists each API version
- update the mkdocs.yaml to render the archived API docs, but not add
them to the menu/nav
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-05-02 09:47:33 +10:00
edab1bd5e5
Merge pull request #5524 from ostezer/docs-fix-codeblocks
...
Improve code/comment/output markings & display consistency
2014-05-01 19:39:06 -04:00
71e3757174
Adding Rohit Jnagal and Victor Marmol to pkg/libcontainer maintainers.
...
Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com > (github: vmarmol)
2014-05-01 15:51:38 -07:00
24e0df8136
Fix /proc/kcore mount of /dev/null
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-01 15:26:58 -07:00
3f74bdd93f
Mount attr and task as rw for selinux support
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-01 15:26:58 -07:00
f5139233b9
Update restrictions for better handling of mounts
...
This also cleans up some of the left over restriction paths code from
before.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-01 15:26:58 -07:00
83982e8b1d
Update to enable cross compile
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-01 15:26:58 -07:00
1c4202a614
Mount /proc and /sys read-only, except in privileged containers.
...
It has been pointed out that some files in /proc and /sys can be used
to break out of containers. However, if those filesystems are mounted
read-only, most of the known exploits are mitigated, since they rely
on writing some file in those filesystems.
This does not replace security modules (like SELinux or AppArmor), it
is just another layer of security. Likewise, it doesn't mean that the
other mitigations (shadowing parts of /proc or /sys with bind mounts)
are useless. Those measures are still useful. As such, the shadowing
of /proc/kcore is still enabled with both LXC and native drivers.
Special care has to be taken with /proc/1/attr, which still needs to
be mounted read-write in order to enable the AppArmor profile. It is
bind-mounted from a private read-write mount of procfs.
All that enforcement is done in dockerinit. The code doing the real
work is in libcontainer. The init function for the LXC driver calls
the function from libcontainer to avoid code duplication.
Docker-DCO-1.1-Signed-off-by: Jérôme Petazzoni <jerome@docker.com > (github: jpetazzo)
2014-05-01 15:26:58 -07:00
559dc9a66a
Merge pull request #5534 from vieux/fix_apparmor_inside_container
...
Fix apparmor inside container
2014-05-01 15:25:40 -07:00
de191e8632
skip apparmor with dind
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-05-01 22:22:08 +00:00
ae686c0486
Revert "add apparmor to the Dockerfile"
...
This reverts commit fa1e390cadvieux@docker.com > (github: vieux)
2014-05-01 21:49:53 +00:00
8296125b32
Merge pull request #5532 from vieux/add_apparmor_dockerfile
...
Add apparmor to the Dockerfile to fix dind issues
2014-05-01 15:00:48 -06:00
fa1e390cad
add apparmor to the Dockerfile
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-05-01 20:51:16 +00:00
20bcb80f40
Merge pull request #5457 from tiborvass/5423-bridge-ip
...
Fix bridge ip comparison
2014-05-01 11:56:47 -07:00
ab0518bfe8
Merge pull request #5528 from crosbymichael/drop-capsyslog
...
drop CAP_SYSLOG capability
2014-05-01 11:52:08 -07:00
cac0cea03f
drop CAP_SYSLOG capability
...
Kernel capabilities for privileged syslog operations are currently splitted into
CAP_SYS_ADMIN and CAP_SYSLOG since the following commit:
http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=ce6ada35bdf710d16582cc4869c26722547e6f11
This patch drops CAP_SYSLOG to prevent containers from messing with
host's syslog (e.g. `dmesg -c` clears up host's printk ring buffer).
Closes #5491
Docker-DCO-1.1-Signed-off-by: Eiichi Tsukata <devel@etsukata.com > (github: Etsukata)
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-05-01 11:43:55 -07:00
fe4a25546a
Merge pull request #5515 from crosbymichael/refactor-libcontainer2
...
Remove CommandFactory and NsInit interface
2014-05-01 11:41:54 -07:00
10a50fcd8f
Merge pull request #5526 from shykes/pr_out_beam_add_simple_framing_system_for_unixconn
2014-05-01 11:06:14 -07:00
24f9187a04
beam: Add simple framing system for UnixConn
...
This is needed for Send/Recieve to correctly handle borders between
the messages.
The framing uses a single 32bit uint32 length for each frame, of which
the high bit is used to indicate whether the message contains a file
descriptor or not. This is enough to separate out each message sent
and to decide to which message each file descriptors belongs, even
though multiple Sends may be coalesced into a single read, and/or one
Send can be split into multiple writes.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-05-01 11:06:01 -07:00
c42db412b6
Merge pull request #5092 from LK4D4/timestamp_for_docker_logs_#1165
...
Timestamps for docker logs.
2014-05-01 10:32:34 -07:00
d1297feef8
Timestamps for docker logs.
...
Fixes #1165
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-05-01 20:40:36 +04:00
f87a97f7df
Improve code/comment/output markings & display consistency
...
This PR aims to increase the consistency across the docs for
code blocks and code/comment/output markings.
Rule followed here is "what's visible on the screen should be reflected"
Issue:
- Docs had various code blocks showing: comments, commands & outputs.
- All three of these items were inconsistently marked.
Some examples as to how this PR aims to introduce improvements:
1. Removed `> ` from in front of the "outputs". Eg,
` > REPOSITORY TAG ID CREATED` replaced with:
` REPOSITORY TAG ID CREATED`.
2. Introduced `$` for commands. Eg,
` sudo chkconfig docker on` replaced with:
` $ sudo chkconfig docker on`
3. Comments:
` > # ` replaced with:
` # `.
> Please note:
> Due to a vast amount of items reviewed and changed for this PR, there
> might be some individually incorrect replacements OR patterns of incorrect
> replacements. This PR needs to be reviewed and if there is anything missing,
> it should be improved or amended.
Closes:
https://github.com/dotcloud/docker/issues/5286
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
2014-05-01 17:52:01 +03:00
51a39563fa
Merge pull request #5519 from SvenDowideit/remove-rst-docs
...
remove rst/sphinx documentation
2014-05-01 16:33:54 +03:00
c52bb90d03
Merge pull request #5516 from SvenDowideit/docs-meta-rendering
...
add page_description and page_keywords md meta to mkdocs html template
2014-05-01 16:16:48 +03:00
adf04681b4
remove rst/sphinx documentation
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-05-01 15:31:58 +10:00
8ae53ef167
add page_description and page_keywords md meta to mkdocs html template
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-05-01 12:41:57 +10:00
9da75eb4df
Merge pull request #5514 from vbatts/vbatts-save_typo
...
docker save: typo reference image, not container
2014-04-30 19:00:22 -07:00
d0bee79394
Remove container.json from readme
...
No need to duplicate this information when we already have a
container.json file in the root of libcontainer
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-30 18:52:15 -07:00
93f8e277de
docker save: typo reference image, not container
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-04-30 21:51:03 -04:00
da0d6dbd7b
Make native driver use Exec func with different CreateCommand
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-30 18:49:24 -07:00
aa9705f832
Fix execin with environment and Enabled support
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-30 18:24:47 -07:00
60e4276f5a
Integrate new structure into docker's native driver
...
This duplicates some of the Exec code but I think it it worth it because
the native driver is more straight forward and does not have the
complexity have handling the type issues for now.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-30 18:20:01 -07:00
176c49d7a9
Remove command factory and NsInit interface from libcontainer
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-30 17:55:15 -07:00
b6b0dfdba7
Export more functions from libcontainer
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-30 17:18:07 -07:00
aecb9c39ab
Split term files to make it easier to manage
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-30 17:04:24 -07:00
a3e96abb5a
Export syncpipe fields
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-30 17:02:45 -07:00
26ac05c8bc
Merge pull request #5511 from crosbymichael/refactor-libcontainer
...
Refactor: remove statewriter type and all callback for process start
2014-04-30 16:50:57 -07:00
be013c7820
Merge pull request #5512 from crosbymichael/set-freezer
...
Add ability to set cgroups freezer
2014-04-30 16:50:01 -07:00
5f6fda8cfd
Add ability to set cgroups freezer
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-30 16:07:12 -07:00
f110401437
Remove statewriter interface, export more libcontainer funcs
...
This temp. expands the Exec method's signature but adds a more robust
way to know when the container's process is actually released and begins
to run. The network interfaces are not guaranteed to be up yet but this
provides a more accurate view with a single callback at this time.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-30 15:52:40 -07:00
cd8cec854b
Export SetupUser
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-30 15:27:59 -07:00
162dafbcd5
Remove logger from nsinit struct
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-30 15:24:18 -07:00
bfedf247a4
Merge pull request #5498 from tianon/better-apparmor-missing-error
2014-04-30 15:16:43 -07:00
2a711d16e0
Merge pull request #5448 from crosbymichael/selinux-defaults
...
Add selinux label support for processes and mount
2014-04-30 14:14:39 -07:00
2fc5bed61d
Merge pull request #5506 from crosbymichael/add-system-maintainer
...
Add system maintainers
2014-04-30 14:14:21 -07:00
986c647d5a
Fix bridge ip comparison
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
2014-04-30 12:36:16 -07:00
e88ef454b7
Merge pull request #5464 from tianon/close-leftover-fds
2014-04-30 12:27:52 -07:00
1fd919bbf4
Make Jerome Petazzoni a maintainer for dind
...
In the spirit of getting more contributors to maintain their
components.. I nominate @jpetazzo ot maintain dind (he's the original
author).
@jpetazzo I don't expect this to be too much load, but it's a good and
symbolic start :)
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-30 12:20:52 -07:00
6203d8b462
Add system maintainers
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-30 12:01:06 -07:00
f5e5777e63
Merge pull request #5502 from tianon/remove-contrib-zfs
...
Remove contrib/zfs directory
2014-04-30 11:03:13 -07:00
99284a24e7
FIXES #5398 : pkg/graphdb build only dependent on cgo tag
...
Docker-DCO-1.1-Signed-off-by: Bryan Matsuo <bryan.matsuo@gmail.com > (github: bmatsuo)
2014-04-30 11:57:10 -06:00
0037dc8d60
Remove contrib/zfs directory
...
A WIP pull request or issue for discussion would be a better avenue for collaboration and discussion of a ZFS backend.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-30 11:56:14 -06:00
e8f8f1c729
Merge pull request #5500 from tianon/fix-maintainers-format
...
Fix various MAINTAINERS format inconsistencies
2014-04-30 10:55:45 -07:00
5f00372af2
Add notes about git commit messages
...
This improves readability of commits a lot and is easy to
follow. I think most people follow those rules already. They are based
on http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
Docker-DCO-1.1-Signed-off-by: Johannes 'fish' Ziemke <github@freigeist.org > (github: discordianfish)
2014-04-30 19:28:26 +02:00
defecac279
Fix various MAINTAINERS format inconsistencies
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-30 11:22:11 -06:00
8caef610b2
update AUTHORS
...
Docker-DCO-1.1-Signed-off-by: Bryan Matsuo <bryan.matsuo@gmail.com > (github: bmatsuo)
2014-04-30 11:08:57 -06:00
4fac4d2149
check if the daemon is run as root on startup
...
This commit makes Docker throw an error if the daemon isn't started as
root.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-04-30 14:13:39 +03:00
0c5375146a
Merge branch 'pr-5353'
2014-04-30 02:10:53 -07:00
e802b69146
beam: Add more tests to unix_test.go
...
These are failing, and indicate things that need to be fixed. The
primarily problem is the lack of framing between beam messages.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
[solomon@docker.com: rebased on master]
Signed-off-by: Solomon Hykes <solomon@docker.com>
2014-04-30 02:10:09 -07:00
494c789ac3
Add new test-unit make rule which only runs the unit tests. Renames test
...
bundle to test-unit.
Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com > (github: vmarmol)
2014-04-30 02:10:09 -07:00
9e2e26c69a
for want of a comma, the kingdom was lost
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-04-30 02:10:09 -07:00
a1a9baf926
Update pkg/apparmor to provide a better error message when apparmor_parser cannot be found
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-29 23:19:21 -06:00
70b5652984
Merge pull request #5484 from vmarmol/add-test-unit
...
Add new test-unit make rule which only runs the unit tests
2014-04-29 23:15:16 -06:00
48388b8178
Merge pull request #5487 from SvenDowideit/docs-fix-invalid-json
...
for want of a comma, the kingdom was lost
2014-04-29 22:28:59 -04:00
20e9f61971
Merge pull request #5320 from JackDanger/jackdanger/typo-doc-fix
2014-04-29 17:41:16 -07:00
ebaff50bd2
for want of a comma, the kingdom was lost
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-04-30 10:12:21 +10:00
a39f3c9200
Add new test-unit make rule which only runs the unit tests. Renames test
...
bundle to test-unit.
Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com > (github: vmarmol)
2014-04-29 23:26:27 +00:00
d5d62ff955
Close extraneous file descriptors in containers
...
Without this patch, containers inherit the open file descriptors of the daemon, so my "exec 42>&2" allows us to "echo >&42 some nasty error with some bad advice" directly into the daemon log. :)
Also, "hack/dind" was already doing this due to issues caused by the inheritance, so I'm removing that hack too since this patch obsoletes it by generalizing it for all containers.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-29 16:45:28 -06:00
a96cac4d7d
Merge pull request #5477 from vmarmol/add-testdirs
...
Add a TESTDIRS variable to the test bundle to control which directories are unit tested
2014-04-29 16:40:40 -06:00
34a3d41d17
Merge pull request #5440 from ostezer/docs-improve-code-block-rendering
...
Docs/CSS: Amend code block rendering.
2014-04-30 00:45:04 +03:00
2c85468753
Merge pull request #5460 from tianon/no-pull-scratch
...
Use "docker load" to create "scratch" in hack/make/test-integration-cli (instead of implicitly pulling it from the index)
2014-04-29 14:37:06 -07:00
473b7a6c93
Merge pull request #5478 from amangoel/patch-1
...
Update working-with-docker.md
2014-04-30 00:00:14 +03:00
6e05c420c9
Add a TESTDIRS variable to the test bundle to allow for the running of a
...
single go directory worth of tests.
Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com > (github: vmarmol)
2014-04-29 20:55:04 +00:00
83a5f2a192
Update working-with-docker.md
2014-04-29 13:49:36 -07:00
1bc0f82406
Merge pull request #5475 from srijs/patch-1
...
docs: DisableNetwork -> NetworkDisabled
2014-04-29 23:43:28 +03:00
bf59e67232
Merge pull request #5476 from rjnagal/libcontainer-fixes
...
Cleanup cgroups on Set failures
2014-04-29 12:27:31 -07:00
9651ff46bf
docs: DisableNetwork -> NetworkDisabled
...
Docker-DCO-1.1-Signed-off-by: Samuel Reis <srijs@airpost.net > (github: srijs)
2014-04-29 21:18:26 +02:00
9d4771760a
Merge pull request #5474 from crosbymichael/use-proper-scheme
...
Use proper scheme with static registry
2014-04-29 12:04:49 -07:00
070747a213
Cleanup existing controllers when cleanup fails mid-way.
...
Docker-DCO-1.1-Signed-off-by: Rohit Jnagal <jnagal@google.com > (github: rjnagal)
2014-04-29 18:59:20 +00:00
8a5060dba4
Merge pull request #4607 from vbatts/vbatts-static_registry
...
static registry support
2014-04-29 11:22:44 -07:00
0c7143b323
Add mountlabel to dev
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-29 03:41:44 -07:00
1a5ffef6c6
Do not return labels when in privileged mode
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-29 03:40:06 -07:00
64d0f7e39b
Add cli flag to docs for selinux support
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-29 03:40:06 -07:00
46e05ed2d9
Update process labels to be set at create not start
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-29 03:40:05 -07:00
ae00649305
Update devicemapper to pass mount flag
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-29 03:40:05 -07:00
12934ef3a4
Fix SELinux errors caused by multi-threading
...
Occasionally the selinux_test program will fail because we are setting file
context based on the Process ID but not the TID. THis change will always
use the TID to set SELinux labels.
Docker-DCO-1.1-Signed-off-by: Daniel Walsh <dwalsh@redhat.com > (github: rhatdan)
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: crosbymichael)
2014-04-29 03:40:05 -07:00
b7942ec2ca
This patch reworks the SELinux patch to be only run on demand by the daemon
...
Added --selinux-enable switch to daemon to enable SELinux labeling.
The daemon will now generate a new unique random SELinux label when a
container starts, and remove it when the container is removed. The MCS
labels will be stored in the daemon memory. The labels of containers will
be stored in the container.json file.
When the daemon restarts on boot or if done by an admin, it will read all containers json files and reserve the MCS labels.
A potential problem would be conflicts if you setup thousands of containers,
current scheme would handle ~500,000 containers.
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: crosbymichael)
2014-04-29 03:40:05 -07:00
f0e6e135a8
Initial work on selinux patch
...
This has every container using the docker daemon's pid for the processes
label so it does not work correctly.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-29 03:40:05 -07:00
797a4151a0
Merge pull request #5458 from SvenDowideit/add-redirects-for-docker-io-pr-5414
...
add redirects from index/ -> docker-io/ and for the docker-io_api too
2014-04-29 12:37:22 +03:00
44d54ba0c2
Use proper scheme with static registry
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-29 02:01:07 -07:00
b1fe1797f3
Update hack/dind to match the rest of our scripts
...
No functional changes here, just coding style and maintainability.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-28 23:16:40 -06:00
83999e70f4
Merge pull request #5433 from SvenDowideit/remove-sphinx-validation-from-build
...
Remove Travis Sphinx validation
2014-04-28 22:59:53 -06:00
a7f21570b6
Merge pull request #5459 from shykes/remove-bootcamp
...
Remove obsolete 'bootcamp' project.
2014-04-28 22:59:20 -06:00
c8381d6722
Use "docker load" to create "scratch" in hack/make/test-integration-cli (instead of implicitly pulling it from the index)
...
Creating the "docker save" tarball for "scratch" is pretty simple. I've also extrapolated the "docker build -t busybox ." logic into a separate "hack/make/.ensure-busybox" file so that it can eventually be reused easier.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-28 22:26:25 -06:00
46492ee65a
Remove obsolete 'bootcamp' project.
...
It was a nice idea to recruit more maintainers but we never found the
time to do it properly...
I am still interested in any ideas to make it easier to start
contributing!
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-28 21:25:26 -07:00
e4114e6b94
Update some whitespace in hack/make/test-integration-cli for consistency
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-28 22:22:31 -06:00
17fbe3de38
remove the sphinx validation - we'll add a MarkDown one when we have it
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-04-29 13:43:13 +10:00
53c35412f9
Merge pull request #5438 from ostezer/docs-expand-viewport
...
Docs/CSS fix: Allow viewport expand to user's preference
2014-04-29 13:35:10 +10:00
33f36177e9
add redirects from index/ -> docker-io/ and for the docker-io_api too
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-04-29 13:33:22 +10:00
6c4e5ee826
Merge pull request #5414 from jamtur01/privreg
...
Addressed regression of private repository documentation.
2014-04-29 13:28:21 +10:00
81d6c0f106
Merge pull request #5439 from ostezer/docs-mkdocs-theme-maintainer-update
...
Docs/theme/MAINTAINERS: Modify/Update list of MAINTAINERS
2014-04-28 23:12:10 -04:00
548cadd0a2
Merge pull request #5441 from ostezer/docs-fix-notes-warnings-bg
...
Docs/CSS: Fix Notes/Warnings blocks' BG colour to improve its state.
2014-04-28 23:09:13 -04:00
6b5fd2daf7
Merge pull request #5443 from ncdc/commit-api-doc-fix
...
Docs fix: correct /commit info
2014-04-28 23:09:04 -04:00
69d56acd45
Merge pull request #5455 from rjnagal/cgroup-stats
...
Add throttling stats for cpu cgroup
2014-04-28 17:53:37 -07:00
d724242297
Another test to check for invalid stats.
...
Docker-DCO-1.1-Signed-off-by: Rohit Jnagal <jnagal@google.com > (github: rjnagal)
2014-04-29 00:32:05 +00:00
934bd15565
Merge pull request #5389 from tiborvass/5152-symlink-in-volume
...
Fixes #5152 : symlink in volume path
2014-04-28 17:27:18 -07:00
61f156d521
Add cpu throttling stats.
...
Docker-DCO-1.1-Signed-off-by: Rohit Jnagal <jnagal@google.com > (github: rjnagal)
2014-04-29 00:18:18 +00:00
0932488402
Merge pull request #5450 from tianon/update-deb-cgroup-dep
...
Update the "cgroup-lite" dep in our deb package from "Suggests" to "Recommends" and add "cgroupfs-mount" as another alternative
2014-04-28 17:49:36 -06:00
5b3f7851d8
Merge pull request #5451 from vmarmol/add-memory-stats
...
Adding a unit test for stats in pkg/cgroup/fs/memory.go
2014-04-28 16:38:34 -07:00
eb6a1c9f49
Merge pull request #5449 from tianon/remove-libcontainer-root-special-case
...
Remove "root" and "" special cases in libcontainer
2014-04-28 16:29:08 -07:00
fbc7a069f2
Merge pull request #5392 from rjnagal/libcontainer-fixes
...
Minor libcontainer fixes
2014-04-28 16:26:17 -07:00
314818e7ba
Update the "cgroup-lite" dep in our deb package from "Suggests" to "Recommends" and add "cgroupfs-mount" as another alternative
...
I tested to verify that if neither package is available (for example, on Debian Wheezy), apt still continues installing properly.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-28 17:08:03 -06:00
c44c51e3ce
Merge branch 'master' into libcontainer-fixes
...
Conflicts:
pkg/libcontainer/README.md
pkg/libcontainer/container.json
Docker-DCO-1.1-Signed-off-by: Rohit Jnagal <jnagal@google.com > (github: rjnagal)
2014-04-28 23:04:04 +00:00
76f95294a3
Adding a unit test for pkg/cgroup/fs/memory.go
...
Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com > (github: vmarmol)
2014-04-28 22:58:25 +00:00
d98069030d
Remove "root" and "" special cases in libcontainer
...
These are unnecessary since the user package handles these cases properly already (as evidenced by the LXC backend not having these special cases).
I also updated the errors returned to match the other libcontainer error messages in this same file.
Also, switching from Setresuid to Setuid directly isn't a problem, because the "setuid" system call will automatically do that if our own effective UID is root currently: (from `man 2 setuid`)
setuid() sets the effective user ID of the calling process. If the
effective UID of the caller is root, the real UID and saved set-user-
ID are also set.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-28 16:46:03 -06:00
af72ca199d
Merge pull request #5136 from cpuguy83/5080_fix_empty_volume_perms
...
Fixes permissions on volumes when dir in container is empty
2014-04-28 14:36:02 -07:00
ff7b52abd3
Fixes permissions on volumes when dir in container is empty
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
2014-04-28 16:57:28 -04:00
e9a42a45bf
Fixes #5152 : symlink in volume path
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
2014-04-28 13:18:12 -07:00
a8871b93b9
Addressed regression of private repository documentation.
...
This adds back in the references to private repositories and
provides some refactoring to the Working with repositories
documentation including updating references to the "Central"
registry to Docker.io.
It also:
* Fixes some links and references to Central Index
* Fixes anchors in other files to updated titles in Working with Repositories.
* Renamed Central Index in the remaining places.
* Updated terms documentation to reflect Docker.io
* Updated some Docker Index naming to be consistent.
* Updates menu labels and hyperlinks.
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
2014-04-28 16:08:55 -04:00
d8332f433f
Merge pull request #5422 from shykes/engine-spawn
...
engine/spawn: run an engine in a subprocess, remote-controlled by Beam
2014-04-28 12:56:02 -07:00
b386f2f558
Merge pull request #5412 from vmarmol/add-blkio-test
...
Adding a test for blkio stats.
2014-04-28 12:50:20 -07:00
3c5bac0348
Merge pull request #5394 from vmarmol/add-croup-memory-stats
...
Add memory usage and max usage stats.
2014-04-28 12:44:34 -07:00
68d8d9a62d
update message
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-04-28 19:03:31 +00:00
78421b3768
docker rmi -f works with stopped containers + revamped error messages
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-04-28 19:02:04 +00:00
bba1dd046d
Docs fix: correct /commit info
...
Correct documentation for POST /commit to reflect that the container's
configuration is supplied in the request body, and not as a query
parameter.
Also correct a small typo in the example JSON for create container.
Docker-DCO-1.1-Signed-off-by: Andy Goldstein <agoldste@redhat.com > (github: ncdc)
2014-04-28 13:38:58 -04:00
8fac9a345b
Merge pull request #5431 from shykes/engine-len
...
engine.Len returns the number of keys in an env
2014-04-28 10:16:49 -07:00
abf3baf4eb
Docs/CSS: Fix Notes/Warnings blocks' BG colour to improve its state.
...
Docs' BG was original "#fff" and blocks such as code blocks or
warning-notes blocks were coloured in #F2F2F2.
In order to make it easier to read everything, the BG colour was
changed to #fff. However, the switch missed to convert other blocks'
BG colour.
This commit aims to re-introduce the correct contrast by changing the
BG colour of warning/notes block to #fff.
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
2014-04-28 19:02:50 +03:00
f334dbe82d
Docs/CSS: Amend code block rendering.
...
This commit aims to improve the rendering of code blocks by
reducing the padding, matching the font-size with the rest of the
documentation text and finally, by changing the background colour
back to white from its current gray-ish state which matches the
background colour and making it really hard to spot the code.
Note: The BG colouring issue is due to converting the main BG
to gray whilst missing to change parts that where gray to white, i.e.,
not making the complete switch.
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
2014-04-28 18:58:15 +03:00
442b70c65a
Docs/theme/MAINTAINERS: Modify/Update list of MAINTAINERS
...
So far it has been mostly my duty to create and maintain docs' design/theme.
This commit adds myself to the list of maintainers by modifying
the MAINTAINERS file under the docs/theme directory.
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
2014-04-28 18:36:40 +03:00
b6699111db
Docs/CSS fix: Aallow viewport expand to user's preference
...
This commit removes the "max-width" property of DOM "containers";
Thus letting the viewport to expand to fill the available space.
This commit aims to bring pleasure to Docker docs' readers' eyes,
And to make them happy by letting them profit more from their large
monitors. (or use more efficiently their smaller ones).
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
2014-04-28 18:30:31 +03:00
425b315695
Merge pull request #5199 from shin-/registry_mirrors_support
...
Added support for multiple endpoints in X-Docker-Endpoints header
2014-04-28 17:56:57 +03:00
4155874443
Merge pull request #4576 from Soulou/4549-doc-kill-signal-param
...
Add missing 'signal' parameter for kill endpoint
2014-04-28 04:39:25 -04:00
9b23178f58
engine.Len returns the number of keys in an env
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-28 00:37:42 -07:00
b4b83ef8ae
engine/spawn: run an engine in a subprocess, remote-controlled by Beam
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-27 14:11:46 -07:00
9236e088eb
Fix bug in engine.Sender
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-27 14:11:45 -07:00
62f4c88443
Merge pull request #5374 from shykes/beam-engine
...
Remote communication between engines using beam
2014-04-27 14:10:59 -07:00
44c69c1d87
Merge pull request #5425 from jlhawn/io-auth-accounts-api-docs
...
Merged.
2014-04-27 21:40:03 +03:00
c6060a3b25
Added back OAuth and Accounts API docs pages
...
Removed a now unused endpoint from the accounts API.
Updated some of the accounts links to point to www.docker.io
as the account signup and resend-email-confirmation links should
no longer point to the index.
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
2014-04-27 11:17:48 -07:00
91deb591c8
[Documentation - API] Add missing 'signal' parameter for /containers/:id/kill endpoint
...
Docker-DCO-1.1-Signed-off-by: Leo Unbekandt <leo.unbekandt@appsdeck.eu > (github: Soulou)
2014-04-27 18:10:30 +01:00
e83fc70d36
Freeze ./integration and explain where to contribute new tests
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-26 18:55:39 -07:00
40882cc0b6
Merge pull request #5417 from jamtur01/readme3
...
Fixed double backtick to single backtick formatting issue in README
2014-04-27 11:48:52 +10:00
91cd60efd8
Merge pull request #5416 from jamtur01/dockerize
...
Fixed Dockerise to Dockerize
2014-04-27 11:48:27 +10:00
723d314f09
Replaced all double backticks in README with singles
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-04-26 10:12:09 -04:00
df018bc801
Fixed Dockerise to Dockerize
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-04-26 09:48:07 -04:00
3b279d0218
Merge pull request #5415 from jamtur01/readme2
...
Updated Docs README
2014-04-26 23:36:41 +10:00
7744f63159
Updated Docs README
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-04-26 08:10:19 -04:00
f4055ee2a4
Adding a test for blkio stats.
...
Also adds a test utility we can use for other cgroup tests.
Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com > (github: vmarmol)
2014-04-26 07:29:13 +00:00
44140f7909
Merge pull request #5411 from crosbymichael/lockdown
...
Update default restrictions for exec drivers
2014-04-26 03:27:56 +03:00
4701f8ee60
Merge pull request #5365 from crosbymichael/job-status
...
Add exported status code from a job
2014-04-25 17:27:07 -07:00
7e3624a498
engine: 'rengine' is a small command-line utility to debug remote engine
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-25 17:23:47 -07:00
b63b98ee27
engine.Sender and engine.Receiver support stdin
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-25 17:23:47 -07:00
3c1d5ca33e
Remote communication between engines using beam
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-25 17:23:47 -07:00
68d3e75750
engine: allow registering a "catchall" handler which receives all commands
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-25 17:23:16 -07:00
9422451ac3
engine.Installer: a standard interface for "installable" services
...
Installer is a standard interface for objects which can "install"
themselves an engine by registering handlers.
This can be used as an entrypoint for external plugins etc.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-25 17:23:16 -07:00
7790a77b6a
static_registry: update the test for the new struct
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-04-25 20:01:25 -04:00
8cdb720d26
Updated sample config to be usable. We should change the namespace
...
config to not need "value" later.
Docker-DCO-1.1-Signed-off-by: Rohit Jnagal <jnagal@google.com > (github: rjnagal)
2014-04-25 21:10:23 +00:00
077b7d0359
Merge pull request #5342 from danielnorberg/avoid-suicide
...
avoid suicide
2014-04-25 21:44:45 +03:00
ed48608147
Merge pull request #5401 from SvenDowideit/docs-api-eg-formating
...
small api doc formatting fixup
2014-04-25 09:11:46 -04:00
c7bd1f4e64
small api doc formatting fixup
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-04-25 20:36:31 +10:00
24f978094d
Updated sample config and README to match the default template for
...
native execdriver.
Docker-DCO-1.1-Signed-off-by: Rohit Jnagal <jnagal@google.com > (github: rjnagal)
2014-04-25 06:02:30 +00:00
ad924959a9
Add memory usage and max usage stats.
...
Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com > (github: vmarmol)
2014-04-25 02:51:28 +00:00
580c2620e7
Improved README formatting.
...
Docker-DCO-1.1-Signed-off-by: Rohit Jnagal <jnagal@google.com > (github: rjnagal)
2014-04-25 01:23:48 +00:00
569b234135
Add enabled option to namespaces and capabilities spec in
...
container.json. Although we don't yet check for enabled everywhere.
Docker-DCO-1.1-Signed-off-by: Rohit Jnagal <jnagal@google.com > (github: rjnagal)
2014-04-25 01:10:11 +00:00
0aacca3ae6
Fix typos in nsinit logs.
...
Docker-DCO-1.1-Signed-off-by: Rohit Jnagal <jnagal@google.com > (github: rjnagal)
2014-04-25 00:20:14 +00:00
14b2a9de87
Fix container.json sample to be loadable by nsinit.
...
Docker-DCO-1.1-Signed-off-by: Rohit Jnagal <jnagal@google.com > (github: rjnagal)
2014-04-25 00:17:45 +00:00
a368c0dd50
Merge pull request #5355 from SvenDowideit/doc-ubuntu-14-04-lts
...
initial version of installation on ubuntu 14.04 LTS
2014-04-24 20:06:08 -04:00
b3bea07d56
Merge pull request #5371 from ostezer/docs-add-docs-versioning-files-to-gitignore
...
Docs: Add docs new version files created by `make docs` to .gitignore
2014-04-25 09:08:43 +10:00
1083b6d2ec
Merge pull request #5372 from SvenDowideit/docs-tweaks-to-socket-options
...
Docs tweaks to socket options
2014-04-25 09:08:22 +10:00
7f64210e9e
Merge pull request #5378 from ostezer/docs-fix-stray-url-from-warning
...
Fix stray url from beta-docs warning (remove aws bucket URI)
2014-04-25 09:07:58 +10:00
85540f6aa0
Merge pull request #5373 from vmarmol/master
...
Separating cgroup Memory and MemoryReservation.
2014-04-24 14:28:40 -07:00
8af84c5e23
Merge pull request #5335 from alexlarsson/remove-ghost
...
container: Remove Ghost state
2014-04-24 11:55:05 -07:00
f188b9f623
Separating cgroup Memory and MemoryReservation.
...
This will allow for these to be set independently. Keep the current Docker behavior where Memory and MemoryReservation are set to the value of Memory.
Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com > (github: vmarmol)
2014-04-24 11:09:38 -07:00
d5c9f61ecc
Ignore isnot exists errors for proc paths
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-24 10:35:20 -07:00
fa5cabf9fe
Update init for new apparmor import path
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-24 10:35:20 -07:00
90678b3133
Update create with apparmor import
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-24 10:35:20 -07:00
2d31aeb911
Update container.json and readme
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-24 10:35:20 -07:00
2d6c367434
Increment native driver version with these changes
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-24 10:35:20 -07:00
7a0b361066
Move capabilities into security pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-24 10:35:20 -07:00
156987c118
Move mounts into types.go
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-24 10:35:20 -07:00
a949d39f19
Move rest of console functions to pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-24 10:35:20 -07:00
05b611574f
Refactor mounts into pkg to make changes easier
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-24 10:35:20 -07:00
de3d51b0a8
Move console into its own package
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-24 10:35:20 -07:00
5ba1242bdc
Mount over dev and only copy allowed nodes in
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-24 10:35:20 -07:00
81e5026a6a
No not mount sysfs by default for non privilged containers
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-24 10:35:20 -07:00
0779a8c328
Add lxc support for restricting proc
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-24 10:35:20 -07:00
60a90970bc
Add restrictions to proc in libcontainer
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-24 10:35:19 -07:00
d26ea78e42
Move apparmor into security sub dir
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-24 10:35:19 -07:00
4ed165210f
Merge pull request #5381 from rjnagal/master
...
Add support for cpu hardcapping to cgroups.
2014-04-24 10:04:17 -07:00
56b779c321
Merge pull request #5356 from alexlarsson/devmapper-no-mount-in-create
...
devicemapper: Don't mount in Create()
2014-04-24 08:19:59 -07:00
264dc8a46b
Add support for cpu hardcapping to cgroups.
...
Docker-DCO-1.1-Signed-off-by: Rohit Jnagal <jnagal@google.com > (github: rjnagal)
2014-04-24 14:43:02 +00:00
5e5230cb19
Fix stray url from beta-docs warning (remove aws bucket URI)
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
2014-04-24 16:29:12 +03:00
da8f6ffdeb
initial version of installation on ubuntu 14.04 LTS
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-04-24 22:59:59 +10:00
df20a0e7a3
Merge pull request #5377 from SvenDowideit/fix-terms-links
...
Merged.
2014-04-24 15:42:10 +03:00
ada86fc5b7
Looking into some broken links, I noticed that we don't need to use
...
relative paths, and also fixed some broken images.
There are still more todo - next PR I think :)
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-04-24 22:20:04 +10:00
c932667cd2
Docs auto-conversion fixes and MD marking and structure improvements.
...
- Remove redundant chars and all errors caused by RST->MD conversion.
e.g. [/#, /\, \<, />, etc.]
- Fix broken inter-document links
- Fix outbound links no-longer active or changed
- Fix lists
- Fix code blocks
- Correct apostrophes
- Replace redundant inline note marks for code with code marks
- Fix broken image links
- Remove non-functional title links
- Correct broken cross-docs links
- Improve readability
Note: This PR does not try to fix/amend:
- Grammatical errors
- Lexical errors
- Linguistic-logic errors etc.
It just aims to fix main structural or conversion errors to serve as
a base for further amendments that will cover others including but
not limited to those mentioned above.
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
Update:
- Fix backtick issues
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-04-24 22:19:32 +10:00
d9f9021e9b
Docs: Add docs new version files created by make docs to .gitignore
...
Files are:
- docs/AWS_S3_BUCKET
- docs/GIT_BRANCH
- docs/VERSION
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
Update:
- Remove unnecessary last blankline
2014-04-24 13:33:00 +03:00
83b388c979
Merge pull request #5362 from sindhus/patch-2
...
Update link to interactive tutorial
2014-04-24 00:22:04 -04:00
b2c87fe08b
add a reference to multiple -H options, and update the other example of -H option
...
and copy changes to the cli.md file
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-04-24 11:24:58 +10:00
e62efb266f
- unix://path/to/socket should read unix:///path/to/socket like the rest of the documentation (a slash was missing)
...
- Mention that [] options may be specified multiple times on the Usage page
Docker-DCO-1.1-Signed-off-by: Mike MacCana <mike.maccana@gmail.com > (github: mikemaccana)
Docker-DCO-1.1-Signed-off-by: Mike MacCana <mike.maccana@gmail.com > (github: SvenDowideit)
2014-04-24 11:11:51 +10:00
0ade0af27e
Merge pull request #5349 from ipbabble/manpages
...
Manpages - fixes and merged tianon/docker man1-assumption branch
2014-04-24 09:43:42 +10:00
0fe48b0e59
Merge pull request #5345 from shykes/engine-installer
...
engine.Installer: a standard interface for "installable" services
2014-04-23 16:16:55 -07:00
baf6cf9056
Merge pull request #5347 from crosbymichael/engine-root
...
Remove root dir from engine
2014-04-23 13:53:08 -07:00
f90029611f
Add exported status code from a job
...
This allows the job's status code to be consumed externally so that we
can use it as an exit code or saving to a state file.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-23 13:47:56 -07:00
81477a204f
Update link to interactive tutorial
2014-04-24 01:59:52 +05:30
6e6b8b69cd
Update link to interactive tutorial
2014-04-24 01:02:54 +05:30
7100ace42b
Remove error from engine.New()
...
Without creating a root there is no way for the engine to return an
error from the new function.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-23 11:54:35 -07:00
6b0f0af0e9
Merge pull request #5336 from tianon/slightly-more-organized-check-config
...
Move "possible config locations" list to the top of check-config.sh
2014-04-23 11:21:08 -06:00
b3ddc31b95
avoid suicide
...
container.Kill() might read a pid of 0 from
container.State.Pid due to losing a race with
container.monitor() calling
container.State.SetStopped(). Sending a SIGKILL to
pid 0 is undesirable as "If pid equals 0, then sig
is sent to every process in the process group of
the calling process."
Docker-DCO-1.1-Signed-off-by: Daniel Norberg <daniel.norberg@gmail.com > (github: danielnorberg)
2014-04-23 11:06:59 -04:00
03aacc4b91
Merge pull request #5351 from SvenDowideit/docs-conditional-beta-warning
...
Docs conditional beta warning
2014-04-23 08:55:08 -04:00
73d9ede12c
devicemapper: Don't mount in Create()
...
We used to mount in Create() to be able to create a few files that
needs to be in each device. However, this mount is problematic for
selinux, as we need to set the mount label at mount-time, and it
is not known at the time of Create().
This change just moves the file creation to first Get() call and
drops the mount from Create(). Additionally, this lets us remove
some complexities we had to avoid an extra unmount+mount cycle.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-04-23 13:50:53 +02:00
f436c744da
Merge pull request #5337 from tianon/man1-assumption
...
Update contributed man page file names and compilation script
2014-04-23 21:10:01 +10:00
dc982d3053
make the non-release doc warning conditional and add version info
...
use the beta-warning area to tell the user what VERSION of docker, git
branch, and links to the official release version docs are.
requires / extends PR #5272
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-04-23 21:07:12 +10:00
9d38fd0eef
Development docs warning for beta-docs.docker.io
...
Update: Fix alignment issues of the "warning" block.
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
Docker-DCO-1.1-Signed-off-by: O.S.Tezer <ostezer@gmail.com > (github: SvenDowideit)
2014-04-23 21:07:11 +10:00
a99d0c7136
Merge pull request #5352 from rmoriz/patch-1
...
Merged.
2014-04-23 12:42:41 +03:00
086b3208ea
fixed broken link to chef community site
2014-04-23 09:17:57 +02:00
a6fd2c237e
Fixed some missing ']' and the TAG
...
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com > (github: ipbabble)
Changes to be committed:
modified: contrib/man/md/docker-build.1.md
2014-04-22 22:35:59 -06:00
687653e599
Merge branch 'man1-assumption' of https://github.com/tianon/docker into manpages
2014-04-22 22:21:39 -06:00
a5b4a90748
Fixed an missing '-' on the "--rm"
...
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com > (github: ipbabble)
Changes to be committed:
modified: contrib/man/md/docker-build.md
2014-04-22 22:17:33 -06:00
87e8d7754e
Update tests with engine root removal
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-22 19:24:47 -07:00
96588fb85d
Merge pull request #5346 from SvenDowideit/dont-alocate-port-for-docs-release
...
Remove port allocation from `make docs-release`
2014-04-22 20:15:18 -06:00
672edfe807
Remove the concept of a root dir out of engine
...
This makes the engine more general purpose so that we can
use it and the job routing functionality for reexec'ing our binary
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Conflicts:
integration/runtime_test.go
2014-04-22 19:04:03 -07:00
e0af429a2a
don't try allocating a port to upload a docs release to s3
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-04-23 11:59:16 +10:00
817494d009
Merge pull request #5343 from shykes/beamsh
...
beam + beam/data + dockerscript
2014-04-22 17:01:05 -07:00
4353f25e10
engine.Installer: a standard interface for "installable" services
...
Installer is a standard interface for objects which can "install"
themselves an engine by registering handlers.
This can be used as an entrypoint for external plugins etc.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 16:51:06 -07:00
bf51f36d8f
Fix Go formatting in beam and dockerscript
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 16:16:29 -07:00
0bf2109121
pkg/dockerscript: add MAINTAINERS file
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:24 -07:00
bc6303f15d
beam/examples/beamsh: 'chdir' changes the current directory
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:24 -07:00
6ce4d2c842
beam/examples/beamsh: 'exec' can communicate with its child via beam.
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:24 -07:00
271ba18043
beam/examples/beamsh: use beam.Router to simplify 'multiprint' and fix job passthrough
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:23 -07:00
0d08d36bf5
beam: new routing functions Route.KeyEquals, Route.KeyIncludes, Route.NoKey
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:23 -07:00
30424f4e3a
beam/examples/beamsh: use beam.Router to simplify 'trace'
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:23 -07:00
d3df4b5baf
beam/examples/beamsh: move builtins to a separate file for readability
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:23 -07:00
0822d67b2d
beam/examples/beamsh: simplify commands by always creating and sending stdout and stderr for them
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:23 -07:00
63fd2ec0f7
beam/examples/beamsh: use beam.Router to simplify 'logger'
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:23 -07:00
9206b18818
beam/examples/beamsh: use beam.Router to simplify the 'stdio' command
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:23 -07:00
8f5435e80c
beam: Router can route beam messages with a convenient set of rules and handlers
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:23 -07:00
40b4f86eab
beam/examples/beamsh: move example scripts to scripts/
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:22 -07:00
1fb0bf1b3b
beam: Fix double close of fds in SendUnix
...
Instead of calling syscall.Close() on the fds in sendUnix() we call
Close() on the *os.File in Send(). Otherwise the fd will be closed, but
the *os.File will continue to live, and when it is finalized the
fd will be closed (which by then may be reused and can be anything).
This also adds a note to Send() the the file is closed.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-04-22 15:50:22 -07:00
a88d8d678b
beam: more unit tests
...
This adds testing to SendConn.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:22 -07:00
06df94d55b
beam/examples/beamsh: add scripts to reproduce various bugs
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:22 -07:00
d0ca66dded
beam/examples/beamsh: fix 'print' to be pass-through
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:22 -07:00
b97375fc29
beam/examples/beamsh: rename 'log' to 'logger' to avoid conflict with stdout/stderr
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:22 -07:00
a2b88b4915
beam/examples/beamsh: 'prompt' asks the user for a value and sends it.
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:22 -07:00
ed62ca5b2f
beam/examples/beamsh: commands are messages.
...
Commands in the pipeline should either implement or pass-through command messages.
This amounts to a proof-of-concept implementation of the "pipeline"
design of Docker plugins.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:22 -07:00
2f4b8b7e8d
beam/examples/beamsh: cosmetic fix in Fatalf
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:22 -07:00
4f92ffb500
beam: replace SendPair() with the simpler SendConn()
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:21 -07:00
5833e78887
beam/examples/beamsh: miniserver.ds demo
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:21 -07:00
70d3262161
beam: improve the API with Sender/Receiver interfaces and utilities: Copy/SendPipe/SendPair
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:21 -07:00
b0228d94be
beam: Make extracted Fds CloseOnExec
...
Grab forklock to make sure no forks accidentally inherit the new fds
before they are made CLOEXEC There is a slight race condition between
ReadMsgUnix returns and when we grap the lock, so this is not
perfect. Unfortunately There is no way to pass MSG_CMSG_CLOEXEC to
recvmsg() nor any way to implement non-blocking i/o in go, so this is
hard to fix.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-04-22 15:50:21 -07:00
207e604bad
beam/examples/beamsh: add a few example dockerscripts
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:21 -07:00
29ddf2be1e
beam/examples/beamsh: simplify code by using sendWPipe utility
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:21 -07:00
1dc449e11d
beam/examples/beamsh: move code around for readability
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:21 -07:00
3a2b31a30b
beam/examples/beamsh: 'exec' adds 'fromcmd' field to its output
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:21 -07:00
7534f7a34b
beam/examples/beamsh: simple 'log' command tees streams to a local directory
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:21 -07:00
4f5b94d369
beam/examples/beamsh: 'render' and 'beamsh -x'
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:20 -07:00
4ebe7aab91
beam/examples/beamsh: run commands in an implicit context of pre-loaded 'plugins'
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:20 -07:00
cd85af06fe
beam/examples/beamsh: convenience commands 'devnull', 'echo' and 'stdio'
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:20 -07:00
6d9cdbf24f
beam/examples/beamsh: 'emit' supports key=value syntax to compose arbitrary objects
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:20 -07:00
2b81fb8424
dockerscript: '=' is not a special character
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:20 -07:00
6e0a156d90
beam/examples/beamsh: support for background commands with '&' terminator
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:20 -07:00
08686f1d21
beam/data: Message.Parse creates a message from shell-style 'key=value' arguments
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:20 -07:00
ffe19414b1
dockerscript: support '#' line comments
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:20 -07:00
e1c8dbba97
beam/examples/beamsh: scripts can be passed as filenames
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:20 -07:00
222fc87ade
beam/examples/beamsh: remote communication over beam (experimental).
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:20 -07:00
371f6fc63d
beam/examples/beamsh: 'in' chdirs to a directory. 'pass' does simple passthrough
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:19 -07:00
6d5c75a224
beam/examples/beamsh: 'beamsend' command serializes all messages and sends them over a network connection
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:19 -07:00
5ddf673851
beam/examples/beamsh: 'exec' command correctly closes stdout and stderr when the process exists
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:19 -07:00
e512fef425
beam/examples/beamsh: don't print discarded messages in Devnull
...
This avoids false alarms when process exits without printing. Devnull
doesn't require synchronization.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:19 -07:00
34c5724b89
beam/examples/beamsh: more useful debugging
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:19 -07:00
a5bc75d406
beam/data: expose EncodeString for convenience access to the underlying netstring primitive
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:19 -07:00
fb1af1f0bc
beam/examples/beamsh: utility function 'fileToConn'
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:19 -07:00
74b90c25d9
beam/examples/beamsh: 'connect' command
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:19 -07:00
dff9854305
beam/examples/beamsh: 'exec' and 'listen' commands
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:19 -07:00
3686d50429
beam/examples/beamsh: prettier devnull
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:18 -07:00
c9b8e0fcac
beam/data: prettier Message.Pretty()
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:18 -07:00
d7a2ae8e13
beam/examples/beamsh: prettier 'trace' command
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:18 -07:00
eca6fecb59
beam/data: convenience Message.Pretty() function
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:18 -07:00
d4920b3fff
beam/examples/beamsh: basic implementation of the pipeline design, with static handlers for now.
...
In the pipeline design, several beam commands can be run concurrently,
with their respective inputs and outputs connected in such a way that
beam messages flow from the first to last. This is similar to the way
a unix shell executes commands in a pipeline: instead of STDIN and
STDOUT, each beam command has a "BEAMIN" and "BEAMOUT".
Since beam allows for richer communication than plain byte streams, beam
pipelines can express more powerful computation, while retaining the
fundamental elegance and ease of use of unix-style composition.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:18 -07:00
ec288895e5
beam/examples/beamsh: better debugging messages
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:18 -07:00
ab2010cfd3
beam/examples/beamsh: simple 'exec' command
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:18 -07:00
5689792171
beam/examples/beamsh: catch introspection calls from jobs for proper nesting
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:18 -07:00
bcd31405cf
beam: fix FD leaks in SendPipe
...
This fixes file descriptor leaks in the SendPipe function.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:18 -07:00
1737063904
beam: more hooks for interactive debugging
...
This inserts low-level hooks for interactive step-by-step debugging.
Hooks are triggered by setting the *TEST* environment variable.
This is particularly useful for tracking down file descriptor leaks,
double-closing, or other issues which are difficult to debug with
the usual toolbox.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:17 -07:00
6072dec9e7
beam/examples/beamsh: first try at nested execution
...
The "wiring" is broken because engine does not keep a reference for handling introspection calls.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:17 -07:00
8697490740
beam/examples/beamsh: fix a bug in the log command
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:17 -07:00
488fe61354
beam/data: convenience Message.Get
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:17 -07:00
460c98d92d
beam/examples/beamsh: use beam/data
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:17 -07:00
5bcf2a736c
beam/data: Message.Bytes() convenience method
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:17 -07:00
99dda11d45
beam/data: fix a bug in encoding of multi-value maps
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:17 -07:00
276fb1918d
beam/data: convenience Message type for chained manipulation
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:17 -07:00
916372c76f
Beam: remove leftover debugging messages
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:17 -07:00
cb66e8c136
beam/examples/beamsh: hide debug messages in examples/beamsh by default
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:17 -07:00
97a2c0ebe6
beam/data: a simple format for sending structured data over beam
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:16 -07:00
771e493457
beam/examples/beamsh: more bells and whistles for demos
...
* Automatically switch to interactive mode when stdin is a terminal
* Basic implementation of "responses"
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:16 -07:00
851c1b05d0
Beam: fix bug in beamsh which 'swapped' FDs because of underlying implementation of net.FileConn
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:16 -07:00
4481e80636
pkg/dockerscript: <!> is not a special character
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:16 -07:00
07c03944ff
Beam: don't close the attachment FD when closing superfluous FDs
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:16 -07:00
8875cdf561
Beam: debugging hooks for easy step-by-step inspection of the FD table
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:16 -07:00
f586dcf307
beam/examples/beamsh: use 'log' command to pass stdout
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:16 -07:00
d00a6b7648
beam/examples/beamsh: basic execution of commands, with in-process beam and dummy handlers
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:16 -07:00
f0933a91b0
pkg/dockerscript: remove debug messages
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:16 -07:00
5c14c3ada5
pkg/dockerscript: '.' is not a special character
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:15 -07:00
f94a18677a
Beam: Send: pass the underlying error unchanged to allow io.EOF detection
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:15 -07:00
11f2531da6
pkg/dockerscript: expose a simple, clean API with a single Parse method
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:15 -07:00
7f00a3b665
beam/examples/beamsh: correctly parse nested commands
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:15 -07:00
fd890136a9
dockerscript: patch text/scanner to use a shell-like syntax instead of the default go-like syntax
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:15 -07:00
cd8ddacdc7
pkg/dockerscript: a simple shell-like syntax to express docker operations
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:15 -07:00
be470f2497
Beam: beamsh is a mini-shell which runs processes and communicates with them over beam
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:15 -07:00
0e42c7d889
Beam: basic test harness for the unix socket implementation.
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:15 -07:00
59853c188d
Beam: USocketPair returns a *net.UnixConn socket pair for convenience.
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:15 -07:00
c401c43cae
Beam: fix file descriptor leaks
...
* Close all file descriptors successfully sent as attachment
* Close duplicate file descriptors created by net.FileCon and net.UnixConn.File
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:15 -07:00
b637e5f04a
Beam: change the prototype of SendPipe() to return a *net.UnixSocket
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:14 -07:00
188c2ef806
Beam: allow sending messages without attachments.
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:14 -07:00
3960da04c8
Beam: convenience functions Listen and Connect
...
These convenience functions expose a familiar face to the unknown and bizarre world of beam networking.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:14 -07:00
5957e6b385
Beam: a simple stream-oriented communication protocol for distributed systems.
...
This patch includes a stripped down implementation with a bare minimum
unix socket transport. It relies on fd passing for stream multiplexing.
The purpose of this first patch is to allow implementation of dynamic
linking, which will allow advanced service discovery.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-22 15:50:14 -07:00
f763075c74
Update contributed man page file names and compilation script for the eventual possibility of non-man1 man pages (hopefully a Dockerfile.5.md, for example)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-22 06:43:08 -06:00
2c4cebe916
Move "possible config locations" list to the top of check-config.sh
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-22 06:26:44 -06:00
cf997aa905
container: Remove Ghost state
...
container.Register() checks both IsRunning() and IsGhost(), but at
this point IsGhost() is always true if IsRunning() is true. For a
newly created container both are false, and for a restored-from-disk
container Daemon.load() sets Ghost to true if IsRunning is true. So we
just drop the IsGhost check.
This was the last call to IsGhost, so we remove It and all other
traces of the ghost state.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-04-22 09:49:53 +02:00
ba11de9efa
Merge pull request #5205 from ipbabble/manpages
...
Completed the manual paged in Markdown. rm old man pages.
2014-04-22 14:48:53 +10:00
e630d9ea24
Merge pull request #5331 from shykes/cleanup-maintainers
...
Clean up MAINTAINERS files
2014-04-21 18:18:39 -07:00
19e6614eeb
Clean up MAINTAINERS files
...
* Remove out of date "vacation mode"
* Fix my email address
* Remove infrastructure maintainers to reflect reality (core maintainers
are currently maintaining their own infrastructure).
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-21 18:17:13 -07:00
7b1337a17f
Merge pull request #5334 from shykes/freeze-server
...
Freeze server/server.go for deprecation
2014-04-21 18:16:40 -07:00
8bcbc9fe99
Freeze server/server.go for deprecation
...
* Add notice in server/server.go explaining not to add stuff there, and
what to do instead.
* Make myself a sole maintainer of server/ to avoid concurrent edits
while refactoring.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-21 17:51:41 -07:00
e828d91197
Merge pull request #5323 from Lance0312/docs-missing-blank-lines
...
Merged.
2014-04-22 02:55:44 +03:00
7816712457
Merge pull request #5328 from crosbymichael/refactor-cgroups
...
Refactor cgroups into subsystems and support metrics
2014-04-21 14:06:17 -07:00
ac8c705c95
Changed Image to image.
...
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com > (github: ipbabble)
Changes to be committed:
modified: contrib/man/md/README.md
2014-04-21 14:37:08 -06:00
73257a72ea
Further edtis based on comments.
...
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com > (github: ipbabble)
Changes to be committed:
modified: contrib/man/md/README.md
modified: contrib/man/md/docker-build.md
modified: contrib/man/md/docker-cp.md
modified: contrib/man/md/docker-logs.md
modified: contrib/man/md/docker-push.md
2014-04-21 14:28:25 -06:00
c0d5eac120
Merge pull request #5223 from crosbymichael/load-profile
...
Use apparmor parser directly
2014-04-21 21:50:59 +03:00
bbde4298a5
Edits based on Sven's comments.
...
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com > (github: ipbabble)
Changes to be committed:
modified: contrib/man/md/docker-build.md
modified: contrib/man/md/docker-commit.md
2014-04-21 11:55:06 -06:00
7922e67870
Fixed a sentence for ostezer.
...
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com > (github: ipbabble)
modified: contrib/man/md/README.md
2014-04-21 10:42:46 -07:00
95c311c8b4
Made some edits and removed the alternative, manual generation instructions.
...
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com > (github: ipbabble)
Changes to be committed:
modified: contrib/man/md/README.md
2014-04-21 10:42:46 -07:00
1b2b783b52
Edits based on ostezer's feedback.
...
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com > (github: ipbabble)
2014-04-21 10:42:46 -07:00
e55ed741c2
Update hack/make/ubuntu to use the new markdown-based manpages
...
This also removes all the old man pages, .gitignores their directory, and updates the md2man-all.sh script to be easier to read and more friendly to being called within hack/make/ubuntu.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-21 10:42:46 -07:00
67a73917c1
Added a tag to FROM fedora (fedora:20)
...
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com > (github: ipbabble)
2014-04-21 10:42:46 -07:00
0a0dd11632
Created all manual pages in Markdown. Container for conversion.
...
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com > (github: ipbabble)
All Docker commands have a Markdown page.
Dockerfile used to build a Fedora based pandoc container.
md2man-all.sh is used inside the container.
README.sh includes an explaination on how to build the fedora/pandoc
image and how to run the container directly.
Changes to be committed:
new file: contrib/man/md/Dockerfile
new file: contrib/man/md/README.md
new file: contrib/man/md/docker-attach.md
new file: contrib/man/md/docker-build.md
new file: contrib/man/md/docker-commit.md
new file: contrib/man/md/docker-cp.md
new file: contrib/man/md/docker-diff.md
new file: contrib/man/md/docker-events.md
new file: contrib/man/md/docker-export.md
new file: contrib/man/md/docker-history.md
new file: contrib/man/md/docker-images.md
new file: contrib/man/md/docker-import.md
new file: contrib/man/md/docker-info.md
new file: contrib/man/md/docker-inspect.md
new file: contrib/man/md/docker-kill.md
new file: contrib/man/md/docker-load.md
new file: contrib/man/md/docker-login.md
new file: contrib/man/md/docker-logs.md
new file: contrib/man/md/docker-port.md
new file: contrib/man/md/docker-ps.md
new file: contrib/man/md/docker-pull.md
new file: contrib/man/md/docker-push.md
new file: contrib/man/md/docker-restart.md
new file: contrib/man/md/docker-rm.md
new file: contrib/man/md/docker-rmi.md
new file: contrib/man/md/docker-run.md
new file: contrib/man/md/docker-save.md
new file: contrib/man/md/docker-search.md
new file: contrib/man/md/docker-start.md
new file: contrib/man/md/docker-stop.md
new file: contrib/man/md/docker-tag.md
new file: contrib/man/md/docker-top.md
new file: contrib/man/md/docker-wait.md
new file: contrib/man/md/docker.md
new file: contrib/man/md/md2man-all.sh
2014-04-21 10:42:46 -07:00
3c50cb44d1
Merge pull request #5232 from kzys/freebsd-graph
...
Fix graph and pkg/graphdb on FreeBSD
2014-04-21 10:39:50 -07:00
813cebc64f
Merge branch 'master' into load-profile
...
Conflicts:
daemon/execdriver/native/create.go
daemon/execdriver/native/driver.go
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-04-21 10:32:13 -07:00
ac814ee3c7
Make sure @proc is defined
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-04-21 10:28:04 -07:00
004cf556e8
Use cgo to get systems clock ticks for metrics
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-21 10:26:22 -07:00
d4ca165827
Merge pull request #5321 from SvenDowideit/osx-install-mkdir-local
...
Merged.
2014-04-21 19:12:36 +03:00
f59be989dc
Refactor stat parsing to use only 8 fields
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-20 20:45:08 -07:00
9cd6a6d614
Merge pull request #24 from ehazlett/cgroups-stats
...
more work on cpu stats
2014-04-20 21:11:11 -07:00
2f24b5a9dc
work on cpu stats
...
Docker-DCO-1.1-Signed-off-by: Evan Hazlett <ejhazlett@gmail.com > (github: ehazlett)
2014-04-21 00:07:05 -04:00
bce49dff0d
Add freezer stats
...
This one is a problem because the most useful stat is a string and not a
float like verything else. We may have to change the return type
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-20 18:35:33 -07:00
3bfe13de2c
Reuse cpuacct stats for cpu subsystem
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-20 18:20:44 -07:00
37248039e1
Fix parsing of blkio files
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-20 18:18:17 -07:00
7f12260fd1
Add external function to get cgroup stats
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-20 17:36:20 -07:00
9b65f16355
Refactor stats and add them to all subsystems
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-20 12:02:39 -07:00
86e34ce59f
Squashed commit of the following:
...
commit 75af1649b063abbc5d662fd2f8bc4ff62c927687
Author: Evan Hazlett <ejhazlett@gmail.com >
Date: Sun Apr 20 01:32:42 2014 -0400
more refactor
commit 43b36d0f15d634497127bcb17dacaa70ae92e903
Author: Evan Hazlett <ejhazlett@gmail.com >
Date: Sun Apr 20 01:11:49 2014 -0400
refactored cgroup param parsing to util func
commit e3738b0168a075bd92ec828879b0e46bdbbe3845
Author: Evan Hazlett <ejhazlett@gmail.com >
Date: Sun Apr 20 00:57:19 2014 -0400
dat error checking
commit 57872bcc59403ecd308cfe97c78f73d6ca58d165
Author: Evan Hazlett <ejhazlett@gmail.com >
Date: Sun Apr 20 00:43:25 2014 -0400
proper use of fmt.Errorf
commit 43dad6acc0cb21aac2b04ce074699879898ee820
Author: Evan Hazlett <ejhazlett@gmail.com >
Date: Sun Apr 20 00:36:45 2014 -0400
proper placement of defer
commit b7f20b934b2bc92cd39397dbc608b77bff28493c
Author: Evan Hazlett <ejhazlett@gmail.com >
Date: Sun Apr 20 00:34:39 2014 -0400
defers, error checking, panic avoidance
commit 7a9a6ff267f8806dfe6676486f73fe89b72968fb
Author: Evan Hazlett <ejhazlett@gmail.com >
Date: Sun Apr 20 00:22:00 2014 -0400
data param to use container info instead of host
commit 0e0cf7309be1644687160d6519db792b23cd26e9
Author: Evan Hazlett <ejhazlett@gmail.com >
Date: Sun Apr 20 00:11:29 2014 -0400
added stats for cpuacct, memory, and blkio
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-20 11:34:28 -07:00
b87cb76976
Add missing blank lines in between list items
...
Lists with paragraphs as items need blank lines in between
items to generate correct layout.
Docker-DCO-1.1-Signed-off-by: Lance Chen <cyen0312@gmail.com > (github: Lance0312)
2014-04-21 01:32:00 +08:00
b26821e5c0
on a fresh OSX, /usr/local/bin doesn't exist
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-04-20 22:56:22 +10:00
611a1d711b
typo fix: 'methid' -> 'method'
2014-04-19 23:25:48 -07:00
231f53fd9b
Merge pull request #5213 from tianon/missing-ps-requirement
...
Add missing "ps" requirement to PACKAGERS.md
2014-04-19 21:24:30 -06:00
cb2ce9089c
Merge pull request #5313 from Lance0312/arch-fd-link
...
Fix borken /dev/fd in mkimage-arch.sh
2014-04-19 21:23:18 -06:00
f10bb364be
Merge pull request #5312 from ostezer/docs-illusion-confusion
...
Urgent fix for crazy docs error on volumes.
2014-04-20 12:02:47 +10:00
f2f33d7096
Merge pull request #5249 from tianon/make-validate
...
Add "validate" Makefile target
2014-04-19 11:35:14 -06:00
97daf9864d
Urgent fix for crazy docs error on volumes.
...
Elaborate on the volumes example to prevent confusion.
Update: Amend the example so it is executable by the reader.
This includes fixing the erring "/var/logs" statement with "/var/log".
Update: Fix sentence structuring to better suit the 80chrs. limit.
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
2014-04-19 19:35:00 +03:00
1c75602890
Merge pull request #5309 from ostezer/docs-fix-apostrophe
...
Introducing spīritus lēnis to fix code highlighting issues due to apostrophe.
2014-04-19 20:39:27 +10:00
c7f5799120
Merge pull request #5311 from ostezer/docs-fix-footer-links
...
Fix footer links. They are pointing to the wrong direzione.
2014-04-19 20:38:44 +10:00
e6b794e542
Fix broken /dev/fd in mkimage-arch.sh
...
Exactly the same problem as dotcloud/docker#2356
Docker-DCO-1.1-Signed-off-by: Lance Chen <cyen0312@gmail.com > (github: Lance0312)
2014-04-19 16:04:35 +08:00
7fdeda8717
Add remove method to subsystems
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-18 22:17:31 -07:00
e92f2fd395
Break down groups into subsystems
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-18 22:10:30 -07:00
06db0604e5
Move raw cgroups into fs package (filesystem)
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-18 21:34:26 -07:00
ec43ec50b4
Move systemd code into pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-18 21:30:08 -07:00
42fb2973c6
Refactor cgroups file locations
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-18 21:14:58 -07:00
a96106b5f1
Fix footer links. They are pointing to the wrong direzione.
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
2014-04-19 04:13:52 +03:00
4c720d4de7
Merge pull request #4166 from shykes/engine-logging
...
Engine: optional Logging field to disable custom logging in engine.
2014-04-18 18:05:00 -07:00
2d6324e06a
Introducing spīritus lēnis to fix code highlighting issues due to apostrophe.
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
2014-04-19 03:35:45 +03:00
87014c0328
Merge pull request #5307 from ostezer/docs-amend-notes-warnings
...
Mark notes and warnings, fix broken link renderings within.
2014-04-19 08:48:55 +10:00
7935850005
Mark notes and warnings, fix broken link renderings within.
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
2014-04-18 23:31:38 +03:00
5b6b91aa2c
Merge pull request #5264 from unclejack/change_inode_map
...
change inode map to struct from bool
2014-04-18 11:48:23 -07:00
2931979a5d
Merge pull request #5304 from vieux/convert_rm_tests
...
convert so rm tests to integration-cli
2014-04-18 21:11:18 +03:00
c25704e31b
Merge pull request #5296 from crosbymichael/move-integration-tests
...
Move integration tests
2014-04-18 21:01:33 +03:00
fcbc717f9a
convert so rm tests to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-04-18 17:40:12 +00:00
c2df189ea5
Merge pull request #5236 from crosbymichael/remove-ghost-networking
...
Remove ghost networking
2014-04-18 20:38:12 +03:00
720f344704
Added support for multiple endpoints in X-Docker-Endpoints header
...
Docker-DCO-1.1-Signed-off-by: Joffrey F <joffrey@docker.com > (github: shin-)
2014-04-18 17:42:54 +02:00
3eea3e0714
Merge pull request #5298 from SvenDowideit/remove-auto-markdown-conversion
...
Merged.
2014-04-18 14:13:36 +03:00
d4a00c7494
the markdown docs are now master, but I may do a manual conversion a few more times when older PR's are merged
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-04-18 16:34:53 +10:00
58e011595e
Remove worthless iptables test
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-18 03:22:53 +00:00
296fcf331f
Port privileged tests
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-18 03:20:17 +00:00
caad45d0ed
Port networking tests
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-18 03:12:27 +00:00
47510bd6eb
Port environment test
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-18 02:53:08 +00:00
e2ed4b9077
Port user tests and concurrent tests
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-18 02:47:39 +00:00
6df19aa78e
Merge pull request #5275 from ostezer/docs-add-back-ga-code
...
Add back the GA code block.
2014-04-17 22:44:48 -04:00
a0cfcbf648
Merge pull request #5274 from ostezer/docs-add-edit-on-github-link
...
Amendments providing the "Edit on GitHub" link for docs on master.
2014-04-18 12:43:24 +10:00
81d9d92436
Merge pull request #5265 from ostezer/docs-fix-mobile-menu-click
...
Fix & improvements for mobile (& desktop) menu & submenu behaviour & issues.
2014-04-18 12:42:35 +10:00
ac697e5f52
Merge pull request #5257 from ostezer/docs-fix-toc-click
...
Fix for TOC "click/expand" & "scroll position" problem on mobile.
2014-04-17 22:42:15 -04:00
03993eb534
Port volumes and exit code tests
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-18 02:34:10 +00:00
6beb858fb0
Update commit test in cli
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-18 02:24:19 +00:00
72f49e554f
Port multiple attach test to cli tests
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-18 02:14:00 +00:00
76a19bb3a9
Add test verify container ID
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-18 01:58:20 +00:00
b84de10b85
Merge pull request #5292 from ostezer/docs-fix-mkdocs-yaaaayml-file
...
Make things awesomer by amending mkdocs.yml
2014-04-18 09:57:38 +10:00
f3bf61fad4
Make things awesomer by amending mkdocs.yml
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
2014-04-18 02:51:04 +03:00
eceeebc22d
Remove IsGhost checks around networking
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-17 23:49:59 +00:00
6934f0fa9e
Merge pull request #5269 from ostezer/docs-improve-index-docs
...
Improve (&restructure) Docker Index docs on the Docker docs.
2014-04-18 09:25:54 +10:00
fb2110b465
Merge pull request #5287 from jamtur01/tickets/5283
...
Fixed #5283 - literal leftover from cutover
2014-04-18 09:04:16 +10:00
bb02624145
Merge pull request #5284 from jamtur01/tickets/5282
...
Fixed #5282 - deprecated -name syntax
2014-04-18 09:03:55 +10:00
2f3cb370df
Fixed #5283 - literal leftover from cutover
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-04-17 18:58:02 -04:00
ad8db1aa22
Merge pull request #5261 from ostezer/fix-inline-links
...
Fix for broken in-document links which got scrambled during conversion.
2014-04-18 01:49:18 +03:00
f34383ac7e
Merge pull request #5260 from ostezer/docs-remove-manual-tocs
...
Remove manually written TOCs from archived docs.
2014-04-18 08:43:27 +10:00
a75758fcf6
Fixed #5282 - deprecated -name syntax
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-04-17 18:43:06 -04:00
baa4f39551
Add back the GA code block.
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
2014-04-18 01:42:23 +03:00
58595475ea
Merge pull request #5273 from alexlarsson/rename-runtime-to-daemon
...
Rename runtime/* to daemon/*
2014-04-17 14:56:43 -07:00
05d7271f91
Amendments providing the "Edit on GitHub" link for docs on master.
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
2014-04-18 00:53:39 +03:00
359b7df5d2
Rename runtime/* to daemon/*
...
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-04-17 14:43:01 -07:00
cb6bcfd6bc
Improve (&restructure) Docker Index docs on the Docker docs.
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
2014-04-17 23:13:59 +03:00
7f62f470f3
Fix & improvements for mobile (& desktop) menu & submenu behaviour & issues.
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
2014-04-17 20:35:08 +03:00
d072f316e3
change inode map to struct from bool
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-04-17 20:08:14 +03:00
1ff66d27b5
Fix for broken in-document links which got scrambled during conversion.
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
2014-04-17 18:09:08 +03:00
24a42b1370
Remove manually written TOCs from archived docs.
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
2014-04-17 17:47:34 +03:00
205e85da32
Fix for TOC "click/expand" & "scroll position" problem on mobile.
...
Fixes:
- Click/expand
- Scroll pos.
- TOC table scroll-down arrow.
- TOC title scrolls to top.
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
2014-04-17 15:48:03 +03:00
57cbe8b106
Merge pull request #5230 from huslage/master
...
Replacing ASCII art image with real diagram
2014-04-17 12:47:48 +10:00
8e67197267
Merge pull request #5248 from unclejack/more_info_testtop
...
provide more information when TestTop tests fail
2014-04-16 18:54:04 -07:00
65fb2e77eb
simplify the docs branch process for now
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-04-17 11:11:32 +10:00
7de1557b2e
Add "validate" Makefile target
...
This was supposed to be part of my previous PR, but somehow got missed.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-16 18:56:02 -06:00
3ac90aeed5
provide more information when TestTop tests fail
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-04-17 03:39:15 +03:00
925dfdb18a
Merge pull request #5246 from crosbymichael/fix-mount
...
Fix unmount when host volume is removed
2014-04-16 17:28:37 -07:00
ef114930cd
Merge pull request #5215 from danmcp/fix_typos
...
Fixing typos
2014-04-16 16:44:16 -07:00
2d6f537bb3
Merge pull request #5234 from crosbymichael/refactor-container-start
...
Refactor container start
2014-04-17 02:20:35 +03:00
66480d67fb
Merge pull request #5243 from creack/hairpin_nat_test
...
Add integration test for hairpin nat
2014-04-17 01:44:56 +03:00
b92c86764a
Merge pull request #5245 from SvenDowideit/more-working-with
...
this topic nolonger crashes the build
2014-04-17 01:44:50 +03:00
4ba7b28006
this topic nolonger crashes the build
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-04-17 08:43:07 +10:00
f85d03327d
Merge pull request #5233 from ostezer/docs-fix-scroll-header-margin
...
Fix headers staying under the menu when clicked-to-scroll.
2014-04-17 08:40:55 +10:00
2f3cccfcbd
Merge pull request #5231 from ostezer/fix-breadcrumbs
...
Amend breadcrumbs to link to the section indexes, i.e., home/:section/
2014-04-17 08:40:40 +10:00
92ea101bc4
SQLite is also available in FreeBSD
...
Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com > (github: kzys)
2014-04-17 07:19:30 +09:00
1775ed8c75
Add integration test for hairpin nat
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-04-16 14:50:11 -07:00
882862b095
Fix headers staying under the menu when clicked-to-scroll.
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
2014-04-16 19:38:08 +03:00
e1e512e2da
This permission should be interpreted as octal, not decimal
...
Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com > (github: kzys)
2014-04-17 00:48:27 +09:00
75d97a4d2f
Replacing ASCII art image with real diagram
...
Docker-DCO-1.1-Signed-off-by: Aaron Huslage <huslage@gmail.com > (github: huslage)
2014-04-16 11:24:07 -04:00
b74fa75872
Amend breadcrumbs to link to the section indexes, i.e., home/section/
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
2014-04-16 18:20:29 +03:00
24c4c3e0e9
Merge pull request #5227 from SvenDowideit/fix-conversion-urls-securityblog
...
rst->md conversion fix
2014-04-16 13:11:29 +03:00
ce7d251d52
rst->md conversion fix
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-04-16 14:43:52 +10:00
9b6c40cf69
Merge pull request #5204 from ostezer/new-maintainer
...
Adding myself to the MAINTAINERS
2014-04-15 21:19:39 -07:00
2e78ab91ec
Add missing "ps" requirement to PACKAGERS.md
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-15 21:55:48 -06:00
8e35bb256d
Merge pull request #5224 from dhrp/tp-titles-colors
...
Changed heading colors and some alignments (no longer center and justification in left column)
2014-04-16 13:07:52 +10:00
4d3e448a33
Changed heading colors and some alignments (no longer center and justification in left column)
...
Docker-DCO-1.1-Signed-off-by: Thatcher Peskens <thatcher@docker.com > (github: dhrp)
2014-04-15 19:15:13 -07:00
b9f66049fa
Merge pull request #5219 from dotcloud/master-doc-markdown
...
now, with shiney markdown
2014-04-16 11:05:29 +10:00
ac999a9cb2
now, with shiney markdown
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-04-16 11:04:14 +10:00
a777ebcee6
move the documentation to markdown
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-04-16 11:04:01 +10:00
ede9ea37c3
Merge pull request #5206 from SvenDowideit/stage-markdown
...
move the documentation to markdown
2014-04-16 10:08:57 +10:00
936a03bfdd
move the documentation to markdown
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: )
2014-04-16 00:02:10 +00:00
dceea17805
Fixing typos
...
Docker-DCO-1.1-Signed-off-by: Dan McPherson <dmcphers@redhat.com > (github: danmcp)
2014-04-15 18:06:48 -04:00
32d8b5da50
Adding myself to the MAINTAINERS file.
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
2014-04-16 00:33:14 +03:00
80f6b01132
Merge pull request #5211 from crosbymichael/update-cgroup-defaults
...
Ignore not exist errors for joining default subsystems
2014-04-15 22:55:26 +03:00
994b7eaeb7
Merge pull request #5201 from tianon/build-busybox
...
Fetch the "busybox" image source so we can build locally instead of pulling during the integration tests
2014-04-15 09:47:05 -06:00
de167a7514
Merge pull request #5181 from uggedal/mkimage-alpine
...
contrib: mkimage script for alpine linux
2014-04-15 08:09:42 -06:00
8b54e57fa8
Merge pull request #5202 from vieux/allow_dot_repo
...
Allow dot in repo name
2014-04-15 13:58:33 +03:00
6a2bdc6eb7
contrib: mkimage script for alpine linux
...
Docker-DCO-1.1-Signed-off-by: Eivind Uggedal <eivind@uggedal.com > (github: uggedal)
2014-04-15 07:59:42 +00:00
d61fce9af7
allow dot in repo name
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-04-14 23:15:38 +00:00
7bb72fa080
Fetch the "busybox" image source so we can build locally instead of pulling during the integration tests
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-14 13:35:54 -06:00
e5ad715e59
Merge pull request #5158 from vieux/refactor_build_only_configFile
...
refactor build job to know only configFile
2014-04-14 10:59:48 -07:00
19ffc5e92f
Merge pull request #5075 from tianon/update-check-config
...
Update check-config.sh with more kernel configs and more reliable cgroup hierarchy/subsystem check
2014-04-14 10:58:00 -07:00
5fc1b4d2cd
Merge pull request #5132 from crosbymichael/fix-cgroup-hiar
...
Setup cgroups for supported subsystems
2014-04-14 10:56:15 -07:00
f98ed28c1d
Merge pull request #4878 from kzys/freebsd-utimes
...
Support FreeBSD on pkg/system/utimes_*.go
2014-04-14 10:39:25 -07:00
413190e159
Merge pull request #5172 from pnasrat/5166-large-image-graph-restore
...
Enable construction of TruncIndex from id array.
2014-04-14 10:31:16 -07:00
e9c3e39743
rename configFile to auth in the job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-04-14 17:15:22 +00:00
0037dee02c
Merge pull request #5160 from kzys/fs-symlink
...
Fix utils.FollowSymlinkInScope's infinite loops bug
2014-04-14 20:12:39 +03:00
b255d96694
Merge pull request #4828 from almoehi/patch-1
...
Added reactive-docker to list of remote API clients
2014-04-14 19:06:59 +03:00
39103e72a3
Fix unmount when host volume is removed
...
Fixes #5244
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-14 12:43:01 +00:00
9bd7d09871
Remove ArgsAsString because its a util function
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-14 07:08:54 +00:00
35a88f2c29
Fix resolvconf logic
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-14 06:58:04 +00:00
71b241cbfe
Remove container.When method
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-14 06:54:40 +00:00
c99ba05c84
Refactor container start to make it more manageable
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-14 06:46:34 +00:00
f00ca72baa
Move network settings into separate file
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-14 06:15:31 +00:00
3061a6a2ab
Generate imports based on what is avaliable
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-14 05:22:45 +00:00
84a76f2796
Add benchmark tests for TruncIndex.
...
Compare add vs new.
Some historical data in PR #5172 .
Docker-DCO-1.1-Signed-off-by: Paul Nasrat <pnasrat@gmail.com > (github: pnasrat)
2014-04-13 22:36:15 -04:00
184728e7bc
Ignore not exist errors for joining default subsystems
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-14 00:07:48 +00:00
6c26a87901
Ignore is not exist error
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-14 00:03:35 +00:00
052cc5a637
Move apparmor to top level pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-13 23:33:25 +00:00
5f4bc4f916
Use apparmor_parser directly
...
The current load script does alot of things. If it does not find the
parser loaded on the system it will just exit 0 and not load the
profile. We think it should fail loudly if it cannot load the profile
and apparmor is enabled on the system.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-13 23:31:10 +00:00
2d20c92d29
Merge pull request #5176 from unclejack/check_before_pulling
...
cli integ: don't fetch busybox if it exists
2014-04-13 09:28:30 -06:00
449f92f11e
cli integ: don't fetch busybox if it exists
...
Don't make calls to the registry if the image exists already.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-04-13 15:06:15 +03:00
370b935b49
Merge pull request #5177 from jbbarth/docs-add-common-errors-for-test-suite
...
Docs: add some example log lines that indicate a lack of memory when running the test suite
2014-04-12 21:03:24 +03:00
1f7e97e951
Merge pull request #5178 from jbbarth/docs-improve-ubuntulinux-accounting-section
...
Docs: improve installation/ubuntulinux memory and swap accounting section
2014-04-12 20:32:26 +03:00
0a0e49d406
Docs: improve installation/ubuntulinux memory and swap accounting section
...
Docker-DCO-1.1-Signed-off-by: Jean-Baptiste Barth <jeanbaptiste.barth@gmail.com > (github: jbbarth)
2014-04-12 10:57:19 +00:00
26845ef1ae
Docs: add some example log lines that indicate a lack of memory when running the test suite
...
Docker-DCO-1.1-Signed-off-by: Jean-Baptiste Barth <jeanbaptiste.barth@gmail.com > (github: jbbarth)
2014-04-12 02:09:06 +00:00
0f72486346
Fix utils.FollowSymlinkInScope's infinite loop bug
...
fs_test.go doesn't finish if Docker's code is placed under a directory
which has symlinks between / and the directory.
For example, the below doesn't finish before the change.
/home -> usr/home
FollowSymlinkInScope("/home/bob/foo/bar", "/home/bob/foo")
Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com > (github: kzys)
2014-04-12 07:37:18 +09:00
e3e078ca2f
Add the test to reproduce the issue even in "make test"
...
Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com > (github: kzys)
2014-04-12 07:37:17 +09:00
4f169c2db5
Enable construction of TruncIndex from id array.
...
Fixes #5166
Current graph.restore is essentially O(n^2 log n) due to how
suffixarray creation works.
Rather than create/append/create new this supports creation from a seed
array of ids.
Functional testing shows this eliminates the hang on Creating image
graph reported on list.
Docker-DCO-1.1-Signed-off-by: Paul Nasrat <pnasrat@gmail.com > (github: pnasrat)
2014-04-11 16:39:58 -04:00
4ddfffcab3
Join memory and cpu cgroup in systemd too
...
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: crosbymichael)
2014-04-11 17:29:40 +00:00
505184d2dc
Join cpuacct, freezer, perf_event, and blkio groups
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-11 17:28:27 +00:00
031fcb31d3
Setup cgroups for all subsystems
...
Fixes #5117
Fixes #5118
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-11 17:28:27 +00:00
931f065560
Merge pull request #5164 from jsimonelis/patch-2
...
terms update: FQIN must include a tag
2014-04-11 06:47:28 -07:00
69fbf8e31f
terms update: FQIN must include a tag
...
change: A fully qualified image name must include a tag.
Recommitting changes for PR: https://github.com/dotcloud/docker/pull/5145
since SvenDowideit suggested I would need to sign my commit for it to be accepted.
Docker-DCO-1.1-Signed-off-by: Justin Simonelis <justin.p.simonelis@gmail.com > (github: jsimonelis)
2014-04-11 08:51:50 -04:00
b9731bccf2
refactor build job to know only configFile
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-04-10 22:29:03 +00:00
28e7e81479
Merge pull request #5072 from tianon/hack-set-e-consistently
...
Update bundlescripts to use "set -e" consistently
2014-04-10 13:37:36 -06:00
feae37c171
Merge pull request #5071 from tianon/minor-man-formatting-consistency
...
Fix a few minor man formatting consistency issues
2014-04-10 13:13:37 -06:00
f66082a443
Merge pull request #5093 from danielnorberg/do-not-create-bridge
...
net: do not create -b/--bridge specified bridge
2014-04-10 11:17:02 -07:00
bcc3857fa0
Merge pull request #4990 from vbatts/vbatts-server_show_info
...
docker daemon: show info about the server
2014-04-10 11:14:09 -07:00
b8c10d8af2
Merge pull request #5143 from kzys/ns-nil
...
Avoid "invalid memory address or nil pointer dereference" panic
2014-04-10 11:07:35 -07:00
a521388863
Merge pull request #4821 from jimenez/3903-add_event_end_timestamp-feature
...
Adding timestamp end to events endpoint. Modifying api docs.
2014-04-10 20:54:53 +03:00
897bf5439d
Merge pull request #5140 from unclejack/build_immediate_cleanup
...
delete containers during build after every step
2014-04-10 10:49:13 -07:00
66dd4ea4e2
Adding timestamp end to events endpoint. Modifying api docs.
...
Docker-DCO-1.1-Signed-off-by: Isabel Jimenez <contact@isabeljimenez.com > (github: jimenez)
2014-04-10 10:43:21 -07:00
d4746d3ea0
bridge driver: clean up error returns
...
Docker-DCO-1.1-Signed-off-by: Daniel Norberg <daniel.norberg@gmail.com > (github: danielnorberg)
2014-04-10 11:26:48 -04:00
336199a877
net: do not create -b/--bridge specified bridge
...
If the bridge specified using -b/--bridge doesn't
exist, fail instead of attempting to create it.
This is consistent with the docker documentation
on -b/--bridge: "Attach containers to a pre
existing network bridge".
It is also less surprising in an environment where
the operator expected the bridge to be properly
set up before docker starts and expects docker to
fail fast if the bridge was not up instead of
masking this error and coming up in some
potentially broken state.
With this patch, docker still creates docker0 if
needed and no bridge was explicitly specified.
Docker-DCO-1.1-Signed-off-by: Daniel Norberg <daniel.norberg@gmail.com > (github: danielnorberg)
2014-04-10 11:11:17 -04:00
7dd9c208fd
Merge pull request #5069 from tianon/hack-make-ubuntu-man
...
Add contrib/man to our generated deb
2014-04-10 08:04:04 -07:00
4a88e111d0
Merge pull request #5087 from vbatts/vbatts-save_permissions
...
docker save: fix filemode permissions
2014-04-10 08:00:37 -07:00
042a50a8fe
Merge pull request #5131 from crosbymichael/shm-mode
...
Change shm mode to 1777
2014-04-10 07:50:32 -07:00
5b242c95da
Merge pull request #5115 from alexlarsson/fix-libcontainer-network-rhel6
...
Fix libcontainer network support on rhel6
2014-04-10 07:45:12 -07:00
ec9190cdd2
Merge pull request #5133 from crosbymichael/revert-hairpin
...
Revert "Support hairpin NAT without going through docker server"
2014-04-10 07:06:35 -07:00
49e87d1932
Merge pull request #5050 from SvenDowideit/add-some-words-to-cli
...
add some more text to the cli docs
2014-04-10 07:05:19 -07:00
0bc479c48b
Merge pull request #5109 from jonathanpa/master
...
Update mac.rst to add homebrew instructions.
2014-04-10 06:42:54 -07:00
c5226d94fa
Avoid "invalid memory address or nil pointer dereference" panic
...
libcontainer.GetNamespace returns nil on FreeBSD because
libcontainer.namespaceList is empty. In this case, Namespaces#Get should
return nil instead of being panic.
Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com > (github: kzys)
2014-04-10 22:07:29 +09:00
e625cee28d
add some more text to the cli docs
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-04-10 12:52:46 +00:00
7931be5cba
delete containers during build after every step
...
This commit changes the way docker build cleans up containers.
Containers get cleaned up right away after they've been committed and
they've become an image.
When the build fails, only the last container of the failing step is
left behind.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-04-10 14:46:42 +03:00
057d347eaf
Update mac.rst to add homebrew instructions.
...
Explain how to install boot2docker and docker by using homebrew.
Docker-DCO-1.1-Signed-off-by: Jonathan Pares <jonathanpa@users.noreply.github.com > (github: jonathanpa)
2014-04-10 09:48:36 +02:00
14e1a2345d
Merge pull request #5134 from tianon/fix-mtab-symlink-error
...
Fix spurious mtab symlink error when /etc doesn't exist yet
2014-04-09 17:54:29 -07:00
8d25eef5ef
Merge pull request #5127 from crosbymichael/update-apparmor
...
Check for apparmor enabled on host to populate profile
2014-04-09 17:04:13 -07:00
1c90a4dd9a
Support FreeBSD on pkg/system/utimes_*.go
...
Implement system.LUtimesNano and system.UtimesNano. The latter might be
removed in future because it's basically same as os.Chtimes. That's why
the test is mainly focusing LUtimesNano.
Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com > (github: kzys)
2014-04-10 07:34:37 +09:00
66baf56601
Unlike GNU find, FreeBSD's find needs a path before an expression
...
Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com > (github: kzys)
2014-04-10 07:13:41 +09:00
18bea2495d
Use LLVM Clang explicitly on FreeBSD
...
Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com > (github: kzys)
2014-04-10 07:13:41 +09:00
b298960aed
Update bundlescripts to use "set -e" consistently
...
"set -e" is already inherited here from make.sh, but explicit is always better than implicit (hence the "set -e" in the first place!)
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-09 12:11:06 -06:00
7c37cae17d
Merge pull request #5102 from shykes/api-cleanup-tests
...
Make remote API unit tests easier to read and write
2014-04-09 10:27:03 -07:00
3d9cd1e5f1
Fix spurious mtab symlink error when /etc doesn't exist yet
...
symlink /proc/mounts /var/lib/docker/btrfs/subvolumes/1763d6602b8b871f0a79754f1cb0a31b3928bb95de5232b1b8c15c60fa1017f6-init/etc/mtab: no such file or directory
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-09 11:13:54 -06:00
407b11c26b
Merge pull request #5104 from crosbymichael/update-dns-vf-docs
...
Update dns and volumes-from docs
2014-04-09 06:55:52 -07:00
59c1b2880b
Fix libcontainer network support on rhel6
...
It seems that netlink in older kernels, including RHEL6, does not
support RTM_SETLINK with IFLA_MASTER. It just silently ignores it, reporting
no error, causing netlink.NetworkSetMaster() to not do anything yet
return no error.
We fix this by introducing and using AddToBridge() in a very similar manner
to CreateBridge(), which use the old ioctls directly.
This fixes https://github.com/dotcloud/docker/issues/4668
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-04-09 15:44:18 +02:00
63c303eecd
Revert "Support hairpin NAT without going through docker server"
...
This reverts commit b39d02b611michael@crosbymichael.com > (github: crosbymichael)
2014-04-09 11:55:08 +00:00
986cf931c3
Change shm mode to 1777
...
Fixes #5126
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-09 10:53:32 +00:00
87f0d63fb2
Check for apparmor enabled on host to populate profile
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-09 10:22:17 +00:00
a43a600a2c
Update dns and volumes-from docs
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-08 19:17:30 -07:00
566d49c9ca
Merge pull request #5022 from tianon/make-validate
...
Add "make validate" for both local and CI gofmt and DCO verification
2014-04-08 19:17:30 -06:00
1e6f21dc9e
Make remote API unit tests easier to read and write
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-08 18:14:47 -07:00
b602d6ca40
Merge pull request #5101 from unclejack/merge_release_v0.10.0
...
Merge release v0.10.0
2014-04-08 16:09:47 -07:00
e8aa24c71a
Change version to v0.10.0
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-04-09 02:02:19 +03:00
e128a606e3
Merge pull request #5079 from unclejack/bump_v0.10.0
...
Bump version to v0.10.0
2014-04-09 01:56:01 +03:00
dc9c28f51d
Bump version to v0.10.0
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-04-09 00:49:33 +03:00
5fbc47f253
Merge pull request #5090 from crosbymichael/remove-vf
...
Remove volumesfrom from the config
2014-04-08 14:46:07 -07:00
b4f2821e6d
Make volumes-from a slice instead of string split
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-08 21:45:06 +00:00
af9746412b
Move volumesfrom to hostconfig
...
This also migrates the volumes from integration tests into the new cli
integration test framework.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-08 21:45:06 +00:00
a10c17ad11
Merge pull request #5095 from crosbymichael/remove-ghost-test
...
Remove restart ghost test
2014-04-08 14:40:42 -07:00
9839688db3
Merge pull request #5089 from creack/replace_existing_docker_apparmor_profile
...
Backup current docker apparmor profile and replace it with the new one
2014-04-08 14:36:11 -07:00
b28ef0e984
Merge pull request #5096 from vieux/remove_double_warning
...
remove double deprecation warning
2014-04-08 14:23:11 -07:00
9260c06f7a
remove double deprecation warning
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-04-08 20:58:19 +00:00
77a04357a1
Remove restart ghost test
...
We do not allow ghosts anymore and this test does not add any value
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-08 20:56:30 +00:00
795d6b8b15
Merge pull request #5066 from crosbymichael/remove-dns-conf
...
Move DNS options to hostconfig
2014-04-08 13:44:26 -07:00
00e080fef6
Merge pull request #5088 from shykes/deprecate-commit-run
...
Early deprecation warning for 'docker commit --run'
2014-04-08 12:32:11 -07:00
c6046b40f0
Merge pull request #5091 from jamtur01/fedora_install
...
Add Fedora installation to install.sh
2014-04-08 13:15:00 -06:00
168f8aba74
Early deprecation warning for 'docker commit --run'
...
Warn users of the planned deprecation of 'docker commit --run', and hide
it from the docs and usage message. The option continues to work.
Note that an alternative to 'commit --run' is being implemented but is
not yet available. We are printing the warning anyway because on
the basis that it never hurts to give more advance warning.
The 'commit --run' flag is a leftover from the very early days of Docker,
and has several problems:
1) It is very user unfriendly. You have to pass a literal json dict
which is poorly documented and changes regularly (see PortSpecs vs
ExposedPorts). The merge behavior is not clear and also changes
regularly. it's not possible to unset a value.
2) It overlaps with the Dockerfile syntax. There are 2 ways to set
a default command, expose a port or change an env variable. Some
things can be done in a Dockerfile but not in --run. Some things
can be done in --run but not in a Dockerfile. It would be better
to push a single syntax, allow using it both in a file and via
the command line, and make improvements in a single place.
3) It exposes data structures which should not be publicly exposed.
There are several planned improvements to Docker which require moving
around the content and schema of the various Config, Image and Container
structures. The less of those we expose in public interfaces, the easier
it is to move things around without a reverse compatibility nightmare.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-08 12:10:47 -07:00
a2aa902ec1
Removed extra whitespace
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-04-08 12:07:27 -07:00
fa5223dab5
Added Fedora installation method
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-04-08 12:07:16 -07:00
2204a27df0
Merge pull request #5073 from tianon/update-release-bundles
...
Update RELEASE_BUNDLES to include integration tests
2014-04-08 13:05:00 -06:00
cc1328d376
Merge pull request #5076 from tianon/update-hack-make-test-integration-cli
...
Update test-integration-cli bundlescript for consistency with other bundlescripts and slightly more verbose logging of which commands were executed
2014-04-08 12:59:08 -06:00
29fd62f396
Merge pull request #5083 from shin-/4343-http_401_private_push_error
...
Added specific error message when hitting 401 over HTTP on push
2014-04-08 11:19:17 -07:00
4f828d67f0
Backup current docker apparmor profile and replace it with the new one
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-04-08 11:09:31 -07:00
a056a9ca22
Merge pull request #5085 from tianon/more-readable-crossplatforms-list
...
Update DOCKER_CROSSPLATFORMS to be more readable
2014-04-08 11:08:57 -07:00
1bcb9ce69e
Merge pull request #5068 from tianon/fix-abs-volume-check
...
Fix edge case in bind mount absolute path detection
2014-04-08 20:03:52 +03:00
0a6d42e208
docker save: fix filemode permissions
...
currently the files created are not readable. This makes the files and
directories permissions more sane.
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-04-08 12:39:25 -04:00
cf655ca98d
Update DOCKER_CROSSPLATFORMS to be more readable
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-08 09:42:47 -06:00
8b2bcd9a4b
Added specific error message when hitting 401 over HTTP on push
...
Docker-DCO-1.1-Signed-off-by: Joffrey F <joffrey@docker.com > (github: shin-)
2014-04-08 17:07:29 +02:00
a67f350442
Added reactive-docker to list of remote API clients
...
Docker-DCO-1.1-Signed-off-by: H. Rapp <webmaster@3kolor.com > (github: almoehi)
2014-04-08 11:47:15 +02:00
4c3eb7db67
Update test-integration-cli bundlescript for consistency with other bundlescripts and slightly more verbose logging of which commands were executed
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-07 23:10:40 -06:00
5737c2eb98
Update check-config.sh with more kernel configs and more reliable cgroup hierarchy/subsystem check
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-07 22:53:42 -06:00
8cfbc44661
Merge pull request #5049 from Supermathie/aa-fix
...
apparmor: docker-default: Include base abstraction
2014-04-07 21:34:01 -07:00
fdfd4530fc
Merge pull request #5074 from SvenDowideit/simplify-builder-headings
...
use the docs sidebar to be the TOC means that level 2 headings are the most important
2014-04-07 21:28:02 -07:00
e6a64af966
use the docs sidebar to be the TOC means that level 2 headings are the most important
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-04-08 14:25:57 +10:00
886eb85dec
Update RELEASE_BUNDLES to include integration tests
...
Previously, running just "hack/release.sh" only ran the unit tests. This updates that to run the unit tests, then the integration tests, then build the binaries, then run the cli integration tests (so we're literally testing the binary we're about to release, which is super freaking cool IMO <3).
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-07 22:22:03 -06:00
7908725e3f
Fix a few minor man formatting consistency issues
...
Some flags ended with a colon, some didn't. For man pages, the prevailing normal practice is not to end the flags lines with colons.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-07 21:38:30 -06:00
ab248675aa
Add contrib/man to our generated deb
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-07 21:32:17 -06:00
603088be92
Fix edge case in bind mount absolute path detection
...
`filepath.Abs` does more than just `filepath.IsAbs` - namely, `filepath.Clean`, which resolves things like `.../.` or `.../../...`, and causes even an absolute path like `/some/path/../absolute` to fail (or, in my case, `/path/to/docker/.`)
Just using `filepath.IsAbs` directly is a much cheaper check, too. :)
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-07 21:20:03 -06:00
be3a5a2e37
Merge pull request #5029 from ipbabble/manpages
...
Added man pages for several docker commands.
2014-04-08 05:51:20 +03:00
1d2126be6c
Merge pull request #5025 from dstine/readme-fix
...
fixed two readme typos
2014-04-07 19:31:16 -07:00
919dbbe44d
Move DNS options to hostconfig
...
The local resolver warning needed to be moved at daemon start because it
was only show for the first container started anyways before having a
default value set.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-07 19:12:22 -07:00
9c4d10b9a9
fixed three more typos
2014-04-07 22:09:15 -04:00
6bf7104271
Merge pull request #5064 from crosbymichael/remount-bind-mount
...
Ensure that ro mounts are remounted
2014-04-07 19:04:25 -07:00
02c5a87b40
Merge pull request #4997 from jpetazzo/apt-should-always-use-https
...
Use https://get.docker.io/ubuntu consistently
2014-04-08 11:24:07 +10:00
b6042f252d
Ensure that ro mounts are remounted
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-07 18:23:22 -07:00
da8231a26b
Added man pages for several docker commands.
...
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com > (github: ipbabble)
new file: contrib/man/man1/docker-attach.1
new file: contrib/man/man1/docker-build.1
new file: contrib/man/man1/docker-images.1
new file: contrib/man/man1/docker-info.1
new file: contrib/man/man1/docker-inspect.1
new file: contrib/man/man1/docker-rm.1
new file: contrib/man/man1/docker-rmi.1
new file: contrib/man/man1/docker-run.1
new file: contrib/man/man1/docker-tag.1
new file: contrib/man/man1/docker.1
2014-04-07 19:15:28 -06:00
6e0d8ce8c3
Merge pull request #4715 from sebsto/patch-1
...
Include instruction for AMI 2014.03
2014-04-08 11:02:54 +10:00
8c3eb900de
Merge pull request #5058 from crosbymichael/remove-opts
...
Remove -o cli flag and DriverConfig from HostConfig
2014-04-07 16:45:54 -07:00
028d44d126
Remove and unexport selinux functions
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-07 14:59:44 -07:00
82f37b874e
Ensure that selinux is disabled by default
...
This also includes some portability changes so that the package can be
imported with the top level runtime.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-07 14:44:53 -07:00
aaf018017c
Add more label checks for selinux enabled
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-07 14:44:53 -07:00
b1e98e06dc
Remove selinux build tag
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-07 14:44:52 -07:00
ffebcb660f
Move -o cli flag and DriverConfig from HostConfig
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-07 14:44:52 -07:00
ea2fba5ce0
Engine: optional Logging field to disable custom logging in engine.
...
* The default behavior is preserved
* This disables the use of the `TEST` environment variable in engine.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-07 21:41:25 +00:00
d8fc3eecf5
Merge pull request #5010 from shykes/cli-tests
...
Convert a legacy integration test to a clean v2 CLI integration test.
2014-04-08 00:34:58 +03:00
30f22ee9e3
Convert a legacy integration test to a clean v2 CLI integration test.
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-07 20:34:21 +00:00
902f88ea15
Merge pull request #5057 from crosbymichael/refactor-runtime-create
...
Refactor runtime create and history
2014-04-07 23:24:46 +03:00
1277885420
Clean runtime create and make it simple
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-07 12:20:23 -07:00
7fddec4a65
Merge pull request #4764 from SvenDowideit/use-docker-tgz
...
Use docker tgz file to download on OSX
2014-04-07 11:54:27 -07:00
dc7fefc16b
Use https://get.docker.io/ubuntu consistently
...
The install script (on https://get.docker.io/ ) installs an APT sources.list
entry referencing an HTTPS repository, and takes care of installing the
apt-transport-https package. However, the Debian/Ubuntu specific installation
script (on https://get.docker.io/ubuntu ) used an HTTPS repository but without
installing that package, causing the installation to fail on some platforms.
This will use HTTPS everywhere, and updates the documentation accordingly.
Docker-DCO-1.1-Signed-off-by: Jérôme Petazzoni <jerome@docker.com > (github: jpetazzo)
Docker-DCO-1.1-Signed-off-by: Jérôme Petazzoni <jerome@docker.com > (github: jpetazzo)
2014-04-07 11:32:12 -07:00
c987aa09d8
Move history to separate file
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-07 11:01:35 -07:00
2fde8dfb83
Merge pull request #5040 from crosbymichael/remove-context-from-config
...
Remove context from config
2014-04-07 10:48:15 -07:00
73a22fc6b3
Merge pull request #5039 from kzys/freebsd-timestamp
...
Don't assume the file system has sub-second precision timestamp
2014-04-07 10:28:22 -07:00
2f292a97de
Merge pull request #5038 from kzys/remove-archive-stat
...
Remove archive/stat_unsupported.go because it is not used
2014-04-07 19:50:31 +03:00
1a3eb4967b
Merge pull request #5051 from SvenDowideit/build-rm-help
...
intermediate image layers are used for more than the build
2014-04-07 18:59:41 +03:00
87ea27e80b
intermediate image layers are used for more than the build
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-04-07 18:37:52 +10:00
726206f2aa
apparmor: pull in variables from tunables/global
...
The variables that were defined at the top of the apparmor profile are best
pulled in via the <tunables/global> include.
Docker-DCO-1.1-Signed-off-by: Michael Brown <michael.brown@discourse.org > (github: Supermathie)
2014-04-07 03:04:27 -04:00
320b3e0d21
apparmor: abstractions/base expects pid variable
...
Add 'pid' variable pointing to 'self' to allow parsing of profile to succeed
Docker-DCO-1.1-Signed-off-by: Michael Brown <michael.brown@discourse.org > (github: Supermathie)
2014-04-07 02:47:43 -04:00
e35c23311f
apparmor: docker-default: Include base abstraction
...
Encountered problems on 14.04 relating to signals between container
processes being blocked by apparmor. The base abstraction contains
appropriate rules to allow this communication.
Docker-DCO-1.1-Signed-off-by: Michael Brown <michael.brown@discourse.org > (github: Supermathie)
2014-04-07 02:19:38 -04:00
a4b4448009
Merge pull request #4799 from tianon/no-more-inotifywait
...
Remove the inotifywait hack from our upstart host-integration example
2014-04-06 08:34:50 +10:00
794b5de749
Don't assume the file system has sub-second precision timestamp
...
For example, FreeBSD doesn't have that
(see http://lists.freebsd.org/pipermail/freebsd-fs/2012-February/013677.html ).
Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com > (github: kzys)
2014-04-05 10:30:37 +09:00
da8aa712d2
Remove archive/stat_unsupported.go because it is not used
...
LUtimesNano and all other functions were implemented on pkg/system after
d6114c0da0kato.kazuyoshi@gmail.com > (github: kzys)
2014-04-05 10:09:04 +09:00
36af2936af
Merge pull request #5031 from crosbymichael/revert-env
...
Revert env changes
2014-04-04 13:19:08 -07:00
0fb76839ad
Merge pull request #5027 from unclejack/cli_integration_add_docker_options
...
Cli integration: add docker options & fix the wait at the end
2014-04-04 22:07:31 +03:00
07887f65de
Revert "remove hack in version"
...
This reverts commit b2b9334f27michael@crosbymichael.com > (github: crosbymichael)
2014-04-04 11:38:03 -07:00
4c6cf9e27f
Use setjson hack again for version
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-04 11:37:08 -07:00
95e6fd819b
Revert "engine: fix engine.Env.Encode() to stop auto-guessing types."
...
This reverts commit 76057addb2michael@crosbymichael.com > (github: crosbymichael)
2014-04-04 11:29:56 -07:00
a97305e4c0
Merge pull request #5008 from unclejack/sync_cli_integration_ops
...
cli integration: sync container & image deletion
2014-04-04 11:16:08 -07:00
22152ccc47
cli integration: fix wait race
...
The wait at the end of cli integration script could end up failing if
the process had already exited. This was making it look like the tests
have failed.
This change fixes the problem.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-04-04 19:06:55 +03:00
62b08f557d
cli integration: allow driver selection via vars
...
This makes it possible to choose the graphdriver and the execdriver
which is going to be used for the cli integration tests.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-04-04 19:03:07 +03:00
bea71245c8
fixed two readme typos
2014-04-04 08:12:17 -04:00
919fe7a3a1
Remove the old Travis-specific files that are no longer necessary
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-04 00:46:47 -06:00
81370b5b0f
Add new validate-dco and validate-gofmt bundlescripts for DCO and gofmt validation
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-04 00:41:33 -06:00
031e288075
Merge pull request #4996 from rajatpandit/patch-2
...
Update nodejs_web_app.rst
2014-04-04 14:41:32 +10:00
b811ac523a
Merge pull request #4995 from rajatpandit/patch-1
...
Update nodejs_web_app.rst
2014-04-04 14:40:55 +10:00
65eeb0fce0
Merge pull request #4968 from tianon/enhanced-check-config
...
Add more color and cgroupfs hierarchy verification to check-config.sh
2014-04-04 04:49:05 +03:00
a255849129
Merge pull request #5002 from crosbymichael/rhatdan-selinux
...
Improve selinux label handling
2014-04-04 04:43:16 +03:00
e09274476f
cli integration: sync container & image deletion
...
This makes container and image removal in the tests run synchronously.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-04-04 03:22:32 +03:00
09aa28eca0
Merge pull request #5005 from shykes/deprecate-insert
...
Deprecate 'docker insert'
2014-04-03 17:16:25 -07:00
468cb80c59
Merge pull request #5006 from vieux/remove_dirty_hack
...
remove hack in version
2014-04-03 17:09:56 -07:00
b2b9334f27
remove hack in version
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-04-04 00:08:51 +00:00
dbd1e304f5
Merge pull request #5004 from shykes/api-unit-tests
...
Replace integration tests with unit tests for the remote API
2014-04-03 17:06:05 -07:00
9f68b934d3
Merge pull request #5001 from shykes/deprecate-images-viz-tree
...
Deprecate 'docker images --tree' and 'docker images --viz'
2014-04-03 17:05:59 -07:00
2cb560988b
api/server: convert TestGetInfo from an integration test to a unit test.
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-04 00:02:44 +00:00
76057addb2
engine: fix engine.Env.Encode() to stop auto-guessing types.
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-03 23:53:42 +00:00
c8f437aee0
api/server: replace an integration test with a unit test using engine mocking.
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-03 23:53:39 +00:00
615ac8feb2
Deprecate 'docker insert'
...
'docker insert' is an old command which predates 'docker build'. We no
longer recommend using it, it is not actively maintained, and can be
replaced with the combination of 'docker build' and 'ADD'.
This removes the command from usage and documentation, and prints a
warning when it is called.
The command still works but it will be removed in a future version.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-03 23:52:09 +00:00
a278656330
Merge pull request #4991 from ruphin/fix_name_typo
...
Fix typo in names-generator
2014-04-03 16:24:14 -07:00
6cf1378601
Fix typo in names-generator
...
Docker-DCO-1.1-Signed-off-by: Goffert van Gool <ruphin@ruphin.net > (github: ruphin)
2014-04-04 00:57:43 +02:00
55729ab4cb
Merge pull request #5000 from shykes/skip-login-tests
...
Skip login tests because of external dependency to a hosted service.
2014-04-04 01:11:09 +03:00
afc56e8d6d
Merge pull request #4993 from crosbymichael/remove-loopback-setup
...
Remove loopback setup for native driver
2014-04-03 15:09:09 -07:00
7c3b955b90
Deprecate 'docker images --tree' and 'docker images --viz'
...
* The commands are no longer listed or documented.
* The commands still work but print a deprecation warning.
* The commands should be removed in a future version.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-03 22:03:23 +00:00
887eeb2b02
Skip login tests because of external dependency to a hosted service.
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-04-03 21:55:33 +00:00
9e29d65aad
Merge pull request #4994 from crosbymichael/remove-start-test
...
Remove racy test causing tests to stall
2014-04-03 14:49:35 -07:00
32d6041cc3
Update nodejs_web_app.rst
2014-04-03 21:05:50 +01:00
3c36f82f18
Update nodejs_web_app.rst
2014-04-03 20:54:57 +01:00
95d07b52b3
Merge pull request #4992 from crosbymichael/fix-mknod-test
...
Fix configuration test for MKNOD
2014-04-03 12:21:30 -07:00
5864a3ff77
Merge pull request #4980 from creack/update_signal_management
...
Return correct exit code upon signal + SIGQUIT now quits without cleanup
2014-04-03 11:58:19 -07:00
e21607341c
Add myself to AUTHORS.
...
Docker-DCO-1.1-Signed-off-by: Kevin Wallace <kevin@pentabarf.net > (github: kevinwallace)
2014-04-03 18:44:13 +00:00
c94111b619
Allow non-privileged containers to create device nodes.
...
Such nodes could already be created by importing a tarball to a container; now
they can be created from within the container itself.
This gives non-privileged containers the mknod kernel capability, and modifies
their cgroup settings to allow creation of *any* node, not just whitelisted
ones. Use of such nodes is still controlled by the existing cgroup whitelist.
Docker-DCO-1.1-Signed-off-by: Kevin Wallace <kevin@pentabarf.net > (github: kevinwallace)
2014-04-03 18:44:13 +00:00
5844920185
Merge pull request #4989 from alexlarsson/fix-volumes-from
...
Fix --volumes-from mount failure
2014-04-03 11:27:18 -07:00
fee16d4216
Update contrib/check-config.sh cgroupfs check to allow for something like '... cgroup rw,cpu' (looking at you, boot2docker)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-03 11:52:19 -06:00
9712f8127a
Update contrib/check-config.sh to use zcat and grep if zgrep isn't available
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-03 11:46:24 -06:00
bd94f84ded
Fix --volumes-from mount failure
...
As explained in https://github.com/dotcloud/docker/issues/4979
--volumes-from fails with ENOFILE errors.
This is because the code tries to look at the "from" volume without
ensuring that it is mounted yet. We fix this by mounting the containers
before stating in it.
Also includes a regression test.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-04-03 19:33:20 +02:00
cd910cb685
Allow force sigint and allow sigquit after sigint
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-04-03 10:07:42 -07:00
cea43f8a2d
docker daemon: show info about the server
...
For combing through logs, have an intro line with information about the
running instance of the docker daemon.
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-04-03 10:54:54 -04:00
be882d989a
Merge pull request #4984 from michaelneale/master
...
explained what authConfig actually is
2014-04-03 09:20:24 -04:00
cb824f4093
Merge pull request #4985 from drothlis/patch-1
...
docs: Fix typo in hello world example
2014-04-03 20:07:44 +10:00
75633a0451
explained what authConfig actually is.
...
Docker-DCO-1.1-Signed-off-by: Michael Neale <michael.neale@gmail.com > (github: michaelneale)
2014-04-03 19:43:21 +11:00
8c4617e0ae
docs: Fix typo in hello world example
2014-04-03 09:40:28 +01:00
8b450a93b8
Remove driver wide mount label for dm
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-03 06:34:57 +00:00
e2779e11db
Remove runtime options from config
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-03 04:40:38 +00:00
24e8b1b834
Merge pull request #4924 from msabramo/move_installmirrors_anchor_in_docs
...
Move installmirrors anchor in doc
2014-04-03 12:48:01 +10:00
e8cb65b3cc
Merge pull request #4972 from unclejack/document_a_flag
...
docs: explain what docker run -a does
2014-04-03 10:23:39 +10:00
9687c087ab
Merge pull request #4953 from rhatdan/selinux
...
These two patches should fix problems we see with running docker in the wild.
2014-04-02 16:36:41 -07:00
9cc7eb4ab3
Merge pull request #3971 from creack/fix_add_ownership
...
Change ownership to root for ADD file/directory
2014-04-02 12:22:09 -07:00
8aa3dc681d
Merge pull request #4965 from tianon/update-makefile
...
Update Makefile with several improvements
2014-04-02 12:03:12 -06:00
3e68d36485
Merge pull request #4951 from alexlarsson/dm-fix-deadlock
...
Fix AB-BA deadlock in devicemapper backend
2014-04-02 20:58:09 +03:00
b5caa5053a
Merge pull request #4779 from vieux/symlink_mtab
...
symlink /etc/mtab and /proc/mounts
2014-04-02 20:57:04 +03:00
94233a204f
Fix lxc label handleing
...
This also improves the logic around formatting the labels for selinux
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-02 16:52:49 +00:00
6e7a93628b
Merge branch 'selinux' of https://github.com/rhatdan/docker into rhatdan-selinux
...
Conflicts:
pkg/selinux/selinux.go
runtime/execdriver/lxc/lxc_template.go
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-02 16:11:35 +00:00
ca4224762b
Fix SELinux issue with missing Contexts in lxc execdriver
...
There is a bug in the SELinux patch for the lxc execdriver, that
causes lxc containers to blow up whether or not SELinux is enabled.
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
2014-04-03 09:45:40 -04:00
d76ac4d429
In certain cases, setting the process label will not happen.
...
When the code attempts to set the ProcessLabel, it checks if SELinux Is
enabled. We have seen a case with some of our patches where the code
is fooled by the container to think that SELinux is not enabled. Calling
label.Init before setting up the rest of the container, tells the library that
SELinux is enabled and everything works fine.
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
2014-04-03 09:32:29 -04:00
32ad78b043
Remove hard coding of SELinux labels on systems without proper selinux policy.
...
If a system is configured for SELinux but does not know about docker or
containers, then we want the transitions of the policy to work. Hard coding
the labels causes docker to break on older Fedora and RHEL systems
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
2014-04-03 09:32:29 -04:00
63c7941172
docs: explain what docker run -a does
...
This adds a bit of documentation for the `-a` flag for docker run.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-04-02 16:23:01 +03:00
a9d6eef238
Remove racy test causing tests to stall
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-02 13:22:51 +00:00
18ef3cc24a
Remove loopback setup for native driver
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-02 13:12:52 +00:00
f80fd5da09
Fix configuration test for MKNOD
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-02 13:07:11 +00:00
440562511e
Merge pull request #4966 from SvenDowideit/add-kernel-version-info
...
add RHEL6 kernel version, and a 3.8 hint to the binaries doc
2014-04-02 08:56:17 -04:00
3b3f4bf052
Return correct exit code upon signal + SIGQUIT now quits without cleanup
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-04-02 05:56:11 -07:00
aec989bd08
Add more color and cgroupfs hierarchy verification to check-config.sh
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-02 02:44:12 -06:00
506055d973
Merge pull request #4853 from pjz/bash_completion
...
Include completion scripts in ubuntu/debian package
2014-04-02 01:40:24 -06:00
2ffef1b7eb
devmapper: Avoid AB-BA deadlock
...
We currently drop the global lock while holding a per-device lock when
waiting for device removal, and then we re-aquire it when the sleep is done.
This is causing a AB-BA deadlock if anyone at the same time tries to do any
operation on that device like this:
thread A: thread B
grabs global lock
grabs device lock
releases global lock
sleeps
grabs global lock
blocks on device lock
wakes up
blocks on global lock
To trigger this you can for instance do:
ID=`docker run -d fedora sleep 5`
cd /var/lib/docker/devicemapper/mnt/$ID
docker wait $ID
docker rm $ID &
docker rm $ID
The unmount will fail due to the mount being busy thus causing the
timeout and the second rm will then trigger the deadlock.
We fix this by adding a lock ordering such that the device locks
are always grabbed before the global lock. This is safe since the
device lookups now have a separate lock.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-04-02 09:05:00 +02:00
70826e8b3f
devmapper: Add lock to protext Devices map
...
Currently access to the Devices map is serialized by the main
DeviceSet lock, but we need to access it outside that lock, so we
add a separate lock for this and grab that everywhere we modify
or read the map.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-04-02 09:05:00 +02:00
e01b71cebe
devmapper: Add lookupDevice() helper
...
This centralizes the lookup of devices so it is only done in one place.
This will be needed later when we change the locking for it.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-04-02 09:05:00 +02:00
74edcaf1e8
devmapper: Pass info rather than hash to setInitialized
...
We already have this at the caller, no need to look up again.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-04-02 09:05:00 +02:00
5955846774
devmapper: Pass info rather than hash to deactivateDevice()
...
We already have the info in most cases, no need to look this up multiple times.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-04-02 09:05:00 +02:00
8e39b35c7c
devmapper: Pass info rather than hash to deleteDevice
...
All the callers already have the info, no need for an extra lookup.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-04-02 09:05:00 +02:00
e5394e35c7
devmapper: Pass info rather than hash to activateDeviceIfNeeded
...
There is no need to look this up again, we have it already in all callers.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-04-02 09:05:00 +02:00
2b64453adb
add RHEL6 kernel version, and a 3.8 hint to the binaries doc
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-04-02 16:52:07 +10:00
b51fe17833
Update Makefile with several improvements
...
Especially but not limited to:
- make BINDDIR= ... - for when you don't want a bind mount at all
- make DOCSPORT=9000 docs - for when you want a not-8000 docs port
- when we can't determine a branch name, we don't try to "docker build -t docker: ." anymore - we just "docker build -t docker ." (thus allowing Docker to assume ":latest")
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-01 22:43:38 -06:00
93bb208164
Merge pull request #4961 from creack/update_version_pkg
...
Update Version to not use string anymore
2014-04-01 18:37:25 -07:00
b4c8232b95
Merge pull request #4964 from creack/add_api_version
...
Add API version to `docker version`
2014-04-01 18:36:18 -07:00
d7ec39a4cf
<3
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-04-02 01:19:26 +00:00
b246fc33ae
Add API version to docker version
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-04-01 17:30:19 -07:00
8ff02d58d9
Merge pull request #4963 from tianon/check-config
...
Add basic initial "check-config" script to contrib
2014-04-01 16:51:32 -07:00
431046e0f5
Merge pull request #4902 from shykes/wozniak_is_not_boring
...
Steve Wozniak is not boring.
2014-04-01 16:49:56 -07:00
ceed9382d0
Merge pull request #4931 from crosbymichael/gen-mac-addr-for-bridge
...
Set bridge mac addr on supported kernels
2014-04-02 02:47:56 +03:00
9c0c4aeda4
Add basic initial "check-config" script to contrib
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-01 17:42:54 -06:00
8cc8b1dd99
Merge pull request #4938 from jlhawn/master
...
No longer expose gravatar_email in docker.io api
2014-04-02 09:13:33 +10:00
30ff3fa954
Merge pull request #4867 from crosbymichael/clean-shutdown
...
Cleanly shutdown docker
2014-04-02 01:48:03 +03:00
3ee37f547f
Update Version to not use string anymore
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-04-01 15:46:52 -07:00
9cf89f8542
Merge pull request #4942 from vieux/cleanup_dev_libcontainer
...
remove setupDev from libcontainer
2014-04-01 14:28:17 -07:00
026aebdebb
Change ownership to root for ADD file/directory
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-04-01 14:17:31 -07:00
79c0ca81fc
Merge pull request #4958 from crosbymichael/update-port-tests
...
Update test to reallocate port
2014-04-01 14:15:36 -07:00
dcf2b72f5b
add test
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-04-01 21:07:40 +00:00
7462cc6479
Merge pull request #4949 from tjmehta/4908-fix_dynamic_port_allocation_limit
...
Fix dynamic port allocation limit
2014-04-01 13:49:21 -07:00
b4b87413d8
Merge pull request #4833 from crosbymichael/pluginflag
...
Add opts flag for fine grained control over drivers
2014-04-01 13:34:08 -07:00
3178723341
Merge pull request #4956 from tianon/sig
...
Simplify the kill "SIG" prefix stripping code
2014-04-01 13:10:16 -07:00
e175a55eb9
Merge pull request #4948 from creack/push_single_tag
...
Allow push of a single tag
2014-04-01 12:54:15 -07:00
4bf70317ed
Simplify the kill "SIG" prefix stripping code
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-01 13:33:46 -06:00
7ab66fa694
Merge pull request #4947 from tianon/sig
...
Allow "SIG" prefix on signal names in `docker kill` ("SIGKILL", etc)
2014-04-01 11:59:44 -07:00
b01c3a8b6c
Merge pull request #4945 from samalba/fix-checksum-layer
...
Fix checksum layer
2014-04-01 11:31:59 -07:00
b8d660d946
Update docs. Make PULL up to date, remove deprecated falg and update PUSH
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-04-01 11:17:54 -07:00
1aa976aca9
Merge pull request #4920 from discordianfish/we-need-more-women
...
Improve gender equality
2014-04-01 11:15:34 -07:00
249a5ddfeb
Merge pull request #4916 from creack/no_error_start_twice
...
Don't error when trying to start a running container
2014-04-01 10:45:31 -07:00
2224e0d65a
In certain cases, setting the process label will not happen.
...
When the code attempts to set the ProcessLabel, it checks if SELinux Is
enabled. We have seen a case with some of our patches where the code
is fooled by the container to think that SELinux is not enabled. Calling
label.Init before setting up the rest of the container, tells the library that
SELinux is enabled and everything works fine.
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
2014-04-01 13:30:10 -04:00
f9b8161c60
Remove hard coding of SELinux labels on systems without proper selinux policy.
...
If a system is configured for SELinux but does not know about docker or
containers, then we want the transitions of the policy to work. Hard coding
the labels causes docker to break on older Fedora and RHEL systems
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
2014-04-01 13:29:54 -04:00
7a50f03fa6
Update test to be consistent
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-04-01 10:27:10 -07:00
cff5f0357e
Minor cleanup
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-04-01 10:27:05 -07:00
a03f83e337
Do not error when trying to start a started container
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-04-01 10:26:53 -07:00
4cb602afa0
Allow "SIG" prefix on signal names in docker kill ("SIGKILL", etc)
...
This way, we can use both `docker kill -s INT some_container` and `docker kill -s SIGINT some_container` and both will do nice things for us. :)
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-04-01 11:01:07 -06:00
527bb5e960
Merge pull request #4904 from creack/make_dev
...
Add "BINDDIR" variable to facilitate having a shell with the full source tree bind-mounted
2014-04-01 10:19:56 -06:00
bd24eb07b6
Add $BINDIR to allow mounting the whole sources if needed (for development)
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-04-01 09:01:27 -07:00
ac9b06ae95
Update sig message
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-01 08:18:52 +00:00
6b7cfc9e95
Update test to reallocate port
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-01 07:27:34 +00:00
93779cc7fe
Send sigterm and wait forever
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-01 07:12:50 +00:00
e36d89b0f9
Ensure state is saved to disk after we kill the ghost
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-01 07:12:50 +00:00
283daced0c
Don't send prctl to be consistent with other drivers
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-01 07:12:50 +00:00
5bb82f6313
Ensure a reliable way to kill ghost containers on reboot
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-01 07:11:41 +00:00
5b9069bd99
Add kill for other drivers on restart
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-01 07:11:41 +00:00
f067e26367
Ensure that all containers are stopped cleanly at shutdown
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-01 07:11:41 +00:00
40c6d00c97
Update imports to be consistent
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-04-01 07:07:42 +00:00
739d124480
make findNextPort circular, add all-ports-allocated error
...
Docker-DCO-1.1-Signed-off-by: Tejesh Mehta <tejesh.mehta@gmail.com > (github: tjmehta)
2014-03-31 22:21:52 -07:00
e648a186d6
Allow push of a single tag
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-03-31 18:50:10 -07:00
de9fba7172
Payload checksum now match the checksum simple
...
Backported for backward compatibility.
Docker-DCO-1.1-Signed-off-by: Sam Alba <sam.alba@gmail.com > (github: samalba)
2014-03-31 18:31:15 -07:00
3f0886c8c3
Inverted layer checksum and tarsum.
...
The checksum of the payload has to be computed on the Gzip'ed content.
Docker-DCO-1.1-Signed-off-by: Sam Alba <sam.alba@gmail.com > (github: samalba)
2014-03-31 17:56:25 -07:00
d52d24dd80
remove setupDev from libcontainer
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-04-01 00:28:44 +00:00
7a7f59210d
Ensure secound part of the key is provided
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-31 23:12:08 +00:00
4cdcea2047
Set bridge mac addr on supported kernels
...
Fixes #3200
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-31 22:56:23 +00:00
289377b409
No longer expose gravatar_email in docker.io api
...
Docker.io API has replaced the gravatar_email field with a
gravatar_url field instead.
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
2014-03-31 15:34:43 -07:00
f6f059d99a
Merge pull request #4929 from crosbymichael/volume-abs-path
...
Force abs paths for host volumes
2014-03-31 15:19:30 -07:00
07b60d626a
symlink /etc/mtab and /proc/mounts
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-31 21:15:03 +00:00
e76113be6c
Merge pull request #4925 from creack/fix_logs
...
Fix expending buffer in StdCopy
2014-03-31 23:15:07 +03:00
cd0a907325
Merge pull request #4930 from vieux/fix_regression_import
...
Fix regression import
2014-03-31 23:12:39 +03:00
5fb28eab3e
Add regression test
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-03-31 13:12:22 -07:00
6ed2aa1db4
Merge pull request #4881 from barnybug/fish-completions
...
Update fish completions for docker 0.9.1
2014-03-31 13:57:00 -06:00
5b98b70f29
Merge pull request #4927 from crosbymichael/start-hang
...
Make sure to set error reguardless of attach or stdin
2014-03-31 12:56:38 -07:00
b430f4f45b
add test
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-31 19:31:21 +00:00
9709c31d1b
fix import display
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-31 19:21:57 +00:00
bce2464e5e
Merge pull request #4928 from unclejack/testscli-pull_busybox
...
integration-cli: pull busybox before running
2014-03-31 12:16:44 -07:00
904bf049c1
Force abs paths for host volumes
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-31 19:10:19 +00:00
f7ae3a1381
integration-cli: pull busybox before running
...
Make sure the busybox image is ready to be used when running the cli
integration tests.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-03-31 22:07:23 +03:00
b45c1061bf
Merge pull request #4174 from vbatts/vbatts-env_file
...
support for `docker run` environment variables file
2014-03-31 12:01:14 -07:00
f163720228
Move installmirrors anchor in doc
...
so it's before "Mirrors" instead of "Docker and local DNS server
warnings"
Docker-DCO-1.1-Signed-off-by: Marc Abramowitz <msabramo@gmail.com > (github: msabramo)
2014-03-31 11:48:57 -07:00
500c8ba4b6
env-file: variable behavior
...
trim the front of variables. Error if there are other spaces present.
Leave the value alone.
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-03-31 14:45:13 -04:00
ff4ac7441b
--env-file: simple line-delimited
...
match dock functionality, and not try to achieve shell-sourcing compatibility
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-03-31 14:45:13 -04:00
d9c257732e
env-file: remove the unneeded deprecation markup
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-03-31 14:45:13 -04:00
33dde1f728
env-file: update functionality and docs
...
Multiple flags allowed. Order prescribed. Examples provided. Multiline
accounted for.
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-03-31 14:45:13 -04:00
acf5289ddd
make the --env-file accept multiple flags
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-03-31 14:45:13 -04:00
bcba5246f9
Fixing doc references to --env-file
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-03-31 14:44:32 -04:00
4e0014f582
go fmt
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-03-31 14:44:32 -04:00
586e6c5eb9
--env-file instead of --envfile
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-03-31 14:44:32 -04:00
bfaa917a96
pkg/opts: Close the file handle
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-03-31 14:44:32 -04:00
cd51ac92bd
support for docker run environment variables file
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-03-31 14:44:32 -04:00
51d9a04f17
Make sure to set error reguardless of attach or stdin
...
Fixes #3364
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-31 18:33:14 +00:00
1805ef1ccc
Merge pull request #4901 from vieux/split_api_2_pkg
...
Split API into 2 go packages
2014-03-31 21:32:05 +03:00
7697aad7b0
apply Reduce error level form harmless errors
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-31 18:11:53 +00:00
185b040e49
fix tests
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-31 18:11:53 +00:00
ae9ed84fda
split client in 2 files
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-31 18:11:53 +00:00
a7365a6237
split API into 2 go packages
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-31 18:10:02 +00:00
25f7b3fbb7
Merge pull request #4926 from tianon/add-cli-tests-to-default-bundles
...
Add "test-integration-cli" to our DEFAULT_BUNDLES list (make all)
2014-03-31 21:09:44 +03:00
b936f4f5e1
Merge pull request #4752 from crosbymichael/fix-volumes-from-files
...
Allow volumes from to be individual files
2014-03-31 21:07:05 +03:00
2543912e7b
Add "test-integration-cli" to our DEFAULT_BUNDLES list (make all)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-03-31 11:55:55 -06:00
e4aaacc235
Fix expending buffer in StdCopy
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-03-31 10:54:06 -07:00
7808886744
Add more women
...
Added Adele Goldstine, Erna Schneider Hoover, Grace Hopper, Jean Bartik,
Jean E. Sammet, Karen Spärck Jones, Radia Perlman and Sophie Wilson.
Thanks to @jamtur01 for Sophie Kowalevski, Hypatia, Jane Goodall, Maria
Mayer, Rosalind Franklin, Gertrude Elion, Elizabeth Blackwell,
Marie-Jeanne de Lalande, Maria Kirch, Maria Ardinghelli, Jane Colden,
June Almeida, Mary Leakey, Lise Meitner, Johanna Mestorf.
Thanks to @xamebax for Françoise Barré-Sinoussi, Rachel Carson, Barbara
McClintock, Ada Yonath.
Docker-DCO-1.1-Signed-off-by: Johannes 'fish' Ziemke <github@freigeist.org > (github: discordianfish)
2014-03-31 19:44:57 +02:00
28015f8e57
Add integration test for volumes-from as file
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-31 17:42:34 +00:00
a57900e35f
Allow volumes from to be individual files
...
Fixes #4741
Right now volumes from expected a dir and not a file so when the drivers
tried to do the bind mount, the destination was a dir, not a file so it
fails to run.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-31 17:27:38 +00:00
7727c817fb
Merge pull request #4505 from unclejack/cli_integration_tests
...
cli integration tests
2014-03-31 10:26:38 -07:00
883649ffe7
Merge pull request #4922 from creack/reduce_error_lvl
...
Reduce error level form harmless errors
2014-03-31 20:05:25 +03:00
a2487aa683
Reduce error level form harmless errors
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-03-31 09:07:56 -07:00
6899b05236
Merge branch 'master' of github.com:dotcloud/docker
2014-03-31 10:09:27 -04:00
04d1e68639
OSX mktemp is different - hopfully this will now work on HP/UX >:}
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-03-31 11:05:21 +10:00
c8ae307bab
Merge pull request #4900 from WarheadsSE/fix-bip-docs
...
Fix daemon's documentation for -bip flag
2014-03-30 10:38:36 +10:00
eaf2dd0839
Merge pull request #4887 from jameshfisher/nat
...
Add missing port NAT configuration
2014-03-30 10:28:59 +10:00
3fb1fc0b7b
Small tweaks to the hack scripts to make them simpler
...
Please do with this as you please (including rebasing and/or squashing it), especially under clause (c) of the DCO.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-03-29 23:09:45 +02:00
6db32fdefd
initial version of cli integration tests
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-03-29 23:09:40 +02:00
04f5c75239
Steve Wozniak is not boring.
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-03-29 00:48:47 +00:00
c705e4a80b
Merge pull request #4884 from rhatdan/remount-var-lib-docker
...
Remount /var/lib/docker as --private to fix scaling issue
2014-03-28 17:15:32 -07:00
36dfa0c4ec
Fix daemon's documentation for -bip flag
2014-03-28 18:02:17 -04:00
058cc8818a
Merge pull request #4862 from jsimonelis/dockerfile_reference_typofix
...
documentation typo fix -- Dockerfile reference
2014-03-28 16:18:45 -04:00
7d750180e4
Update AUTHORS
2014-03-28 15:15:54 -05:00
e13b4fd869
Merge pull request #4836 from atlassian/master
...
Use environmental proxy when doing a ping to the remote repo
2014-03-28 10:24:16 -07:00
755cd48258
Merge pull request #4895 from alexlarsson/dm-clean-shutdown
...
devmapper: Ensure we shut down thin pool cleanly.
2014-03-28 09:49:04 -07:00
66c5e19f9b
devmapper: Ensure we shut down thin pool cleanly.
...
The change in commit a9fa1a13c3alexl@redhat.com > (github: alexlarsson)
2014-03-28 15:58:14 +01:00
792bb41e52
Remount /var/lib/docker as --private to fix scaling issue
...
If an admin mounts all file systems as -rshared (Default on RHEL and Fedora)
we see a scaling problem as the number of container increase.
Basically every new container needs to have it new mounts in /var/lib/docker
shared to all other containers, this ends up with us only able to scale to
around 100 containers, before the system slows down.
By simply bind mounting /var/lib/docker on its and then setting it private,
the scaling issue goes away.
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
2014-03-28 09:19:21 -04:00
5b9c8607d9
Merge pull request #4759 from crosbymichael/comments-in-buildfile
...
Strip comments before parsing line continuations
2014-03-28 11:16:32 +02:00
10b7ae39b9
Merge pull request #4880 from tianon/ignore-down-interfaces
...
Adjust TestOnlyLoopbackExistsWhenUsingDisableNetworkOption to ignore "DOWN" interfaces
2014-03-28 10:54:11 +02:00
0fb8146afa
Merge pull request #4889 from crosbymichael/fix-commit-validation
...
Fix commit and import when no repository is specified
2014-03-28 10:25:21 +02:00
d2327006d6
Merge pull request #4442 from ibuildthecloud/hairpin-nat
...
Support hairpin NAT without going through docker server
2014-03-27 18:09:42 -07:00
69ba31e17e
Merge pull request #4450 from alexlarsson/cgroups-systemd
...
Add systemd implementation of cgroups
2014-03-28 03:05:02 +02:00
64dd77fa0e
Add missing port NAT configuration
...
Missing port translation causes last line to fail
Docker-DCO-1.1-Signed-off-by: James Fisher <jameshfisher@gmail.com > (github: jameshfisher)
2014-03-27 23:02:44 +00:00
45b43d85ec
Merge pull request #4873 from crosbymichael/add-internal-symlinks
...
Follow symlinks inside container root for build's ADD
2014-03-27 15:46:48 -07:00
d848e2d113
Merge pull request #4871 from crosbymichael/bip-exists
...
Return error when existing bridge does not match ip
2014-03-27 14:51:21 -07:00
6c7835050e
cgroups: Add systemd implementation of cgroups
...
This implements cgroup.Apply() using the systemd apis.
We create a transient unit called "docker-$id.scope" that contains
the container processes. We also have a way to set unit specific
properties, currently only defining the Slice to put the
scope in.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-03-27 22:44:31 +01:00
1296d5ce9a
Add systemd.SdBooted()
...
This is a conversion of sd_booted() from libsystemd to go and checks
if the system was booted with systemd.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-03-27 22:44:31 +01:00
cb43fd0071
pkg/systemd: Drop our copy-pasted version of go-systemd/activation
...
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-03-27 22:44:31 +01:00
d4725801b3
Vendor github.com/godbus/dbus and github.com/coreos/go-systemd
...
We need this to do systemd API calls.
We also add the static_build tag to make godbus not use
os/user which is problematic for static builds.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-03-27 22:44:26 +01:00
9294d7f2af
cgroups: Join groups by writing to cgroups.procs, not tasks
...
cgroups.procs moves all the threads of the process, and "tasks" just
the one thread. I believe there is a risk that we move the main thread,
but then we accidentally fork off one of the other threads if the go
scheduler randomly switched to another thread. So, it seems safer (and
more correct) to use cgroups.procs.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-03-27 21:47:47 +01:00
7f7d8419a7
cgroups: Splity out Apply/Cleanup to separate file/interface
...
This leaves only the generic cgroup helper functions in cgroups.go and
will allow easy implementations of other cgroup managers.
This also wires up the call to Cleanup the cgroup which was missing
before.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-03-27 21:47:47 +01:00
7a3070a600
Add --opt arguments for drivers
...
In order to handle special configuration for different drivers we
make the Config field a map to string array. This lets
us use it for lxc, by using the "lxc" key for those, and we can
later extend it easily for other backend-specific options.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-03-27 21:47:47 +01:00
4af79a36e2
Add mention of mounting cgroupfs properly to PACKAGERS.md
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-03-27 16:44:30 -04:00
9d2a778051
Update fish completions for docker master.
...
Docker-DCO-1.1-Signed-off-by: Barnaby Gray <barnaby@pickle.me.uk > (github: barnybug)
2014-03-27 19:45:47 +00:00
d6c2188cae
Docker-DCO-1.1-Signed-off-by: Ryan Thomas <rthomas@atlassian.com> (github: rthomas)
2014-03-28 06:31:04 +11:00
be5c65c2a2
Merge pull request #4613 from tianon/add-cgroupfs-mention-to-packagers
...
Add mention of mounting cgroupfs properly to PACKAGERS.md
2014-03-27 13:26:31 -06:00
94538fe022
Merge pull request #4865 from creack/fix_fish_completion
...
Fix fish completion when having alias on awk or grep
2014-03-27 13:07:11 -06:00
ba9f9b3c92
Merge pull request #4818 from viirya/fix_working_dir_not_dir
...
fix the problem when setting existing file as working dir
2014-03-27 11:41:18 -07:00
db20cb0e1a
Merge pull request #4879 from gorsuch/exec-upstart
...
Use "exec" in the upstart script to let upstart manage the docker process instead of a shell
2014-03-27 12:15:30 -06:00
303a954151
Merge pull request #4838 from crosbymichael/btrfs-ftw
...
Promote btrfs
2014-03-27 19:55:25 +02:00
73ee4879af
upstart: use exec here so upstart can monitor the process and not just a shell
...
Docker-DCO-1.1-Signed-off-by: Michael Gorsuch <michael.gorsuch@gmail.com > (github: gorsuch)
2014-03-27 12:44:33 -05:00
ad3e71d5c7
Adjust TestOnlyLoopbackExistsWhenUsingDisableNetworkOption to ignore "DOWN" interfaces
...
This fixes the following, which I've been seeing on all my machines for as long as I can remember:
--- FAIL: TestOnlyLoopbackExistsWhenUsingDisableNetworkOption (0.36 seconds)
container_test.go:1597: Wrong interface count in test container: expected [*: lo], got [1: lo 2: sit0]
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-03-27 11:06:32 -06:00
79e8ef28e4
Merge pull request #4211 from rhatdan/master
...
Add SELinux support
2014-03-27 10:26:05 -06:00
6c9a47f01c
Update native driver to use labels from opts
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-27 09:04:54 +00:00
bfa2141765
Update lxc to use opts for selinux labels
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-27 08:57:01 +00:00
2d270c4f06
Fix compile and unit test errors after merge
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-27 08:25:01 +00:00
eab56ac007
Merge branch 'master' into pluginflag
...
Conflicts:
pkg/cgroups/cgroups.go
pkg/libcontainer/nsinit/exec.go
pkg/libcontainer/nsinit/init.go
pkg/libcontainer/nsinit/mount.go
runconfig/hostconfig.go
runconfig/parse.go
runtime/execdriver/driver.go
runtime/execdriver/lxc/lxc_template.go
runtime/execdriver/lxc/lxc_template_unit_test.go
runtime/execdriver/native/default_template.go
runtime/execdriver/native/driver.go
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-27 08:00:18 +00:00
097aef2ca9
Fix commit and import when no repository is specified
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-27 04:24:31 +00:00
67af7b3fb0
Strip comments before parsing line continuations
...
Fixes #3898
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-27 02:41:08 +00:00
0fb01fd8fe
Follow symlinks inside container root for build's ADD
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-27 02:07:35 +00:00
4c43566925
This patch adds SELinux labeling support.
...
docker will run the process(es) within the container with an SELinux label and will label
all of the content within the container with mount label. Any temporary file systems
created within the container need to be mounted with the same mount label.
The user can override the process label by specifying
-Z With a string of space separated options.
-Z "user=unconfined_u role=unconfined_r type=unconfined_t level=s0"
Would cause the process label to run with unconfined_u:unconfined_r:unconfined_t:s0"
By default the processes will run execute within the container as svirt_lxc_net_t.
All of the content in the container as svirt_sandbox_file_t.
The process mcs level is based of the PID of the docker process that is creating the container.
If you run the container in --priv mode, the labeling will be disabled.
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
2014-03-26 15:30:40 -04:00
ab00619c56
Merge pull request #4855 from unclejack/update_release_v0.9.1
...
Update master for release 0.9.1
2014-03-26 11:43:13 -07:00
e7f3234c1e
Fix fish completion when having alias on awk or grep
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-03-26 09:05:21 -07:00
4746c76156
Include contributed completions in ubuntu PPA
...
Docker-DCO-1.1-Signed-off-by: Paul Jimenez <pj@place.org > (github: pjz)
2014-03-26 11:23:26 -04:00
72dc19fd7d
authors update
2014-03-26 10:30:57 -04:00
61f7d967ed
typo fix
2014-03-26 10:24:16 -04:00
baba9cde95
Return error when existing bridge does not match ip
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-26 11:51:27 +00:00
b2721e05ce
Change version to 0.9.1-dev
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-03-26 00:18:45 +02:00
d36176652e
Bump to version v0.9.1
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Conflicts:
VERSION
2014-03-26 00:18:19 +02:00
5506e4b62d
Merge pull request #4840 from vbatts/vbatts-load_from_input
...
docker load: add --input flag
2014-03-25 14:37:27 -07:00
abef5cb0fc
Merge pull request #4628 from kippandrew/port-allocator
...
Fix port collision with dynamically allocated ports
2014-03-25 14:30:10 -07:00
6643cc20fe
Merge pull request #4794 from alexlarsson/dm-better-shutdown
...
devicemapper: Better/faster shutdown
2014-03-25 14:03:00 -07:00
e99297e4eb
Merge pull request #4842 from pda/installer-devicemapper-comment
...
Update AUFS comment in install.sh
2014-03-25 14:29:46 -06:00
576278102e
install.sh (get.docker.io) aufs comment updated.
...
devicemapper has landed, but the TODO hasn't been actioned presumably
because aufs is still preferred over devicemapper when available[1].
Comment updated accordingly.
Citation [1]: https://github.com/crosbymichael/docker/blob/267ca39921c35826ccbdb84fbbc0690bfef385d7/runtime/graphdriver/driver.go#L40-L46
Docker-DCO-1.1-Signed-off-by: Paul Annesley <paul@annesley.cc > (github: pda)
2014-03-25 11:33:16 -07:00
2517370088
docker load: added example of a multiple tag image
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-03-25 08:30:59 -04:00
d9c1116303
Merge pull request #4845 from noducks/link_fix
...
Force flag to prevent file already exists error.
2014-03-25 21:03:04 +10:00
8e434c314e
Force flag to prevent file already exists error.
...
Docker-DCO-1.1-Signed-off-by: No Ducks <onemannoducks@gmail.com > (github: noducks)
2014-03-25 10:26:45 +00:00
30d25a3d27
Merge pull request #4814 from noducks/master
...
Reminder for OSX users not to use SUDO
2014-03-25 20:15:39 +10:00
293157b8b3
check if working dir is a directory and raise corresponding errors when making dir.
...
Docker-DCO-1.1-Signed-off-by: Liang-Chi Hsieh <viirya@gmail.com > (github: viirya)
2014-03-25 17:47:08 +08:00
69087f2d23
Reminder for OSX users not to use SUDO
...
Useful for those who haven't made it to the examples page yet. https://github.com/chadoh/docker/commit/dad4a998dc716e506c874ce0e792989b9df28748
Docker-DCO-1.1-Signed-off-by: No Ducks <onemannoducks@gmail.com > (github: noducks)
2014-03-25 09:42:59 +00:00
a5ccb5b28d
Docker-DCO-1.1-Signed-off-by: Ryan Thomas <rthomas@atlassian.com> (github: rthomas)
2014-03-25 14:45:11 +11:00
c6c7c03cdd
docker load: doc clarification
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-03-24 23:36:07 -04:00
267ca39921
Merge pull request #4839 from bflad/chef-docker-docs
...
Add Chef usage documentation
2014-03-25 12:38:45 +10:00
c84ff187c6
Fix typo in Using Chef documentation description
...
Docker-DCO-1.1-Signed-off-by: Brian Flad <bflad417@gmail.com > (github: bflad)
2014-03-24 22:29:54 -04:00
84e1fdf35d
docker load: add --input flag
...
for those that do not care to read from redirected stdin
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-03-24 21:43:26 -04:00
bb034c6b42
Add Chef usage documentation
...
Docker-DCO-1.1-Signed-off-by: Brian Flad <bflad417@gmail.com > (github: bflad)
2014-03-24 21:39:15 -04:00
0b2b5a594b
Merge pull request #4786 from SvenDowideit/run--lxc-conf-is-lxc-driver-only-atm
...
add a note that --lxc-conf is lxc-driver only.
2014-03-25 11:21:06 +10:00
4585d2da3e
Merge pull request #4751 from enokd/master
...
Fixes #3369 Repeated slash-'/' characters; harmonize across all name-related commands
2014-03-24 17:43:02 -07:00
e1035535ec
Merge pull request #4837 from crosbymichael/remove-ci
...
Remove docker-ci code from the repo
2014-03-24 18:01:26 -06:00
a258d048a2
Merge pull request #4778 from vbatts/vbatts-save_to_output
...
`docker save --output` flags
2014-03-24 16:52:08 -07:00
c3ff1f41bb
Merge pull request #4835 from crosbymichael/reverst-stop-kill
...
Revert back to the default stop functionality of SIGKILL after timeout
2014-03-24 16:33:38 -07:00
dece260f3a
Merge pull request #4832 from LK4D4/fix_events_hanging_#4804
...
Workaround for hanging events. Fixes #4804
2014-03-24 16:26:50 -07:00
c7540b3e94
Workaround for hanging events. Fixes #4804
...
Docker-DCO-1.1-Signed-off-by: LK4D4 <lk4d4math@gmail.com > (github: LK4D4)
2014-03-24 22:31:32 +04:00
68dd722e3c
Promote btrfs
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-24 14:15:04 +00:00
f41135bc11
As far as I know this code is not used or maintained
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-24 12:39:56 +00:00
d503714285
Revert "Disable automatic killing of containers when docker stop fails"
...
This reverts commit 8b5cf51d60michael@crosbymichael.com > (github: crosbymichael)
2014-03-24 12:03:56 +00:00
f1bd79ec97
Revert "fix failing test to use kill instead of stop"
...
This reverts commit 4434dcee89michael@crosbymichael.com > (github: crosbymichael)
2014-03-24 12:03:41 +00:00
10fdbc0467
Add unit test for lxc conf merge and native opts
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-24 07:16:40 +00:00
9a7be1b015
Add cpuset.cpus to cgroups and native driver options
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-24 05:33:11 +00:00
5294bf7e67
Merge pull request #4775 from LK4D4/remove_duplicate_dns_#4714
...
Remove duplication of Dns in config merging.
2014-03-21 17:08:06 -07:00
97e5295f43
Merge pull request #4800 from vieux/rename_network_driver
...
rename lxc to bridge
2014-03-21 16:52:40 -07:00
de450b23be
Merge pull request #4761 from ichik1/fix-display-of-since-time-exit
...
Fix since time exit display when s.FinishedAt is zero
2014-03-21 16:48:30 -07:00
708ecd7da2
Add mention of mounting cgroupfs properly to PACKAGERS.md
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-03-21 14:17:09 -06:00
2c58a1e288
Change placement of readonly filesystem
...
We need to change it to read only at the very end so that bound,
copy dev nodes and other ops do not fail.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-21 14:17:17 +00:00
83618c2b81
Add more native driver options
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-21 14:07:16 +00:00
146a212f71
Change syntax to use dots
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-21 12:38:50 +00:00
c9d7f858fd
Change flag to -o and --opt
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-21 11:53:15 +00:00
7c726669cb
Factor out the native driver config options
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-21 08:10:07 +00:00
4002eac8b8
Fix since time exit display when s.FinishedAt is zero
...
When s.FinishedAt is zero, the since time exit in docker ps doesn't display correct time.
For example
```
Exited (0) 292.471209 years ago
```
This patch fixes the since time exit to display nothing if s.FinishedAt is zero.
Docker-DCO-1.1-Signed-off-by: Ken ICHIKAWA <ichikawa.ken@jp.fujitsu.com > (github: ichik1)
2014-03-21 15:28:02 +09:00
69db806542
Merge pull request #4518 from tianon/sync-DCO-with-developercertificate.org
...
Resync the DCO text with upstream at http://developercertificate.org/
2014-03-20 23:07:08 -07:00
14502f0f1c
Merge pull request #4803 from alambike/patch-1
...
Added Eixo::Docker to the list of libraries
2014-03-21 12:49:51 +10:00
79c11b19ec
Added Eixo::Docker to the list of libraries
...
Docker-DCO-1.1-Signed-off-by: Javier Gómez <alambike@gmail.com > (github: alambike)
2014-03-21 03:13:06 +01:00
8329cd55e1
Merge pull request #4796 from cpuguy83/fix_single_dash_args_in_dcs
...
Fix double single dash arg issues in docs
2014-03-21 11:18:21 +10:00
be5538d8a8
Allow containers to join the net namespace of other conatiners
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-21 00:48:17 +00:00
1bedae9107
Merge branch 'proppy-nsinit' into pluginflag
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-21 00:36:23 +00:00
87b0df997b
Merge branch 'nsinit' of https://github.com/proppy/docker into proppy-nsinit
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-21 00:36:09 +00:00
70f3b9f4ce
Add ability to work with individual namespaces
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-21 00:23:34 +00:00
443a75d5f6
Allow caps to be toggled in native driver with plugin flag
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-21 00:10:24 +00:00
43c3ee3ba1
Harmonize / across all name-related commands/Validate images names
...
Docker-DCO-1.1-Signed-off-by: Djibril Koné <kone.djibril@gmail.com > (github: enokd)
2014-03-21 00:40:58 +01:00
c5f9c4bd69
Dont use custom marshaling for caps and namespaces
...
This also adds an enabled field to the types so that they
can be easily toggled.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-20 23:09:01 +00:00
f7b3e879fc
Add initial plugin flag to pass lxc and native driver options
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-20 22:58:02 +00:00
8944fb2e9b
rename lxc to bridge
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-20 21:51:28 +00:00
ab0c9b385c
Remove the inotifywait hack from our upstart host-integration example that is no longer necessary
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-03-20 14:59:40 -06:00
fbd6fee4ab
Fix double single dash arg issues in docs
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
2014-03-20 14:14:54 -04:00
a9fa1a13c3
devicemapper: Better/faster shutdown
...
Right now shutdown is looping over *all* devicemapper
devices and actively deactivating them, this is pretty
slow if you have a lot of non-active containers. We
instead only deactivate the devices that are mounted.
We also do the shutdown unmount using MNT_DETACH which
forces the unmount in the global namespace, even if it
is busy because of some container having it mounted.
This means the device will be freed when that container
exits.
Also, we move the call to waitClose to deactivateDevice
because all callers of any of them call both anyway.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-03-20 17:38:35 +01:00
56c156190a
Merge pull request #4782 from unclejack/fix_TestCreateStartRestartStopStartKillRm
...
fix failing test to use kill instead of stop
2014-03-20 09:10:32 -07:00
2678af4ea8
Merge pull request #4790 from tianon/fix-release
...
Fix a lot of the sha256 and md5 stuff to be more DRY and extendible, and on more things (specifically, the tgz files too)
2014-03-19 22:49:19 -06:00
6b46a09186
Fix a lot of the sha256 and md5 stuff to be more DRY and extendible, and on more things (specifically, the tgz files too)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-03-19 22:25:09 -06:00
372b7282cb
Merge pull request #4788 from SvenDowideit/sign-releases-fixup
...
Fix bugs in release.sh
2014-03-19 18:19:25 -06:00
62eb23aed5
missed a bug
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-03-20 10:18:08 +10:00
a8cc6ebb18
I'm not looking forward to documenting cli arguments that may or may not show depending on what plugins / drviers you choose
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-03-20 09:59:54 +10:00
e38e977a04
Harmonize / across all name-related commands
...
Docker-DCO-1.1-Signed-off-by: Djibril Koné <kone.djibril@gmail.com > (github: enokd)
Harmonize / across all name-related commands
Docker-DCO-1.1-Signed-off-by: Djibril Koné <kone.djibril@gmail.com > (github: enokd)
Harmonize / across all name-related commands:Return an error when repeated /
Docker-DCO-1.1-Signed-off-by: Djibril Koné <kone.djibril@gmail.com > (github: enokd)
2014-03-20 00:45:29 +01:00
43124b5613
Merge pull request #4708 from SvenDowideit/sign-releases
...
Add md5 and sha256 to binaries on get.docker.io
2014-03-19 17:38:07 -06:00
43febdd432
whitespace-blind
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-03-20 09:35:58 +10:00
f2b01f5fa1
Merge pull request #4784 from SvenDowideit/reference-security-doc
...
add a link to the security documentation when we mention the docker group (or -G)
2014-03-19 17:20:44 -06:00
179e2c92d8
Generate md5 and sha265 hashes when building, and upload them in hack/release.sh
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-03-20 09:19:47 +10:00
f3765f96cf
add a link to the security documentation when we mention the docker group (or -G)
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-03-20 09:08:52 +10:00
aa63ece2ec
Merge branch 'master' into discordianfish-https_client
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-19 22:05:36 +00:00
12687b7c10
Merge branch 'https_client' of github.com:discordianfish/docker into discordianfish-https_client
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-19 22:03:11 +00:00
16ee4958f2
Merge pull request #4703 from netroy/patch-1
...
Document the missing `DisableNetwork` config flag to /containers/create end-point
2014-03-20 07:55:35 +10:00
3c9ae2b348
Merge pull request #3774 from danielnorberg/dns-search-domains
...
configurable dns search domains
2014-03-19 14:52:49 -07:00
4434dcee89
fix failing test to use kill instead of stop
...
TestCreateStartRestartStopStartKillRm was failing because stop has been
changed to not kill containers.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-03-19 23:23:45 +02:00
78a0105eaf
api/client: var style tweak
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-03-19 17:09:12 -04:00
c657603c61
variable declaration cleanup
...
Docker-DCO-1.1-Signed-off-by: Daniel Norberg <daniel.norberg@gmail.com > (github: danielnorberg)
2014-03-19 16:44:11 -04:00
698ca9f38d
fix typo in documentation
...
Docker-DCO-1.1-Signed-off-by: Daniel Norberg <daniel.norberg@gmail.com > (github: danielnorberg)
2014-03-19 16:44:09 -04:00
48cb2f0317
Remove duplication of Dns in config merging.
...
Fixes #4714
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-03-19 23:20:30 +04:00
6b5ba1b066
Merge pull request #4777 from vbatts/vbatts-server-info_and_assurance
...
images: assurance and debug info on image layers
2014-03-19 12:07:11 -07:00
e93a16ab48
docker save: add and improve docs
...
add usage examples for `docker save ...`
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-03-19 14:47:20 -04:00
367a679b92
images: assurance and debug info on image layers
...
when pushing or saving layers, report sizes for validation. And ensure
that the files written are sync'ed.
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-03-19 14:34:12 -04:00
5127732c79
docker save: --output flag
...
for those that do not care to redirect stdout
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-03-19 14:31:22 -04:00
ec3257921d
Docker-DCO-1.1-Signed-off-by: Aditya <aditya@netroy.in> (github: netroy)
...
document `DisableNetwork` config flag
2014-03-19 19:01:49 +01:00
47470d299d
Merge pull request #4691 from tianon/relative-workdir
...
Add proper support for relative WORKDIR instructions
2014-03-19 09:57:23 -07:00
fbfac21ed4
configurable dns search domains
...
Add a --dns-search parameter and a DnsSearch
configuration field for specifying dns search
domains.
Docker-DCO-1.1-Signed-off-by: Daniel Norberg <daniel.norberg@gmail.com > (github: danielnorberg)
2014-03-19 10:49:25 -04:00
d3c5891486
Merge pull request #4754 from vojnovski/consistent_apt-key_use
...
refactor($hack,$docs): be consistent in apt-key keyserver URI usage
2014-03-19 07:38:05 -06:00
4fd82db4be
refactor($hack,$docs): be consistent in apt-key keyserver URI usage, as done in #4740
...
In #4740 , the apt-key call in docs is changed to use the keyserver port 80 instead of
port 11371, as the previous call would fail with a restrictive firewall or proxy.
This commit extends the change to all apt-key calls in the repository.
Docker-DCO-1.1-Signed-off-by: Viktor Vojnovski <vojnovski@gmail.com > (github: vojnovski)
2014-03-19 10:20:10 +01:00
ccddb33bf4
Merge pull request #4727 from andreaturli/master
...
add softlayer installation instructions
2014-03-19 01:04:44 -06:00
53dc2d67fb
mention the tgz - other people might like to know
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-03-19 14:24:49 +10:00
92194f613e
use this horrible complex bit of shell to make sure that curl doesn't hand the poor user a broken docker client
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-03-19 14:12:47 +10:00
9bbc11b2ae
Merge pull request #4758 from crosbymichael/redis-bind
...
Be explicit about binding to all interfaces in redis example
2014-03-19 13:04:02 +10:00
0bb1e3d9a7
Merge pull request #4753 from vieux/clean_container_stop
...
cleanup container.stop
2014-03-18 18:49:51 -07:00
7822b053cb
Be explicit about binding to all interfaces in redis example
...
Fixes #4021
Moved to debian because the redis installed in ubuntu is really old
and does not support args via the cli.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-18 17:24:06 -07:00
3b5b2f8953
Merge pull request #4757 from crosbymichael/osx-duh
...
Add sudo clause if your using osx or tcp
2014-03-19 10:22:30 +10:00
38a3fc3e0e
Add sudo clause if your using osx or tcp
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-18 17:07:45 -07:00
3b1d590269
cleanup container.stop
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-18 23:48:14 +00:00
9e1306f78f
Merge pull request #4755 from crosbymichael/add-size-to-history-docs
...
Add image size to history docs
2014-03-19 09:32:35 +10:00
5dbfe310fe
libcontainer: remove duplicate imports
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
2014-03-18 16:25:26 -07:00
041ae08a2c
Add image size to history docs
...
Fixes #3147
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-18 16:24:45 -07:00
f58757a699
libcontainer: goimports
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
2014-03-18 16:18:34 -07:00
b10b950b11
libcontainer/nsinit/init: move mount namespace after network
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
2014-03-18 16:18:04 -07:00
f52b2fdcbb
libcontainer/network: add netns strategy
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
2014-03-18 16:17:28 -07:00
22c18de7be
Merge pull request #4744 from LK4D4/fix_issue_#3565
...
Using names in docker ps --since-id/--before-id, resolves #3565
2014-03-18 15:39:56 -07:00
119839dfd7
Merge pull request #4749 from cpuguy83/add_nofile_noproc_settings_to_upstart
...
Add upstart nofile/noproc similar to systemd init
2014-03-18 15:30:30 -06:00
06d87fd540
Merge pull request #4740 from vojnovski/patch-1
...
Update ubuntulinux.rst
2014-03-19 06:48:57 +10:00
e27c635c06
Add upstart nofile/noproc similar to systemd init
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
2014-03-18 16:27:20 -04:00
c1f2abd899
Using names in docker ps --since-id/--before-id, resolves #3565
...
Also renames --since-id/--before-id to --since/--before and add errors
on non-existent containers.
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-03-18 23:30:21 +04:00
bfbf338f51
Merge pull request #4684 from cpuguy83/4682-do_not_sigkill_on_docker_stop
...
Disable automatic killing of containers when docker stop fails
2014-03-18 11:28:42 -07:00
1e56ec8b67
Merge pull request #4733 from vieux/3729_time_exit
...
add time since exit in docker ps
2014-03-18 11:25:11 -07:00
c584910b55
Merge pull request #4650 from vbatts/vbatts-btrfs_build_tags
...
btrfs: build tags
2014-03-18 11:10:00 -07:00
c76def2dd2
typo
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-03-18 13:46:38 -04:00
29c45e7f4f
packagers: btrfs build tag docs
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-03-18 13:45:36 -04:00
5cfea26bcf
btrfs: build tags
...
correct filename and make the tag more readable
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-03-18 13:44:23 -04:00
85a62d9b77
btrfs: build tags
...
Default to the same build behavior, but allow a go build tag to disable
building of the btrfs graphdriver
go build -tags no_btrfs' ...
$ go build
$ objdump -S docker | grep btrfs | wc -l
194
$ go build -tags no_btrfs
$ objdump -S docker | grep btrfs | wc -l
1
# that is a comment ;-)
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-03-18 13:44:22 -04:00
555416fd02
Add err checks for port allocator tests
...
Docker-DCO-1.1-Signed-off-by: Andy Kipp <andy@rstudio.com > (github: kippandrew)
2014-03-18 13:30:21 -04:00
73c416a20d
Be more explicit in finding next port to allocate
...
Docker-DCO-1.1-Signed-off-by: Andy Kipp <andy@rstudio.com > (github: kippandrew)
2014-03-18 13:30:21 -04:00
7a1db291fc
Better test error message
...
Docker-DCO-1.1-Signed-off-by: Andy Kipp <andy@rstudio.com > (github: kippandrew)
2014-03-18 13:30:21 -04:00
f7b6fbbd76
Prevent dynamic allocation of previously allocated ports
...
Docker-DCO-1.1-Signed-off-by: Andy Kipp <andy@rstudio.com > (github: kippandrew)
2014-03-18 13:30:21 -04:00
f14c0866ec
Merge pull request #4674 from vbatts/vbatts-graphdriver_build_tags
...
graphdriver: build tags
2014-03-18 10:25:59 -07:00
8ac6400749
Merge pull request #4739 from alexlarsson/dm-timeout
...
devmapper: Increase timeout in waitClose to 10sec
2014-03-18 10:12:59 -07:00
98949c0793
Merge pull request #4738 from SvenDowideit/mention-env-scrubbing
...
add env hint
2014-03-18 10:32:05 -06:00
ae1dd52b19
Update ubuntulinux.rst
...
Adding the Docker repository key fails if port 11371 not open. This would probably work for more people.
2014-03-18 17:10:22 +01:00
a70beda1ec
devmapper: Increase timeout in waitClose to 10sec
...
As reported in https://github.com/dotcloud/docker/issues/4389 we're
currently seeing timeouts in waitClose on some systems. We already
bumped the timeout in waitRemove() in
https://github.com/dotcloud/docker/issues/4504 .
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-03-18 15:54:40 +01:00
e5cbb5c906
add env hint
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-03-18 22:29:11 +10:00
3782900405
Merge pull request #4731 from crosbymichael/fix-execin
...
Only unshare the mount namespace for execin
2014-03-17 18:59:26 -07:00
448b64164d
runtime: no build tags for vfs driver
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-03-17 21:54:43 -04:00
670ce98c60
graphdriver: build tags
...
Enable build tags for all the graphdrivers to be excludable.
As an example:
```
$ go build
$ ls -l docker
-rwxr-xr-x 1 vbatts vbatts 18400158 Mar 14 14:22 docker*
$ go build -tags "exclude_graphdriver_aufs exclude_graphdriver_vfs exclude_graphdriver_devicemapper"
$ ls -l docker
-rwxr-xr-x 1 vbatts vbatts 17467068 Mar 14 14:22 docker*
```
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-03-17 21:54:05 -04:00
4b1513f9c3
Only unshare the mount namespace for execin
...
Fixes #4728
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-17 18:52:56 -07:00
69299f041f
Add some documentation about relative WORKDIR values
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-03-17 19:42:27 -06:00
c1f492755b
Improve WORKDIR test to cover more edge cases
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-03-17 19:42:13 -06:00
15a267b57d
add time since exit in docker ps
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-18 01:34:43 +00:00
68dc189680
Merge pull request #4661 from vieux/add_no_prune
...
Add no prune
2014-03-17 16:07:55 -07:00
8b159fca8a
address comments from @jamtur01
...
Docker-DCO-1.1-Signed-off-by: Andrea Turli <andrea.turli@gmail.com > (github: andreaturli)
2014-03-17 23:39:35 +01:00
fb503da34e
Merge pull request #4710 from jimenez/4680-timeout_flag-fix
...
Disable timeout
2014-03-18 00:38:39 +02:00
30541ade82
Merge pull request #4702 from timthelion/Issue#4681-1
...
Fix Issue#4681
2014-03-17 15:31:54 -07:00
782eb5f03a
add softlayer installation instructions
...
Docker-DCO-1.1-Signed-off-by: Andrea Turli <andrea.turli@gmail.com > (github: andreaturli)
2014-03-17 23:19:47 +01:00
25218f9b23
adding configuration for timeout and disable it by default
...
Docker-DCO-1.1-Signed-off-by: Isabel Jimenez <contact@isabeljimenez.com > (github: jimenez)
2014-03-17 15:12:02 -07:00
659b719aa6
Refactor out interface specific information from execdriver.Network
...
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz > (github: https://github.com/timthelion )
2014-03-17 22:53:48 +01:00
865310e99d
Merge pull request #4689 from ralphbean/patch-1
...
Update fedora.rst
2014-03-18 07:49:48 +10:00
353df19ab7
Fix issue #4681 - No loopback interface within container when networking is disabled.
...
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz > (github: https://github.com/timthelion )
Remove loopback code from veth strategy
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz > (github: https://github.com/timthelion )
Looback strategy: Get rid of uneeded code in Create
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz > (github: https://github.com/timthelion )
Use append when building network strategy list
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz > (github: https://github.com/timthelion )
Swap loopback and veth strategies in Networks list
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz > (github: https://github.com/timthelion )
Revert "Swap loopback and veth strategies in Networks list"
This reverts commit 3b8b2c8454171d79bed5e9a80165172617e92fc7.
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz > (github: https://github.com/timthelion )
When initializing networks, only return from the loop if there is an error
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz > (github: https://github.com/timthelion )
2014-03-17 22:01:24 +01:00
53c5b1856d
Add failing test case for issue #4681
...
Add a failing test case for an issue where docker is not creating a loopback device if networking is dissabled.
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz > (github: https://github.com/timthelion )
2014-03-17 22:01:24 +01:00
dd040c9870
Merge pull request #4723 from vieux/fix_panic_monitor
...
fix panic in monitor
2014-03-17 13:52:22 -07:00
0e92c7c24a
Merge pull request #4721 from vieux/4716-display_ps-fix
...
Fix display command display in docker ps
2014-03-17 22:04:00 +02:00
1dfc440733
fix panic in monitor
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-17 19:33:40 +00:00
326f6a4b4d
fix tests
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-17 19:17:40 +00:00
8b5cf51d60
Disable automatic killing of containers when docker stop fails
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
2014-03-17 15:15:44 -04:00
59035d291f
Merge pull request #4678 from crosbymichael/move-runtime-deps
...
Move runtime deps
2014-03-17 12:01:09 -07:00
2bddcd68b4
Gofmt imports
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-17 11:41:28 -07:00
a18d08177c
Add missing client doc
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-17 18:40:57 +00:00
afcaaffd0b
update doc
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-17 18:40:57 +00:00
edd8d2d351
add no prune to rmi
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-17 18:40:57 +00:00
96c4816cef
Move graphdrivers into runtime top level pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-17 11:40:12 -07:00
af385151ce
Move execdrivers into runtime top level pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-17 11:40:12 -07:00
2230c9b9a7
Move networking drivers into runtime top level pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-17 11:40:12 -07:00
2ada6441db
Merge pull request #4701 from erikh/4099-non_existent_file_no_error
...
Fix `docker cp` trying to untar files that do not exist.
2014-03-17 20:38:26 +02:00
f9bd6c860d
Merge pull request #4364 from vieux/move_clone
...
move git clone from daemon to client
2014-03-17 11:36:56 -07:00
5921b186d1
display command display in docker ps
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-17 18:36:15 +00:00
597e0812fb
Merge pull request #4645 from crosbymichael/add-logger
...
Add logger to libcontainer
2014-03-17 11:30:14 -07:00
d810218038
Merge pull request #4720 from vieux/fix_content-type_cp
...
fix content-type detection in docker cp
2014-03-17 11:24:18 -07:00
a62c7215c6
Update fedora.rst
...
It looks like ``wmdocker`` does not have an update for Fedora 20:
```
~❯ pkgwat releases wmdocker
Starting new HTTPS connection (1): apps.fedoraproject.org
+---------------+----------------+-----------------+
| release | stable_version | testing_version |
+---------------+----------------+-----------------+
| Rawhide | 1.5-12.fc21 | None |
| Fedora 20 | None | None |
| Fedora 19 | None | None |
| Fedora EPEL 7 | None | None |
| Fedora EPEL 6 | None | None |
| Fedora EPEL 5 | None | None |
+---------------+----------------+-----------------+
```
I'm not sure if the owner awjb is intending to create an F20 update or
not, but either way -- these docs are incorrect as currently written.
Docker-DCO-1.1-Signed-off-by: Ralph Bean <rbean@redhat.com > (github: ralphbean)
2014-03-17 14:18:11 -04:00
73f5aa87af
Merge pull request #4719 from philips/Capabilities-to-CapabilitiesMask
...
refactor(libcontainer): rename to CapabilitiesMask
2014-03-17 11:15:29 -07:00
ad7e7d6123
chore(libcontainer): small grammar fix in types_test
...
Someone probably got really used to typing er on the end of contain :)
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com > (github: philips)
2014-03-17 11:07:29 -07:00
128381e0f0
refactor(libcontainer): rename to CapabilitiesMask
...
The Capabilities field on libcontainer is actually used as a mask.
Rename the field so that this is more clear.
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com > (github: philips)
2014-03-17 11:07:12 -07:00
a9ac35cbfb
Merge pull request #4700 from erikh/2371-sort_ports
...
In `docker ps`, sort by port instead of unsorted.
2014-03-17 11:03:06 -07:00
f68dd44dfa
Merge pull request #4686 from pnasrat/benchmark-typo
...
Fix spelling of benchmark test
2014-03-17 10:59:43 -07:00
90b283c39a
fix content-type detection in docker cp
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-17 17:56:21 +00:00
555c1ef670
Merge pull request #4672 from vieux/update_godoc_mflags
...
update godoc and add MAINTAINERS for mflags
2014-03-17 19:30:58 +02:00
681d1d2f61
Include instruction for AMI 2014.03
...
Include instructions to install Docker from Amazon's Software Repository on new AMI 2014.03 (Release Candidate)
Docker-DCO-1.1-Signed-off-by: Sebastien Stormacq <sebastien.stormacq@gmail.com > (github: sebsto)
2014-03-17 15:36:46 +01:00
2ea3fa9af5
Merge pull request #4698 from rutsky/external_link_in_rst_fix
...
Fix external link on security of containers
2014-03-17 09:29:33 +10:00
9e69a042c5
Fix docker cp trying to untar files that do not exist.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <erik@hollensbe.org > (github: erikh)
2014-03-16 17:48:46 +00:00
e32965dbb1
In docker ps, sort by port instead of unsorted.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <erik@hollensbe.org > (github: erikh)
2014-03-16 16:28:44 +00:00
65051f4215
Fix external link on security of containers
...
Docker-DCO-1.1-Signed-off-by: Vladimir Rutsky <altsysrq@gmail.com > (github: rutsky)
2014-03-16 18:36:15 +04:00
7a7126faf6
Merge pull request #4687 from zqhxuyuan/patch-1
...
Update epel.rpm's new url
2014-03-16 08:14:18 +10:00
054b85a7b2
Add proper support for relative WORKDIR instructions
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-03-15 14:03:16 -06:00
853c5e258f
Update nodejs_web_app.rst
...
the address of epel rpm has change to http://dl.fedoraproject....
2014-03-16 01:07:22 +08:00
5583774e29
Fix spelling of benchmark test
...
Docker-DCO-1.1-Signed-off-by: Paul Nasrat <pnasrat@gmail.com > (github: pnasrat)
2014-03-15 11:38:31 -04:00
f9090567af
Merge pull request #4676 from crosbymichael/no-sig-kill
...
Send sigterm to child instead of sigkill
2014-03-14 16:44:08 -07:00
2ba0861ad3
Add Sam's Go "dockerclient" to the list of Client Libraries
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-03-14 17:20:22 -06:00
75738b8527
Merge pull request #4673 from vieux/update_test_TestCreateRmRunning
...
update TestCreateRmRunning
2014-03-14 15:50:27 -07:00
5fd2de9792
Merge pull request #4679 from metalivedev/updateimages
...
Update images to remove references to AUFS, LXC
2014-03-15 08:45:37 +10:00
39037a91f8
Send sigterm to child instead of sigkill
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-14 15:42:05 -07:00
8c2cbfa096
Add parent reference arrow.
...
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net > (github: metalivedev)
2014-03-14 14:48:13 -07:00
50b12708e3
Updating base svg to remove references to aufs and lxc.
...
Exported new png's from layers.
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net > (github: metalivedev)
2014-03-14 14:37:09 -07:00
6a058540fe
Merge pull request #4647 from vieux/fix_registry_tests
...
use mock for search
2014-03-14 14:34:44 -07:00
2c10fcc432
Merge pull request #4593 from crosbymichael/move-server
...
Move server and buildfile into server pkg
2014-03-14 22:51:50 +02:00
123ebf9053
update TestCreateRmRunning
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-14 18:16:14 +00:00
a41f6d9367
update godoc and add MAINTAINERS for mflags
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-14 17:35:41 +00:00
0e863a584a
Add stderr log ouput if in debug
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-14 09:55:05 -07:00
7294392c72
Add initial logging to libcontainer
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-14 09:55:05 -07:00
8cf0b80a78
Update integration tests for server pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-14 09:46:56 -07:00
5239aa1f11
Move server and buildfile into server pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-14 09:37:08 -07:00
5c6d54073f
Merge pull request #4660 from vieux/parsecommand
...
create the cli obj before calling parseCommand
2014-03-14 17:36:40 +02:00
28a9ff7f25
Merge pull request #4653 from creack/fix_expose_cache
...
Fix expose cache
2014-03-14 16:09:13 +02:00
e1c54f6cb9
Merge pull request #4664 from tianon/fix-sphinx-warnings
...
Fix sphinx warnings
2014-03-14 09:21:44 -04:00
ae47f709ca
Make sphinx warnings fatal in Travis
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-03-13 22:35:31 -06:00
f6efcf2094
Fix sphinx header underline warnings I introduced...
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-03-13 22:35:09 -06:00
c349c9d14a
create the cli obj before calling parseCommand
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-14 00:47:13 +00:00
9c21a73f74
Merge pull request #4659 from creack/more_info
...
Have the exec driver and kernel version in non-debug mode in `docker info`
2014-03-13 17:32:42 -07:00
400ae98d23
Merge pull request #4633 from crosbymichael/no-pid-kill
...
Don't kill by pid for other drivers
2014-03-13 17:31:37 -07:00
7b89af2a08
Add unit test for expose cache
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-03-13 17:06:17 -07:00
6411ee6d24
Have the exec driver and kernel version in non-debug mode in docker info
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-03-13 16:28:16 -07:00
c0cef47b1e
Merge pull request #4658 from vieux/fix_display_build
...
fix build output
2014-03-13 15:34:17 -07:00
212a870734
Merge pull request #4646 from tianon/double-dash
...
Update to double-dash everywhere
2014-03-13 15:31:14 -07:00
03f0ec35ae
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)
2014-03-13 22:26:42 +00:00
f88f232f53
Merge pull request #4657 from crosbymichael/update-libcontainer-docs
...
Update libcontainer readme and todo list
2014-03-13 15:19:29 -07:00
cbd2a30cd6
Update libcontainer readme and todo list
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-13 15:18:08 -07:00
3fa99b35b0
Don't kill by pid for other drivers
...
Closes #4575
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-13 15:04:23 -07:00
28994f86ee
Merge pull request #4656 from crosbymichael/fix-ptmx-link
...
Always symlink /dev/ptmx for libcontainer
2014-03-13 14:57:17 -07:00
c7ea6e5da8
Merge pull request #4422 from alexlarsson/internal-mounts
...
Move all bind-mounts in the container inside the namespace
2014-03-13 14:55:29 -07:00
747275d30c
Always symlink /dev/ptmx for libcontainer
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-13 14:31:09 -07:00
192917a1cb
Merge pull request #4624 from creack/fix_apparmor_init
...
Fix issue when /etc/apparmor.d does not exists
2014-03-13 14:04:13 -07:00
ab26c16b32
Fix EXPOSE cache miss issue
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-03-13 13:58:09 -07:00
af58923847
Merge pull request #4649 from cglewis/release_add_breakathon
...
Add a "breakathon" for a testing/QA period to the release checklist
2014-03-13 13:43:37 -06:00
6fc83eefd9
add a breakathon for testing
...
Docker-DCO-1.1-Signed-off-by: Charlie Lewis <charliel@lab41.org > (github: cglewis)
2014-03-13 12:39:24 -07:00
89d2e14ed0
Merge pull request #4648 from creack/fix_raw_mode_darwin
...
Use BSD raw mode on darwin. Fixes nano, tmux and others
2014-03-13 12:15:50 -07:00
bf1b27dfcc
Don't use separate bind mount for container
...
Since we're not not mounting anything but the base filesystem outside
the container we no longer need the separate bind mount at
/var/lib/docker/container/$id/root in order to see the base filesystem
without extra mounts. So, we drop this and mount (again) the container
root directly at the real basefs mountpoint.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-03-13 20:08:29 +01:00
6c266c4b42
Move all bind-mounts in the container inside the namespace
...
This moves the bind mounts like /.dockerinit, /etc/hostname, volumes,
etc into the container namespace, by setting them up using lxc.
This is useful to avoid littering the global namespace with a lot of
mounts that are internal to each container and are not generally
needed on the outside. In particular, it seems that having a lot of
mounts is problematic wrt scaling to a lot of containers on systems
where the root filesystem is mounted --rshared.
Note that the "private" option is only supported by the native driver, as
lxc doesn't support setting this. This is not a huge problem, but it does
mean that some mounts are unnecessarily shared inside the container if you're
using the lxc driver.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-03-13 20:01:29 +01:00
636959e20a
Move .dockerenv parsing to lxc driver
...
This is not needed for e.g. the native driver
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-03-13 20:01:29 +01:00
029aac9639
Use BSD raw mode on darwin. Fixes nano, tmux and others
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-03-13 11:11:02 -07:00
6ac6619a1e
Merge pull request #4387 from unclejack/multiple_metadata_retrieval_attempts
...
retry to retrieve layer metadata on failure during pull
2014-03-13 11:03:52 -07:00
44fe8cbbd1
Update to double-dash everywhere
...
These were found using `git grep -nE '[^-a-zA-Z0-9<>]-[a-zA-Z0-9]{2}'` (fair warning: _many_ false positives there).
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-03-13 11:46:02 -06:00
9a0d7fe018
use mock for search
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-13 17:40:34 +00:00
51a46e6a4f
Merge pull request #4638 from ichik1/cli-doc-minor-fix
...
Some minor fixes for cli docs
2014-03-13 20:11:10 +10:00
0e871edfeb
Merge pull request #4636 from phillipalexander/fix-license
...
Fix boilerplate text in Apache license
2014-03-13 02:42:56 -04:00
73596b00e0
Fix boilerplate text in Apache license
...
This commit updates the Apache license boilerplate with actual information. The Apache license appendix (designed to be removed before publication) states:
```
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!)...
```
Additionally, the copyright year was not included. Copyright notices must reflect the current year. This commit updates the listed year to 2014.
see: http://www.copyright.gov/circs/circ01.pdf for more info
Docker-DCO-1.1-Signed-off-by: Phillip Alexander <git@phillipalexander.io > (github: phillipalexander)
2014-03-12 23:39:36 -07:00
841fcad0ba
Add missing options -t and -v to images subcommand doc
...
Docker-DCO-1.1-Signed-off-by: Ken ICHIKAWA <ichikawa.ken@jp.fujitsu.com > (github: ichik1)
2014-03-13 15:19:42 +09:00
471aa870f5
Remove duplicated description of --mtu
...
commit baa70e9751ichikawa.ken@jp.fujitsu.com > (github: ichik1)
2014-03-13 14:18:13 +09:00
c7564b5e4d
Merge pull request #4612 from tianon/cleaner-test-output
...
Cleaner test output
2014-03-12 17:54:14 -07:00
db1afee3f0
Merge pull request #4000 from cap10morgan/1141-merge-configs-on-commit
...
merge existing config when committing
2014-03-12 17:49:11 -07:00
94f2d52405
Merge pull request #4619 from dgageot/patch-1
...
Update port_redirection.rst
2014-03-13 09:31:16 +10:00
8e0a4802ab
Merge pull request #4492 from ichik1/add-ip-forward-to-docs
...
Update daemon docs for --ip-forward
2014-03-12 16:29:33 -07:00
6a325f1c7a
Fix issue when /etc/apparmor.d does not exists
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-03-12 11:13:24 -07:00
bd1c512594
Merge pull request #4621 from unclejack/fix_empty_cidfile
...
don't leave empty CIDFile behind
2014-03-12 11:12:51 -07:00
a56d1b93a1
don't leave empty cidFile behind
...
This makes `--cidfile` clean up empty container ID files. These are
left behind when creating the container fails.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-03-12 19:36:19 +02:00
63dee4ebc4
Merge pull request #4604 from vieux/improve_deprecation_warning_flags
...
improve deprecation message
2014-03-12 10:18:49 -07:00
ba49f5bce1
Merge pull request #4603 from creack/fix_osx_attach
...
Fix OSX attach exit issue
2014-03-12 10:08:55 -07:00
2a5e1abaa9
Update port_redirection.rst
...
Fix flags
2014-03-12 15:42:10 +01:00
2ad16c88e2
Merge pull request #4526 from Rovanion/master
...
All caps variables in normal bash should be avoided not to accidentally collide with environment variables.
2014-03-12 22:24:00 +10:00
a5fa161ff8
Merge pull request #4143 from SvenDowideit/apt-cacher-example
...
Show some ENV / local updated baseimage tricks that use an apt-cacher-ng...
2014-03-12 08:20:42 -04:00
2cfcf42d50
retry to retrieve metadata on failure during pull
...
This makes Docker retry to retrieve the JSON metadata for the layers.
Docker will make 5 attempts to retrieve the metadata before failing and
it will increase the delay between attempts after each failed attempt.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-03-12 14:05:43 +02:00
8bf63d5326
fixes suggested by James
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-03-12 22:02:24 +10:00
99b6364790
Exclude more "definitely not unit tested Go source code" directories from hack/make/test
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-03-12 01:18:12 -06:00
e1c48fa560
Clean up the "go test" output from "make test" to be much more readable/scannable
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-03-12 01:17:38 -06:00
b7ae9984fb
Update daemon docs and help messages for --iptables and --ip-forward
...
Fix docs and help messages of --iptables and --ip-forward to describe the true case behaviour
Docker-DCO-1.1-Signed-off-by: Ken ICHIKAWA <ichikawa.ken@jp.fujitsu.com > (github: ichik1)
2014-03-12 13:50:03 +09:00
f544ebd55a
Merge pull request #4574 from tianon/fix-cgroup-hax
...
Fix init script cgroup mounting workarounds to be more similar to cgroupfs-mount...
2014-03-11 22:21:01 -06:00
2b855afaee
registry: Info collection
...
roll version and standalone information into the _ping. And to support
Headers they are checked after the JSON is loaded (if there is anything
to load). To stay backwards compatible, if the _ping contents are not
able to unmarshal to RegistryInfo, do not stop, but continue with the
same behavior.
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-03-11 23:36:51 -04:00
bf009b530e
Merge pull request #4541 from scollier/master
...
Adding the new options to the `docker ps` documentation.
2014-03-12 11:36:12 +10:00
fbf74eb079
Removing HEAD tag from last commit
...
Docker-DCO-1.1-Signed-off-by: Scott Collier <emailscottcollier@gmail.com > (github: scollier)
2014-03-11 20:00:16 -05:00
7178b285a3
Adding CLI options to the commandline reference documentation.
...
Fixing bad DCO sig
URLs of pages are:
http://docs.docker.io/en/latest/reference/commandline/cli/
Docker-DCO-1.1-Signed-off-by: Scott Collier <emailscottcollier@gmail.com > (github: scollier)
2014-03-11 19:54:48 -05:00
f0eb227548
improve deprecation message
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-12 00:51:46 +00:00
baa70e9751
Adding the new options to the docker ps documentation.
...
URL of documentation page is: http://docs.docker.io/en/latest/reference/commandline/cli/#ps
Docker-DCO-1.1-Signed-off-by: Scott Collier <emailscottcollier@gmail.com > (github: scollier)
Adding the new options to the `docker ps` documentation.
URL of documentation page is: http://docs.docker.io/en/latest/reference/commandline/cli/#ps
Docker-DCO-1.1-Signed-off-by: Scott Collier <emailscottcollier@gmail.com > (github: scollier)
Adding CLI options to the commandline reference documentation.
URLs of pages are:
http://docs.docker.io/en/latest/reference/commandline/cli/
Docker-DCO-1.1-Signed-off-by: Scott Collier <emailscottcollier@gmail.com > (github: scollier)
changing indention
Docker-DCO-1.1-Signed-off-by: Scott Collier <emailscottcollier@gmail.com > (github: scollier)
2014-03-11 19:51:30 -05:00
95e5910ab2
Fix attach exit on darwin
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-03-11 17:51:29 -07:00
f9fde52a07
Merge pull request #4598 from creack/fix_lxc
...
Fix lxc
2014-03-11 17:17:54 -07:00
7b79f597f6
Merge pull request #4521 from tianon/release-checklist-origin
...
Note within the RELEASE-CHECKLIST that "origin" is assumed to be upstream
2014-03-11 14:34:47 -06:00
b55a79aa1c
Merge pull request #4504 from alexlarsson/devicemapper-waits
...
devmapper: Increase sleep times and unlock while sleeping
2014-03-11 13:17:53 -07:00
fd0737df2c
Update parseLxcInfo to comply with new lxc1.0 format
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-03-11 12:08:32 -07:00
721562f296
Remove goroutine leak upon error
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-03-11 11:39:28 -07:00
3715f46b8b
Merge pull request #4491 from crosbymichael/add-pull-dep
...
Add deprecation warning for -t on pull
2014-03-11 10:22:06 -07:00
0a6d9035cf
Merge pull request #4589 from creack/update_maintainer
...
Update MAINTAINER email + add self to pkg/signal MAINTAINER
2014-03-11 10:18:37 -07:00
7654bac442
Merge pull request #4466 from alexlarsson/execdrivers
...
Move execdriver construction into execdriver/execdrivers
2014-03-11 10:14:20 -07:00
15e52ccaad
Add deprecation warning for -t on pull
...
Closes #3410
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-11 10:11:05 -07:00
af3ff044a2
Merge pull request #4499 from alexlarsson/fix-remove-fail
...
DeviceMapper: Succeed immediately when removing non-existant devices
2014-03-11 10:09:58 -07:00
6169dafab3
Merge pull request #4569 from dolph/master
...
spelling correction
2014-03-11 09:19:46 -07:00
037f942a0b
Merge pull request #4583 from kzys/freebsd-signal
...
Like signal_linux.go, we don't have import os and os/signal
2014-03-11 09:01:39 -07:00
07c35b41a5
Move execdriver construction into execdriver/execdrivers
...
This can't be in execdriver (dependency loop) but should not be
hardcoded inside runtime.go either. So we put it in a subpackage.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-03-11 16:37:19 +01:00
b2cd89056f
Like signal_linux.go, we don't have import os and os/signal
...
Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com > (github: kzys)
2014-03-11 23:14:58 +09:00
2a2c694758
registry: make certain headers optional
...
For a pull-only, static registry, there only a couple of headers that
need to be optional (that are presently required.
* X-Docker-Registry-Version
* X-Docker-Size
* X-Docker-Endpoints
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-03-11 10:08:44 -04:00
e50a5fcb0d
Merge pull request #4577 from SvenDowideit/moltar-perl-modules
...
add Net::Docker CPAN module
2014-03-11 09:37:44 -04:00
b348ee0fd0
add Net::Docker CPAN module
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-03-11 20:28:26 +10:00
76dc670f41
Add variable for DOCKER_LOGFILE to sysvinit and use append instead of overwrite in opening the logfile
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-03-11 01:40:31 -06:00
b21f8872cc
Fix init script cgroup mounting workarounds to be more similar to cgroupfs-mount and thus work properly
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-03-11 01:39:06 -06:00
915d967f55
Update email + add self to pkg/signal
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-03-10 20:26:45 -07:00
18ea183ea0
spelling correction
...
s/singal/signal/
Docker-DCO-1.1-Signed-off-by: Dolph Mathews <dolph.mathews@gmail.com > (github: dolph)
2014-03-10 22:17:03 -05:00
0d6275b298
if client has no git, use server
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-11 01:23:14 +00:00
8301fc8e56
move git clone from daemon to client
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
add a little doc
2014-03-11 01:23:14 +00:00
b5a544b02e
Merge pull request #4563 from creack/signal-improvment
...
Signal improvments
2014-03-10 17:59:17 -07:00
ce09171780
Merge pull request #4520 from tianon/clarify-docs-branch-update
...
Clarify how to update the docs branch in the RELEASE-CHECKLIST with concrete instructions
2014-03-10 18:47:31 -06:00
7fc4cc0759
Merge pull request #4567 from creack/merge_auth_registry
...
Merge auth package within registry
2014-03-10 17:45:56 -07:00
923962a4b5
Merge pull request #4515 from vieux/improve_sort_flags
...
improve alpha sort in mflag
2014-03-10 17:45:41 -07:00
157f24ca77
Make docker use the signal pkg with strings
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-03-10 17:36:47 -07:00
10dc16dcd3
Create portable signalMap
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-03-10 17:36:41 -07:00
c563262239
Move signal to pkg
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-03-10 17:36:32 -07:00
0b8cd3ec8e
Merge pull request #4566 from srid/nsinit_uniq_errors
...
nsinit: prefix errors with their source
2014-03-10 17:26:17 -07:00
8d88ea0c15
Merge auth package within registry
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-03-10 17:16:58 -07:00
03211ecce0
nsinit: prefix errors with their source
...
Docker-DCO-1.1-Signed-off-by: Sridhar Ratnakumar <github@srid.name > (github: srid)
2014-03-10 17:08:50 -07:00
bc513c5afb
Merge pull request #4564 from vieux/remove_unused_version
...
Remove unused version.go
2014-03-10 17:06:30 -07:00
ca3369dc8d
Merge pull request #4440 from infoxchange/aufs-permissions-4068
...
Create directories for tar files with relaxed permissions
2014-03-10 16:50:17 -07:00
8bcb156694
Merge pull request #3985 from creack/add_freebsd_support
...
Add freebsd client support
2014-03-11 00:58:30 +02:00
3c25302a0b
Update vendor.sh with new kr/pty revision
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
2014-03-10 15:34:38 -07:00
6ccfb7fb9a
Update bsd specs
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-03-10 15:19:08 -07:00
802407a099
Update vendor for kr/pty
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-03-10 15:18:54 -07:00
6f70ed3a74
remove useless lock
...
move job to server and remove version.go
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-10 22:14:37 +00:00
3c7206b991
Merge pull request #4562 from vieux/remove_utils_in_docker_package
...
Remove utils in docker package
2014-03-10 14:27:13 -07:00
51b137f09e
Merge pull request #4561 from crosbymichael/merge_release_v0.9.0
...
Merge release v0.9.0
2014-03-10 14:24:25 -07:00
fde5f573d3
move opts out of pkg because it's related to docker
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-10 21:10:23 +00:00
d7646f934a
Change version to v0.9.0
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-10 14:08:26 -07:00
71c65193e0
Merge branch 'release' into merge_release_v0.9.0
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-10 14:08:17 -07:00
d648708d02
remove utils.go
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-10 21:06:27 +00:00
52c258c5cf
Merge pull request #4538 from crosbymichael/move-runtime
...
Move runtime into sub package
2014-03-10 22:52:32 +02:00
4fa8d0794e
Merge pull request #4542 from fabiofalci/remove_manual_cookie
...
Remove manual http cookie management
2014-03-10 13:51:02 -07:00
9bfbc7e648
Merge pull request #4560 from vieux/move_unit_test
...
move a unit test file
2014-03-10 22:45:41 +02:00
0ebf5d0ab3
move a unit test file
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-10 20:24:15 +00:00
bb43761940
Merge branch 'master' into add_freebsd_support
...
Conflicts:
archive/archive.go
archive/start_unsupported.go
2014-03-10 13:20:49 -07:00
2b1244fc0d
Merge pull request #4559 from metalivedev/unmaintainer
...
Removing myself from doc maintainers
2014-03-10 15:59:50 -04:00
3e4d0857bf
Removing myself from doc maintainers due to other obligations eliminating time to maintain docs.
...
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net > (github: metalivedev)
2014-03-10 12:55:26 -07:00
143c9707a9
Merge pull request #4489 from crosbymichael/bump_v0.9.0
...
Bump to version 0.9.0
2014-03-10 10:04:33 -07:00
2b3fdf2344
Fix a few packaging bugs, including and especially a temporary patch to our upstart script to mount cgroups properly
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Docker-DCO-1.1-Signed-off-by: Tianon Gravi <admwiggin@gmail.com > (github: crosbymichael)
2014-03-10 09:57:10 -07:00
211fc574a1
Merge pull request #4545 from tianon/update-packaging-and-init
...
Fix a few packaging bugs, including and especially a temporary patch to our upstart script to mount cgroups
2014-03-10 10:52:45 -06:00
50082f792b
Fix a few packaging bugs, including and especially a temporary patch to our upstart script to mount cgroups properly
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-03-10 03:27:46 -06:00
47edf3e8bf
Add IsRunning to server interface
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-09 23:16:15 -07:00
36c3614fdd
Move runtime and container into sub pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-09 23:03:40 -07:00
01b6b2be73
Move graph and tags to graph sub pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-09 22:59:29 -07:00
82a5439835
Move image into sub pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-09 22:59:29 -07:00
12bd83182d
Move daemon config into sub pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-09 22:59:28 -07:00
b24be254fa
All caps variables in normal bash should be avoided not to accidentally collide with environment variables.
...
Docker-DCO-1.1-Signed-off-by: Rovanion Luckey <rovanion.luckey@gmail.com > (github: Rovanion)
2014-03-09 11:08:11 +01:00
df9b99aca0
Remove manual http cookie management
...
Since docker uses cookiejar it doesn't need to manage cookies manually
anymore.
Managing cookie was duplicating it.
Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com > (github: fabiofalci)
2014-03-09 02:25:19 +00:00
d9f47c41c3
Merge pull request #4508 from walterl/patch-1
...
Fixed installmirrors ref
2014-03-09 10:15:47 +10:00
694c8e7dfc
Adding options to docker restart documentation
...
URL of page is: http://docs.docker.io/en/latest/reference/commandline/cli/#restart
Docker-DCO-1.1-Signed-off-by: Scott Collier <emailscottcollier@gmail.com > (github: scollier)
2014-03-08 17:23:06 -06:00
c000cb6471
Add authenticated TLS support for API
...
Docker-DCO-1.1-Signed-off-by: Johannes 'fish' Ziemke <github@freigeist.org > (github: discordianfish)
2014-03-09 00:06:44 +01:00
198f8d7884
Merge pull request #4528 from tomfotherby/patch-1
...
Correct Docker run --host param to --hostname
2014-03-08 17:53:55 -05:00
59acb8c83d
Adding the new options to the docker ps documentation.
...
URL of documentation page is: http://docs.docker.io/en/latest/reference/commandline/cli/#ps
Docker-DCO-1.1-Signed-off-by: Scott Collier <emailscottcollier@gmail.com > (github: scollier)
2014-03-08 16:32:00 -06:00
68217729a3
Merge pull request #4540 from unclejack/debootstrap_upgrade_packages
...
Run dist-upgrade after repo updates in mkimage-debootstrap
2014-03-08 10:10:11 -07:00
d04f4d836c
upgrade packages after debootstrap
...
This makes mkimage-debootstrap upgrade packages after retrieving
updated lists of packages.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-03-08 18:41:50 +02:00
a5c6e08bd6
Merge pull request #4535 from vieux/fix_string_command
...
fix string in docker images
2014-03-08 17:02:25 +02:00
7da37fec13
handle capital
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-07 23:40:45 +00:00
0ab7b6952a
Bump to version 0.9.0
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-07 15:38:10 -08:00
ccdf27e502
Merge branch 'master' into bump_v0.9.0
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-07 15:37:29 -08:00
d8425d98e6
Merge pull request #4534 from creack/fix_race_kill
...
Fix Race when killing the daemon
2014-03-07 18:11:51 -05:00
65283afc8b
Merge pull request #4524 from gurjeet/patch-3
...
Correct typo
2014-03-08 08:43:16 +10:00
bc086a9cd6
fix string in docker images
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-07 20:07:17 +00:00
b845ff355a
Fix Race when killing the daemon
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-03-07 11:51:28 -08:00
27eae50224
Merge pull request #4529 from pmorie/typo
...
Fix typo in devmapper driver_test
2014-03-07 11:01:04 -08:00
f27ad07139
Merge pull request #4516 from tianon/fix-static-dockerinit
...
Fix dynbinary so that dockerinit can still be properly static even if it has to link against libapparmor for Ubuntu
2014-03-07 10:15:49 -08:00
5b0ca89e2a
Merge pull request #4519 from crosbymichael/back-to-pivot-root
...
Use env var to toggle pivot root or ms_move
2014-03-07 10:12:00 -08:00
b3e7df48df
Fix typo in devmapper driver_test
...
Docker-DCO-1.1-Signed-off-by: Paul Morie <pmorie@gmail.com > (github: pmorie)
2014-03-07 12:20:25 -05:00
d61938d2b8
Correct Docker run --host param to --hostname
2014-03-07 16:41:11 +00:00
6d9a7d6bc3
Correct typo
2014-03-07 08:45:08 -05:00
3e5102c11e
Merge pull request #4522 from liubin0329/patch-1
...
removing redundant dot
2014-03-07 23:20:02 +10:00
29079f03cf
removing redundant dot
...
Maybe it's a typo
2014-03-07 18:19:18 +08:00
661cf32e4f
Note within the RELEASE-CHECKLIST that "origin" is assumed to be upstream
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-03-06 23:29:08 -07:00
0a819380c5
Clarify how to update the docs branch in the RELEASE-CHECKLIST with concrete instructions
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-03-06 23:16:26 -07:00
aceb10b1e5
Resync the DCO text with upstream at http://developercertificate.org/
...
```
Everyone is permitted to copy and distribute verbatim copies of this
license document, but changing it is not allowed.
```
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-03-06 22:32:58 -07:00
a40bb2aabc
Add new "DOCKER_CLIENTONLY" build variable to allow skipping of the dockerinit compilation, especially for Homebrew / Mac OS X client-only compilation
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-03-06 21:22:25 -07:00
36dd124b16
Add env var to toggle pivot root or ms_move
...
Use the DOCKER_RAMDISK env var to tell the native driver not to use
a pivot root when setting up the rootfs of a container.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-06 19:30:52 -08:00
be344cf0d8
Fix dynbinary so that dockerinit can still be properly static even if it has to link against libapparmor for Ubuntu
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-03-06 19:55:22 -07:00
3729ece2ea
improve alpha sort in mflag
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-07 02:20:59 +00:00
c38635020a
Revert "Revert "libcontainer: Use pivot_root instead of chroot""
...
This reverts commit 82f797f140michael@crosbymichael.com > (github: crosbymichael)
2014-03-06 17:19:59 -08:00
557e4fef44
Revert "Revert "libcontainer: Use MS_PRIVATE instead of MS_SLAVE""
...
This reverts commit bd263f5b15michael@crosbymichael.com > (github: crosbymichael)
2014-03-06 17:19:47 -08:00
78dc1ede52
Merge pull request #4512 from crosbymichael/no-pivot-root
...
No pivot root because of ramdisk
2014-03-07 02:54:03 +02:00
f244d9763e
Merge pull request #4511 from crosbymichael/ensure-native-containers-die
...
Ensure that native containers die with the parent
2014-03-07 02:49:10 +02:00
bd263f5b15
Revert "libcontainer: Use MS_PRIVATE instead of MS_SLAVE"
...
This reverts commit 757b577572michael@crosbymichael.com > (github: crosbymichael)
2014-03-06 16:41:03 -08:00
82f797f140
Revert "libcontainer: Use pivot_root instead of chroot"
...
This reverts commit 5b5c884cc8michael@crosbymichael.com > (github: crosbymichael)
2014-03-06 16:32:06 -08:00
ea9bce8724
Ensure that native containers die with the parent
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-06 16:30:56 -08:00
1695c77c43
Merge pull request #4509 from crosbymichael/kill-all
...
Remove the ghosts and kill everything
2014-03-07 01:35:38 +02:00
772ef99d28
Remove the ghosts and kill everything
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-06 15:30:26 -08:00
eda43fc70f
Merge pull request #4510 from vieux/fix_param_doc
...
Fix name parameter
2014-03-06 17:55:57 -05:00
44fc1dfca2
Merge pull request #4475 from ubermuda/patch-1
...
Added Docker-PHP to the list of client libs
2014-03-06 14:54:33 -08:00
476c290b07
Fix name parameter
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-06 22:51:44 +00:00
e4ebe6a12f
Merge pull request #4488 from crosbymichael/return-correct-lxc-pid
...
Return correct process pid for lxc
2014-03-07 00:14:08 +02:00
e388b6aba5
Merge pull request #3959 from cpuguy83/3958_add_ability_to_remove_running_container_in_single_command
...
Add ability to force removal of running container via docker rm -f
2014-03-07 00:05:57 +02:00
b722aa21b7
Merge pull request #4506 from creack/fix_apparmor
...
Use CGO for apparmor profile switch
2014-03-06 13:37:34 -08:00
188dea9e0e
Fixed installmirrors ref
...
Nested inline markup is not (yet) possible: http://stackoverflow.com/a/9645684
2014-03-06 23:33:08 +02:00
2128eb52ed
Merge pull request #7 from tianon/fix-hack-tags
...
Update build tags such that we can properly compile on all platforms
2014-03-06 12:49:05 -08:00
0b23393ba1
Update build tags such that we can properly compile on all platforms (especially for packagers), and updated hack/PACKAGERS.md to mention the DOCKER_BUILDTAGS variable that will need to be set for binaries that might be used on AppArmor (such as Debian and especially Ubuntu)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-03-06 13:39:17 -07:00
c89fa6645e
Add buildflags to allow crosscompilation for apparmor
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-03-06 12:05:03 -08:00
511b57bee5
Added Docker-PHP to the list of client libs
...
Docker-DCO-1.1-Signed-off-by: Geoffrey Bachelet <geoffrey.bachelet@gmail.com > (github: ubermuda)
2014-03-06 20:33:51 +01:00
83ffc2860b
Merge pull request #3612 from EvanKrall/specify_socket_group
...
Create a -G option that specifies the group which unix sockets belong to...
2014-03-06 11:30:17 -08:00
31f62b934b
Merge pull request #4503 from unclejack/attempt_to_fix_apparmor_profile
...
remove dbus from apparmor profile for Ubuntu 12.04
2014-03-06 11:20:06 -08:00
644acec2f7
Create a -G option that specifies the group which unix sockets belong to.
...
Docker-DCO-1.1-Signed-off-by: Evan Krall <krall@yelp.com > (github: EvanKrall)
2014-03-06 11:17:04 -08:00
f0f833c6d7
Use CGO for apparmor profile switch
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-03-06 11:10:58 -08:00
46fdb6af8e
remove dbus from apparmor profile
...
This removes the dbus entry from the apparmor profile Docker creates.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-03-06 19:47:03 +02:00
81f148be56
devmapper: Increase sleep times and unlock while sleeping
...
We've seen some cases in the wild where waiting for unmount/deactivate
of devmapper devices taking a long time (several seconds). So, we increase
the sleeps to 10 seconds before we timeout. For instance:
https://github.com/dotcloud/docker/issues/4389
But, in order to not keep other processes blocked we unlock the global
dm lock while waiting to allow other devices to continue working.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-03-06 18:36:08 +01:00
3e8a02a939
devmapper: Add per-device lock
...
We currently use a global lock to protect global data (like the
Devices map) as well as device data itself and access to
(non-threadsafe) libdevmapper.
This commit also adds a per-device lock, which will allow per-device
operations to temporarily release the global lock while e.g. waiting.
The per-device lock will make sure that nothing else accesses that
device while we're operating on it.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-03-06 18:36:03 +01:00
6af82bf4ca
Merge pull request #4498 from alexlarsson/fix-cloexec-race
...
libcontainer: Don't use UsetCloseOnExec, it is racy
2014-03-06 11:45:26 -05:00
c273a93cf9
Merge pull request #4474 from timthelion/master
...
Change mustn't to must not
2014-03-06 09:48:59 -05:00
1cdd775f5d
DeviceMapper: Succeed immediately when removing non-existant devices
...
We've seen situations where removal of "ID-init" failed during
container deletion (EBUSY), after removal of "ID" has succeeded. This
caused the container delete operation to fail, and on the next delete
attempt the removal of "ID" failed immediately with "does not exist".
Ideally we should not fail the ID-init removal, but its also non-ideal
to allow a state where the container is half-removed and we cannot
make progress deleting the container. So, we silently ignore not-exist
errors on device removal.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-03-06 15:12:09 +01:00
5c9b28db18
libcontainer: Don't use UsetCloseOnExec, it is racy
...
We can't keep file descriptors without close-on-exec except with
syscall.ForkLock held, as otherwise they could leak by accident into
other children from forks in other threads.
Instead we just use Cmd.ExtraFiles which handles all this for us.
This fixes https://github.com/dotcloud/docker/issues/4493
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-03-06 14:10:32 +01:00
69e3d30bb6
Return correct process pid for lxc
...
Fixes #2875
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-05 18:02:19 -08:00
fb314c266b
Merge pull request #4129 from proppy/patch-2
...
hack/RELEASE: add step for updating doc branch
2014-03-05 16:08:37 -08:00
1ad14effb5
Merge pull request #4264 from ndarilek/2973-skip-volumes-from
...
Don't call applyVolumesFrom on containers with volumes already configure...
2014-03-05 15:44:15 -08:00
8d947da826
Merge pull request #4468 from bcbcarl/4467-dockerjs-outdated
...
Flag 'docker-js' as outdated (Fix #4467 )
2014-03-06 09:37:34 +10:00
3ab4a28807
Merge pull request #4477 from creack/apparmor_native
...
Add AppArmor support to native driver + change pipe/dup logic
2014-03-05 15:23:31 -08:00
d03be9d7cf
Merge pull request #4463 from tianon/update-packagers-doc-and-lxc-dep
...
Update PACKAGERS.md and hack/make/ubuntu
2014-03-05 16:15:16 -07:00
920a6ca54c
Generate and load custom docker profile for apparmor
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-03-05 15:02:11 -08:00
4b700dbe85
Merge pull request #6 from crosbymichael/tryagain2
...
Some cleanup around logs
2014-03-05 13:54:21 -08:00
37f137c822
Some cleanup around logs
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-05 13:50:49 -08:00
cb4189a292
Add AppArmor support to native driver + change pipe/dup logic
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-03-05 13:08:24 -08:00
a24a802193
Merge pull request #4478 from vieux/add_missing_--_native
...
Add missing -- when we run dockerinit from native
2014-03-05 15:35:25 -05:00
34fe14f174
Merge pull request #4444 from SvenDowideit/update-host-integration-docs
...
update to use --name, and add a little more detail to how docker start -a works
2014-03-05 12:30:55 -08:00
ac734f0d36
Merge pull request #4392 from SvenDowideit/small-doc-fixes
...
Small doc fixes
2014-03-05 12:29:46 -08:00
bb0211ff30
Merge pull request #4449 from jamtur01/readme
...
Some fixes and 0.9.0 pre-req changes to the README.md
2014-03-05 12:28:32 -08:00
046e6604e5
Some updates to the README.md
...
* Updated pre-reqs for 0.9.
* Fixed a couple of docker to Docker.
* Fixed the Docker build example to be correct.
* Reformatted a bunch of paragraphs
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-03-05 15:27:49 -05:00
c987901f8d
Add missing -- when we run dockerinit from native
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-05 20:26:48 +00:00
c05e095baa
Merge pull request #4476 from vieux/improve_flags
...
Improve flags
2014-03-05 21:59:05 +02:00
069dc7f8c7
fix panic with only long flags or only one deprecatd
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-05 19:45:57 +00:00
089bf5e11e
fix usage for completly deprecated flag
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-05 19:27:39 +00:00
7ec82aa727
Merge pull request #4471 from unclejack/fix_integration_test_deprecation_warnings
...
fix flag deprecation warnings in integration tests
2014-03-05 11:00:56 -08:00
9101686161
Merge pull request #4462 from jamtur01/langfix
...
Updated a variety of language and error messages
2014-03-05 10:22:51 -08:00
2a8c927f33
Merge pull request #4461 from jamtur01/capital
...
Consistently capitalize CLI options
2014-03-05 10:21:20 -08:00
47f1609f5c
Change mustn't to must not
...
mustn't is ambiguous. It may mean "you don't need to" even when it's not a tag question. See prose:
http://books.google.cz/books?id=otFPvwLG524C&pg=PA241&lpg=PA241&dq=mustn%27t+trouble+yourself&source=bl&ots=vjgh7n-yyW&sig=LBQAwlZu3GxI5YzvRAXFow4hE1U&hl=en&sa=X&ei=a14XU9vxB4SBywOPz4HwDw&ved=0CDQQ6AEwAg#v=onepage&q=mustn%27t%20trouble%20yourself&f=false
http://www.nytimes.com/books/first/m/maynard-home.html (search for mustn't)
We mustn't argue over grammar.
See: https://github.com/dotcloud/docker/pull/4473
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz > (github: timthelion)
2014-03-05 17:33:18 +00:00
858d0356fd
Merge pull request #4278 from alexlarsson/system
...
Create pkg/system and move stuff there from archive
2014-03-05 12:32:35 -05:00
ad68ab19e0
Merge pull request #4465 from alexlarsson/private
...
libcontainer: Use MS_PRIVATE instead of MS_SLAVE
2014-03-05 12:16:18 -05:00
c41e51ce3d
Add further clarification of where/when the build-time deps are applicable
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-03-05 08:20:42 -07:00
35054601d8
fix flag deprecation warnings in integration tests
...
This removes three warnings in the integration tests:
Warning: '-viz' is deprecated, it will be removed soon. See usage.
Warning: '-tree' is deprecated, it will be removed soon. See usage.
Warning: '-cidfile' is deprecated, it will be removed soon. See usage.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-03-05 16:43:03 +02:00
d6114c0da0
Create pkg/system and move stuff there from archive
...
This is a package for generic system calls etc that for some reason
is not yet supported by "syscall", or where it is different enough
for the different ports to need portability wrappers.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-03-05 14:05:32 +01:00
5e32c40795
Flag 'docker-js' as outdated
2014-03-05 20:16:41 +08:00
757b577572
libcontainer: Use MS_PRIVATE instead of MS_SLAVE
...
Now that we unmount all the mounts from the global namespace we can
use a private namespace rather than a slave one (as we have no need
for unmounts of inherited global mounts to propagate into the
container).
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-03-05 09:40:54 +01:00
5317ad476d
Add "git" to our Ubuntu package "Recommends" (whoops, this should've been in here for a while now)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-03-04 22:59:46 -07:00
4293a1ceb4
Update the relevant docs section to match PACKAGERS.md
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-03-04 22:54:58 -07:00
b69f632830
Update package deps to remove LXC and move aufs-tools to be in "Recommends" instead of strict Depends
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-03-04 22:52:39 -07:00
615667b883
Rewrite more loads of PACKAGERS.md to hopefully remove some outdated information, add some updated information and pointers, and generally make the tone of this document less condescending :)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-03-04 22:51:34 -07:00
d9ec3a0347
Mention in PACKAGERS.md that Tianon is available for packager needs
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-03-04 21:41:59 -07:00
9a677e6a68
Reflow PACKAGERS.md to 80 columns (where possible) and update some minor formatting
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-03-04 21:40:42 -07:00
a7f265223a
Update PACKAGERS.md with some text changes, including and especially moving "LXC" to a new "Optional Dependencies" section
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-03-04 21:25:00 -07:00
6f2564350f
Merge pull request #4455 from lsm5/systemd
...
Bump container limit via systemd conf file
2014-03-04 20:37:16 -07:00
291d5e642e
bump open files and procs limit via unitfile
...
Docker-DCO-1.1-Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com > (github: lsm5)
modified: contrib/init/systemd/docker.service
modified: contrib/init/systemd/socket-activation/docker.service
2014-03-04 22:29:51 -05:00
cadd94f44c
implement pharvey's suggestions
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-03-05 13:12:29 +10:00
28a545d294
Show some ENV / local updated baseimage tricks that use an apt-cacher-ng proxy to make debian based installations instant
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-03-05 13:12:25 +10:00
83de8bb842
Closes #4374
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
\nDocker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: )
2014-03-05 02:41:14 +00:00
9cbf22dee2
Updated a variety of language and error messages
...
In api/client.go updated:
1. Made api == API
2. Restated Docker daemon connection error to be clearer.
3. Changed use of "Impossible" in error messages.
4. Removed extra space in restart error message.
5. Fixed capitalization in three error messages.
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-03-04 20:52:48 -05:00
725c7cd08a
Made CLI option capitalization consistent in api/client.go
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-03-04 20:45:22 -05:00
41bf38e44d
Consistently capitalize CLI options
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-03-04 20:22:51 -05:00
3acbd758d8
update to use --name, and add a little more detail to how docker start -a works
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-03-05 00:57:08 +00:00
e7055830ab
Merge pull request #4460 from crosbymichael/add-shm-size
...
Add shm size cap to mount
2014-03-04 14:20:20 -08:00
b07708c8de
Add shm size cap to mount
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-04 14:18:40 -08:00
19b898ad56
Merge pull request #4457 from creack/remove_loopback_mount
...
Remove loopback mount
2014-03-04 17:11:37 -05:00
57a47f5bbf
Remove /dev tmpfs mountpoint
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-03-04 13:21:22 -08:00
c74a8b28cd
remove /run mountpoint
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-03-04 12:32:17 -08:00
39d58129c3
Remove loopback mount bind
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-03-04 12:30:52 -08:00
a0c465a333
Merge pull request #4456 from crosbymichael/change-veth-name
...
Change veth prefix back to veth
2014-03-04 21:51:44 +02:00
0cdf102638
Change veth prefix back to veth
...
Fixes #4453
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-04 11:46:05 -08:00
b63709c1f1
Merge pull request #4452 from crosbymichael/small-fixes-to-libcontainer
...
Add find tests and remove panic in DEBUG
2014-03-04 14:37:41 -05:00
ba8d8f0abb
Merge pull request #4448 from alexlarsson/pivot_root
...
libcontainer: Use pivot_root instead of chroot
2014-03-04 19:59:16 +02:00
17577a6dce
Merge pull request #4418 from SvenDowideit/mention-expose-in-port-mapping-deprecation
...
make the port mapping deprecation error message more obvious
2014-03-04 19:44:06 +02:00
7e52445f2f
Add find tests and remove panic in DEBUG
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-04 08:55:12 -08:00
20ddd34d05
Merge pull request #4438 from crosbymichael/update-docs
...
Update daemon docs for exec drivers
2014-03-04 07:56:30 -05:00
5b5c884cc8
libcontainer: Use pivot_root instead of chroot
...
Instead of keeping all the old mounts in the container namespace and
just using subtree as root we pivot_root so that the actual root in
the namespace is the root we want, and then we unmount the previous
mounts.
This has multiple advantages:
* The namespace mount tree is smaller (in the kernel)
* If you break out of the chroot you could previously access the host
filesystem. Now the host filesystem is fully invisible to the namespace.
* We get rid of all unrelated mounts from the parent namespace, which means
we don't hog these. This is important if we later switch to MS_PRIVATE instead
of MS_SLAVE as otherwise these mounts would be impossible to unmount from the
parent namespace.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-03-04 12:44:08 +01:00
2aeccdd3bb
Create directories for tar files with relaxed permissions
...
Docker-DCO-1.1-Signed-off-by: Alexey Kotlyarov <alexey@infoxchange.net.au > (github: koterpillar)
2014-03-04 16:15:52 +11:00
b39d02b611
Support hairpin NAT without going through docker server
...
Hairpin NAT is currently done by passing through the docker server. If
two containers on the same box try to access each other through exposed
ports and using the host IP the current iptables rules will not match the
DNAT and thus the traffic goes to 'docker -d'
This change drops the restriction that DNAT traffic must not originate
from docker0. It should be safe to drop this restriction because the
DOCKER chain is already gated by jumps that check for the destination
address to be a local address.
Docker-DCO-1.1-Signed-off-by: Darren Shepherd <darren.s.shepherd@gmail.com > (github: ibuildthecloud)
2014-03-03 21:53:57 -07:00
fbc00df7a0
Merge pull request #4415 from iantruslove/patch-1
...
Fix minor typo
2014-03-03 17:58:03 -08:00
0f96a749ab
Update daemon docs for exec drivers
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-03 17:43:08 -08:00
0eeb146398
Merge pull request #4270 from DevTable/fixregistryauth
...
Fix registry auth and remove other hidden ping commands from client code
2014-03-03 17:34:21 -08:00
d761ebea6f
Merge pull request #4382 from unclejack/fix_symlink_handling
...
handle symlinks for Docker's root dir & TMPDIR
2014-03-04 03:23:11 +02:00
2275c83358
make the port mapping deprecation error message more obvious see 4075
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-03-04 10:45:26 +10:00
52d212aa6e
Merge pull request #4437 from SvenDowideit/tweak-DCO-hook-for-windows
...
Replace `echo -e` with the portable `{ echo; echo ...; }`
2014-03-03 17:43:37 -07:00
4f29836f71
nope, echo -e isn't portable
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-03-04 10:40:36 +10:00
69c69059fc
Merge pull request #4327 from crosbymichael/add-libcontainer
...
Add native execution driver to docker and make it the default
2014-03-03 16:34:20 -08:00
77766834a3
Merge pull request #12 from SvenDowideit/add-libcontainer-minor-doc-tweak
...
very minor spelling
2014-03-03 19:19:16 -05:00
93c1a7b796
Merge pull request #4419 from SvenDowideit/tweak-DCO-hook-for-windows
...
Fix newlines echoing in DCO git hook contrib script
2014-03-03 17:14:08 -07:00
2e71adac9f
very minor spelling
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-03-04 10:12:12 +10:00
43feb84203
it seems on MSWindows MSYS bash, echo n puts a literal \n (not a newline) into the commit message, so lets get more primitive
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-03-04 10:08:40 +10:00
b1267cb6ad
Merge pull request #4435 from vieux/warning_makefile
...
Remove warnings from Makefile
2014-03-03 16:40:31 -07:00
b9cb95c0a0
remove warnings from makefile
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-03 23:32:25 +00:00
fca4cf6f0a
Merge pull request #4413 from jamtur01/exemption
...
Added documentation (and some cleanup) around small patch exemptions
2014-03-04 09:10:37 +10:00
5639b29b78
Merge pull request #4432 from vieux/fix_warning_as_error
...
fix warning can't docker run
2014-03-03 17:16:25 -05:00
e23b4e5d15
fix warning can't docker run
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-03 22:07:42 +00:00
611acf7a7c
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)
2014-03-03 23:00:53 +02:00
aac9542a68
Merge pull request #4412 from crosbymichael/fix-env-clobber
...
Don't always just append env vars, replace defaults with ones from confi...
2014-03-03 22:52:03 +02:00
37d0ce42c6
Merge pull request #4385 from khia/json_format
...
Support json output in --format flag of docker inspect
2014-03-03 12:36:47 -08:00
5465fdf00f
Factor out finalize namespace
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-03 12:15:47 -08:00
e070db75fe
Merge pull request #4428 from vieux/add_warning_flags
...
add warning for deprecatd flags
2014-03-03 12:09:09 -08:00
bb5ed45224
add warning for deprecatd flags
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-03 19:57:05 +00:00
2f35f8e2a8
Update readme to remove .nspid
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-03-03 11:31:37 -08:00
93f925c533
Merge pull request #4426 from vieux/prevent_grouping_--
...
prevent flag grouping with --
2014-03-03 21:30:49 +02:00
cb3d27d01b
prevent flag grouping with --
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-03 19:17:28 +00:00
23ec7e637c
Merge pull request #4377 from vieux/fix_4358
...
fix fedora tty with apparmor
2014-03-03 11:10:09 -08:00
7531f82c70
Merge pull request #4321 from vieux/docker_run_-it
...
Add support for docker run -it or docker images -qa
2014-03-03 20:52:10 +02:00
954a913c1f
Merge pull request #2 from SvenDowideit/docker_run_-it_docs
...
add a little bit mentioning commandline option combinations
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-03-03 18:48:47 +00:00
690fb50beb
Merge pull request #4398 from philips/fix-socket-activation
...
fix(api): serve until the "acceptconnections" job
2014-03-03 10:19:51 -08:00
62d604a81e
Merge pull request #4200 from alexlarsson/fix-fedora-tests
...
Fix fedora tests
2014-03-03 10:54:31 -05:00
ded2fb883d
Merge pull request #4420 from unclejack/bump_to_go_1.2.1
...
Bump Go to 1.2.1 in the Dockerfile
2014-03-03 07:56:31 -07:00
9e28c3e3f8
aufs: Skip tests if aufs not supported
...
This makes it possible to pass the rest of the testsuite without aufs in the kernel.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-03-03 15:11:49 +01:00
e8af7fcf6d
runtime: Fix unique constraint error checks
...
The sqlite3 version in fedora (3.8) returns a different error string in the unique constraints
failure case than the one in hack/ (3.7). This updates the check to detect both, fixing
one integration check failure on Fedora.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-03-03 15:10:52 +01:00
4a688d6864
bump go to 1.2.1 in the Dockerfile
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-03-03 15:09:54 +02:00
37893c3db0
Merge pull request #4406 from funkymonkeymonk/voldocs
...
adding note that host-volumes must be defined using absolute paths
2014-03-02 23:19:09 -05:00
881cdd2a02
Merge pull request #4410 from 1uptalent/fix_typo_in_build_command_doc
...
DOC: Fix switch name for tagging images in build command
2014-03-02 23:17:51 -05:00
8f57f77160
Merge pull request #4176 from SvenDowideit/how-to-backup-volumes
...
add some info wrt backup and restore of volumes
2014-03-02 17:41:39 -05:00
3de1d25c11
Fix minor typo
2014-03-02 13:32:48 -07:00
b187d7ae41
Added documentation (and some cleanup) around small patch exemptions
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-03-02 11:43:18 -05:00
10137a561c
Merge pull request #4399 from barnybug/fish-completions
...
Add fish shell completions from github.com/barnybug/docker-fish-completion
2014-03-02 08:45:09 -07:00
a61096ec70
Merge pull request #4411 from lewispeckover/fix_mkimage-yum_mknod
...
Add "mkdir /dev" before doing mknod in mkimage-yum
2014-03-02 08:44:54 -07:00
6d55a9d7ce
mkdir /dev before doing mknod
...
Docker-DCO-1.1-Signed-off-by: Lewis Peckover <lew@lew.io > (github: lewispeckover)
2014-03-02 14:50:16 +00:00
62b88cd619
DOC: Fix switch name for tagging images in build command
...
Docker-DCO-1.1-Signed-off-by: German Del Zotto <germ@ndz.com.ar > (github: GermanDZ)
2014-03-02 13:50:34 +01:00
3ddfbf6880
adding note that host-volumes must be defined using absolute paths
...
Docker-DCO-1.1-Signed-off-by: Will Weaver <monkey@buildingbananas.com > (github: funkymonkeymonk)
2014-03-01 20:43:53 -05:00
8d2226b7e5
fix(api): serve until the "acceptconnections" job
...
This fixes a bug that I encountered when using socket activation with
docker 0.8.1. When running the first `docker run` it would return:
"create: command not found".
The root cause was the socket activation code path was starting to
listen before the "initserver" job had finished. This meant that the
"create" handler hand't been registered yet leading to the command not
found error.
In log format it looks like this:
```
[/var/lib/docker|9d2e78e9] +job initserver()
2014/03/01 04:05:35 Listening for HTTP on fd ()
[/var/lib/docker|0d71c177] +job create()
create: command not found
[/var/lib/docker|0d71c177] -job create()
[/var/lib/docker|0d71c177] +job acceptconnections()
[/var/lib/docker|0d71c177] -job initserver() = OK (0)
```
To fix the issue select on the activationLock and block until the
"acceptconnections" job has ran.
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com > (github: philips)
2014-03-01 10:55:36 -08:00
bf6adf952b
Add fish shell completions from https://github.com/barnybug/docker-fish-completion .
...
Docker-DCO-1.1-Signed-off-by: Barnaby Gray <barnaby@pickle.me.uk > (github: barnybug)
2014-03-01 17:33:54 +00:00
f83482c918
Merge pull request #4395 from creack/remove_goroutine_leak_test
...
Make the chan for utils.Go buffered in order to avoid goroutine leak
2014-03-01 10:41:36 -05:00
b02b933c62
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)
2014-03-01 03:46:45 -08:00
e07920f680
Support json output in --format flag of docker inspect
...
Docker-DCO-1.1-Signed-off-by: ILYA Khlopotov <ilya.khlopotov@gmail.com > (github: khia)
2014-02-28 17:34:31 -08:00
d3a6ee1e55
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)
2014-02-28 16:35:43 -08:00
6d6ec5e005
Merge pull request #4394 from creack/fix_tty_ghost
...
Check if the command exists before dereference
2014-02-28 15:53:27 -08:00
5ec6819705
Check if the command exists before dereference
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-02-28 15:39:24 -08:00
5fde31ba9c
add some info wrt backup and restore of volumes
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-03-01 08:44:01 +10:00
3b969aad4a
merge existing config when committing
...
Fixes #1141
Docker-DCO-1.1-Signed-off-by: Wes Morgan <cap10morgan@gmail.com > (github: cap10morgan)
2014-02-28 15:27:05 -07:00
5f5880edb8
Merge pull request #4388 from vieux/fix_eventlisteners_nb
...
fix EventsListeners in docker info
2014-02-28 13:53:15 -08:00
ba2a042aea
Merge pull request #4390 from SvenDowideit/spelling-1
...
one ponted out by lukaspustina, and one that I bet I added
2014-02-28 13:39:40 -08:00
70d2ca4ed3
Merge pull request #4319 from jlhawn/docs-docker-io-api
...
Added documentation for docker.io OAuth & Accounts
2014-02-28 13:35:33 -08:00
b16f466354
one ponted out by lukaspustina, and one that I bet I added
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-03-01 05:12:21 +10:00
0ca7df046b
fix EventsListeners in docker info
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-28 19:06:36 +00:00
142213ade8
Merge pull request #4379 from vieux/remove_warnings_twice
...
remove WARNING writter twice
2014-02-28 10:31:25 -08:00
b4146fbe48
Merge pull request #4376 from vieux/fix_lxc_version
...
fix docker info with lxc 1.0.0
2014-02-28 20:04:11 +02:00
d78fcb32ff
Add ability to force removal of running container via docker rm -f
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
2014-02-27 23:31:36 -05:00
f67e725e68
remove WARNING writter twice
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-28 02:40:15 +00:00
6104f9f949
fix fedora tty with apparmor
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-28 01:20:10 +00:00
f30f823bf5
fix docker info with lxc 1.0.0
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-28 00:32:58 +00:00
b6a5082bd1
Updated OAuth docs per arothfusz's comments
...
Added emphasis of https for OAuth interactions.
Updated example URIs to use HTTPS
Included redirect hostname on authorization page.
Docker-DCO-1.1-Signed-off-by: Josh hawn <josh.hawn@docker.com > (github: jlhawn)
2014-02-27 14:21:24 -08:00
cdec3297f7
add a little bit mentioning commandline option combinations
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-02-28 08:14:22 +10:00
44c3b71332
Ensure that ticker does not leak
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-27 11:40:25 -08:00
31e08fdc96
Merge pull request #4369 from tianon/better-archive-tar-vendor-import-path
...
Use a more defensive vendored archive/tar import path to make it clear this isn't upstream's released archive/tar
2014-02-27 10:37:38 -08:00
ce8a735248
Merge pull request #4318 from robpc/patch-1
...
Fixed typo in Dockerfile example
2014-02-27 10:19:09 -08:00
fdeea90fc8
Allow child process to live if daemon dies
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-27 09:33:36 -08:00
e6784be628
Merge pull request #4365 from maztaim/master
...
Use mknod instead of MAKEDEV in mkimage-yum.sh
2014-02-27 10:14:22 -07:00
2ca4e0ea60
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)
2014-02-27 09:43:44 -07:00
a115ce797b
Ensure that the container dir is remove on restore
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-27 08:28:55 -08:00
1d82091756
Some distributions no longer include MAKEDEV script. Stole this from mkimage-rinse.sh.
...
Docker-DCO-1.1-Signed-off-by: Tim Bosse <taim@bosboot.org > (github: maztaim)
2014-02-26 22:34:42 -05:00
fb08b8b221
Code review updates
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-26 19:21:46 -08:00
01dc79b3ea
Merge pull request #4276 from tianon/json-stream-newlines
...
Add newlines to the JSON stream functions
2014-02-26 21:25:42 -05:00
389eba4396
Merge pull request #4297 from dotcloud/add-simple-checksum
...
registry: Added simple checksums (sha256) for layers
2014-02-26 18:15:48 -08:00
7cd2245947
Ensure that loopback devices are mounted inside the conatiner
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-26 17:21:09 -08:00
1475dafd52
Fixed typo in Dockerfile example
...
Docker-DCO-1.1-Signed-off-by: Rob Cannon <rpcann@gmail.com > (github: robpc)
The 'true' command is located in /bin not /usr/bin in the busybox image.
2014-02-26 19:38:51 -05:00
70820b69ec
Make network a slice to support multiple types
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-26 14:20:41 -08:00
ce08083f9c
Merge branch 'master' into add-libcontainer
...
Conflicts:
execdriver/termconsole.go
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-26 12:55:24 -08:00
0e356d49aa
Merge pull request #4346 from creack/fix_race_exit_code
...
Fix exit code issue with TTY mode
2014-02-26 15:32:01 -05:00
5908aa350d
Merge pull request #4357 from creack/fix_TestCmdKill
...
Fix TestCmdKill by closing the pipe before waiting on the container
2014-02-26 12:20:30 -08:00
bde192bb80
Merge pull request #4078 from vieux/rewrite_rmi
...
Rewrite docker rmi
2014-02-26 21:30:24 +02:00
22da8cdc7e
Merge pull request #4282 from ibuildthecloud/jumbo-frames
...
Add MTU to lxc conf to make host and container MTU match
2014-02-26 20:11:38 +02:00
31ddc16692
Merge pull request #4292 from cpuguy83/4291_make_rm_default_for_build
...
make docker build -rm=true default
2014-02-26 19:03:59 +02:00
0b4aeb79d9
make docker build -rm=true default #4292
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
2014-02-26 11:04:06 -05:00
d8b60cb592
Merge pull request #4308 from vbatts/vbatts-seperate_driver_term
...
seperate out the terminal functions from lxc
2014-02-26 16:58:21 +02:00
b8a8c0c686
Merge pull request #4342 from vieux/update_maintainers_api
...
update api Maintainers file
2014-02-26 16:33:02 +02:00
a42ef866ed
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"
2014-02-26 16:15:56 +02:00
22861b42ee
Merge pull request #4328 from vieux/fix_4298
...
fix divide by zero error
2014-02-26 15:59:52 +02:00
94001dc6c6
Merge pull request #4341 from vieux/fix_content_type_copy
...
fix content-type docker copy
2014-02-26 15:45:38 +02:00
b5ba89596e
Merge pull request #4348 from tianon/fix-yum-tagging
...
Update mkimage-yum to not read /etc/redhat-release from the host
2014-02-25 23:46:04 -07:00
d29ee876ac
Update mkimage-yum to not read /etc/redhat-release from the host
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-02-25 23:35:59 -07:00
4039fbb1b0
Fix TestCmdKill by closing the pipe before waiting on the container
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-02-25 20:16:17 -08:00
6016126c71
Fix cgroups swap issue when it is not supported
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-25 19:45:57 -08:00
bfdf07ac98
Return error for lxc-conf when using native driver
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-25 17:13:00 -08:00
3806ff61d1
Fix exit code issue with TTY mode
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-02-25 16:50:33 -08:00
5c67d2e634
Ensure that the container's dir is remove from native driver on stop
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-25 16:27:07 -08:00
a0251223cd
registry: Fixed unexported field
...
Docker-DCO-1.1-Signed-off-by: Sam Alba <sam.alba@gmail.com > (github: samalba)
2014-02-25 16:06:04 -08:00
2f468a498a
update api Maintainers file
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-25 23:19:44 +00:00
93ed15075c
Fix cross compile for make cross
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-25 15:19:13 -08:00
d373cb8c89
Merge pull request #4323 from timruffles/patch-2
...
help contributors be more productive
2014-02-25 15:03:30 -08:00
386e7c80c0
fix content-type docker copy
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-25 22:49:19 +00:00
8dad771daa
add version pkg
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-25 21:08:38 +00:00
10faefac3b
add missing doc
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-25 21:08:08 +00:00
3f6324f0e8
fix bad rebase
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-25 21:08:08 +00:00
21f56c04e4
fix doc
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-25 21:08:08 +00:00
626cee87f7
fix message 'No such image: ubuntu' => 'No such image: ubuntu:latest'
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-25 21:08:08 +00:00
964d82d005
fix tests
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-25 21:08:08 +00:00
c7f825c0f0
:= / var
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-25 21:08:08 +00:00
e7cc88c39f
bump API version
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-25 21:08:07 +00:00
795ed6b1e5
Rewrite docker rmi
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-25 21:08:07 +00:00
79089720c4
Merge pull request #4335 from tianon/what-the-etc-group
...
Convert api/server.go to also use the handy user package
2014-02-25 15:50:53 -05:00
96e33a7646
Move container.json and pid file into a root specific driver dir
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-25 12:41:31 -08:00
7bce5957a0
Convert api/server.go to also use the handy user package
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-02-25 13:07:19 -07:00
ca42758368
Merge branch 'add-libcontainer' of https://github.com/crosbymichael/docker into add-libcontainer
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-02-25 11:42:15 -08:00
de083400b8
Address initial feedback from pr
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-25 10:54:41 -08:00
56584a92f4
Merge pull request #4314 from shykes/engine-commands
...
Engine: builtin command 'commands' returns a list of registered commands
2014-02-25 09:59:26 -08:00
c35853191c
correcting the package name for the terminal setup
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-02-25 10:07:06 -05:00
b7a0f62f0f
fix divide by zero error
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-25 08:01:46 +00:00
a64ebabdfa
Remove setup logging from sysinit
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-24 21:54:37 -08:00
91bf120c51
Better capability/namespace management
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-02-24 21:52:29 -08:00
431d510cae
Remove container env var from libcontainer
...
Update tests to use native driver
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-24 21:51:00 -08:00
8db740a38e
Move types around in native driver
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-24 21:21:35 -08:00
f8453cd049
Refactor and improve libcontainer and driver
...
Remove logging for now because it is complicating things
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-24 21:11:52 -08:00
d59c05a37c
Fix exec driver flag, rename new driver to 'native'
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-24 20:41:09 -08:00
27a43692c2
Merge branch 'master' into add-libcontainer
...
Conflicts:
runtime.go
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-24 20:35:12 -08:00
c9addff444
Merge pull request #4189 from vbatts/vbatts-execdriver_flag
...
execdriver flag for docker daemon
2014-02-24 23:28:17 -05:00
ca537a63a8
Remove chroot driver, it's not needed
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-24 18:52:48 -08:00
9cb4573d33
Improve logging for nsinit
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-24 18:38:36 -08:00
e84e344b1f
Use the dockerenv file from the current dir instead of root
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-02-24 17:02:46 -08:00
77f68f74c7
Rename namespace driver to docker
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-24 16:42:30 -08:00
9f03fd76b5
Fix restore container by nspid
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-24 16:35:11 -08:00
9bf6cb2692
Fix get pids for nsinit
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-24 16:26:06 -08:00
a76407ac61
Cgroups allow devices for privileged containers
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-24 15:47:23 -08:00
b5517db808
Merge pull request #4296 from morgante/patch-1
...
Remove trailing slash from --host parameter in contrib/vagrant-docker/README.md
2014-02-24 16:27:31 -07:00
b6d4c27fcd
Merge pull request #4309 from crosbymichael/change-cgroup-subsystem
...
Use the cpu cgroup subsystem instead of memory because its non optional
2014-02-24 15:24:51 -08:00
b2064f2ce6
Merge pull request #4313 from shykes/api-common
...
api/common.go
2014-02-25 01:11:53 +02:00
4434b63ff4
fix gofmt
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-24 23:10:45 +00:00
9c4799b7e7
help contributors be more productive
...
certainly saved me time after I found this in hack/make.sh :)
Docker-DCO-1.1-Signed-off-by: Tim Ruffles <oi@truffles.me.uk > (github: github_handle)
2014-02-24 23:07:40 +00:00
3839e3a0f6
enable docker run -it
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-24 22:53:00 +00:00
a6e5e18511
Fix kill signals and rootfs path for pid
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-24 14:35:27 -08:00
ad88d0be83
Merge pull request #4315 from shykes/engine-parsejob-test
...
Engine: add tests for ParseJob()
2014-02-24 14:27:19 -08:00
cfd188e925
Add info for driver
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-24 14:11:09 -08:00
88b774d092
Merge pull request #4320 from vieux/buffer_test_integration_line_by_line
...
Add --line-buffered to the integration test output filtering
2014-02-24 15:09:21 -07:00
5f15faf500
Merge pull request #4290 from tianon/extract-path
...
Extract our default PATH value to a constant for great reuse
2014-02-24 14:06:27 -08:00
24ff3a3dc3
add --line-buffered
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-24 21:59:01 +00:00
4a4915c8ee
Merge pull request #4312 from shykes/engine-error-reporting
...
Engine: clearer job error reporting
2014-02-24 13:58:12 -08:00
1c79b747bb
Honor user passed on container in nsinit
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-24 13:52:56 -08:00
00bb76f35b
Added documentation for docker.io OAuth & Accounts
...
OAuth docs:
documented the OAuth authorization flow and how to register your application
Account docs:
documented getting/updating user profile data
documented getting/updating user email data
Docker-DCO-1.1-Signed-off-by: Josh hawn <josh.hawn@docker.com > (github: jlhawn)
2014-02-24 13:48:43 -08:00
757c7581c8
Use the cpu cgroup subsystem instead of memory because its non optional
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-24 13:42:13 -08:00
01f9815b55
Fix tests with dockerinit lookup path
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-24 13:40:17 -08:00
522c0765f1
registry: Removed checksumPayload from exported fields
...
Docker-DCO-1.1-Signed-off-by: Sam Alba <sam@docker.com > (github: samalba)
2014-02-24 12:40:33 -08:00
2ae8180de2
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)
2014-02-24 13:38:58 -07:00
0469e7d062
Engine: tiny cosmetic fix
...
To make @creack happy :)
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-02-24 12:31:39 -08:00
d985fd4984
Engine: add tests for ParseJob()
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-02-24 12:31:39 -08:00
cd846ecb60
Engine: builtin command 'commands' returns a list of registered commands
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-02-24 12:29:49 -08:00
62b21daded
Engine: cleanup side effects between tests
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-02-24 12:29:39 -08:00
fabc478e7e
Move the terminal setup to execdriver, instead of ./pkg/term
...
It is independent of any particular driver, but likely used by
multiple execdrivers. Also, pkg/... is not to have any links to
docker, which this terminal setup does.
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-02-24 15:28:45 -05:00
8f20058307
Compile nsinit into docker for use with dockerinit
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-24 12:21:13 -08:00
05e4030313
Merge pull request #4288 from tianon/mkimage-steamos
...
Add "SteamOS" support to mkimage-debootstrap
2014-02-24 13:02:04 -07:00
f14f4aa509
Merge pull request #4311 from shykes/engine-parsejob
...
Engine.ParseJob: create a new job from a shell-like text command.
2014-02-24 11:55:50 -08:00
cd94c9d666
Add "SteamOS" support to mkimage-debootstrap (requires a debootstrap script like https://github.com/tianon/gentoo-overlay/blob/master/dev-util/debootstrap-valve/files/scripts/alchemist )
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-02-24 12:55:04 -07:00
551355c9ad
api/common.go: code shared by the server and client implementation of the Docker remote api.
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-02-24 11:54:50 -08:00
8a1778301b
Engine: clearer job error reporting
...
* Job.Error and Job.Errorf always print a newline.
* Avoid redundant prefixing of error messages.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-02-24 11:53:56 -08:00
c63ce728cf
Merge pull request #4249 from shykes/builtins
...
Register built-in engine commands at runtime instead of compile-time
2014-02-24 11:40:09 -08:00
8cfa7715c7
Merge pull request #4281 from unclejack/remove_vagrantfile
...
Remove Vagrantfile and remove it from all docs
2014-02-24 11:39:11 -08:00
2019a73f03
Engine.ParseJob: create a new job from a shell-like text command.
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-02-24 11:38:13 -08:00
92c3927b5d
Cleanup integration tests
...
Refactor integration tests to remove special cases in the creation of
test engines. All test engines are now created through newTestEngine.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-02-24 19:24:30 +00:00
919665a20a
Register built-in engine commands at runtime instead of compile-time
...
This allows selective loading of commands, and paves the way to dynamic
plugins.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-02-24 19:24:29 +00:00
aed7fe1cda
Merge pull request #4293 from cpuguy83/patch-1
...
Doc: Remove uneeded wording in Dockerfile format
2014-02-24 11:05:25 -08:00
89dbdb1f71
Merge branch 'libcontainer-in-docker' into add-libcontainer
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-24 10:49:49 -08:00
a08e78a78c
Look for cpu subsystem instead of memory
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-24 10:46:20 -08:00
de848a14ca
seperate out the terminal functions from lxc to the pkg/term
...
Since these functions are indepenent of lxc, and could be used by
other drivers.
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-02-24 13:42:09 -05:00
f420bb2979
registry: Fixed tests
...
Docker-DCO-1.1-Signed-off-by: Sam Alba <sam@docker.com > (github: samalba)
2014-02-24 09:04:27 -08:00
8d230cf89c
registry: Added simple checksums (sha256) for layers
...
Docker-DCO-1.1-Signed-off-by: Sam Alba <sam@docker.com > (github: samalba)
2014-02-23 18:50:04 -08:00
cfdfd46e49
Remove uneeded wording in Dockerfile format
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
2014-02-23 15:45:44 -05:00
2a7f7c86da
Remove trailing slash from host parameter in docker init.
...
(This causes errors on Docker 0.8)
Docker-DCO-1.1-Signed-off-by: Morgante Pell <morgante.pell@morgante.net > (github: morgante)
2014-02-23 23:42:54 +04:00
b3ffc1f835
Extract our default PATH value to a constant for great reuse
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-02-22 20:01:45 -07:00
ed8466c44c
Merge pull request #4246 from Ximion/master
...
contrib/debootstrap: Add initial support for Tanglu
2014-02-22 14:58:14 -07:00
4bfc8e9722
contrib/debootstrap: Add initial support for Tanglu
...
This will add support for Tanglu, a Debian based Linux-distribution.
Docker-DCO-1.1-Signed-off-by: Matthias Klumpp <matthias@tenstral.net > (github: Ximion)
2014-02-22 17:25:52 +01:00
172260a49b
Fix tty copy for driver
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-22 01:28:59 -08:00
fac41af25b
Refactor driver to use Exec function from nsini
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-22 01:21:26 -08:00
ae423a036e
Abstract out diff implementations for importing
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-22 00:29:21 -08:00
2412656ef5
Add syncpipe for passing context
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 22:58:30 -08:00
dd59f7fb28
Refactor exec method
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 22:37:09 -08:00
5a4069f3aa
Refactor network creation and initialization into strategies
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 22:26:07 -08:00
9876e5b890
Export functions of nsinit
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 21:14:21 -08:00
67d55860a5
Remove Vagrantfile and remove it from all docs
...
This removes the Vagrantfile and updates the documentation to remove
the steps which explain how to install Docker in a VM via Vagrant.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-02-22 03:25:32 +02:00
2419e63d24
Initial commit of libcontainer running docker
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 17:23:49 -08:00
332755b99d
Pass tty master to Exec
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 16:40:32 -08:00
c8fd81c278
Pass pipes into Exec function
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 16:28:43 -08:00
a352ecb01a
Use lookup path for init
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 16:17:18 -08:00
f36d455144
Merge pull request #4245 from manuel-woelker/docs-remote-api
...
Added some documentation for the JSON params in the /containers/create and /containers/(id)/start remote APIs
2014-02-22 10:15:20 +10:00
ba025cb75c
User os.Args[0] as name to reexec
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 15:32:50 -08:00
50c752fcb0
Add good logging support to both sides
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 14:56:17 -08:00
7f247e7006
Move tty into container.json
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 14:56:17 -08:00
6b2e963ce0
Refactor the flag management for main
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 14:56:17 -08:00
1316007e54
Make nsinit a proper go pkg and add the main in another dir
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 14:56:17 -08:00
66baa0653b
Make sure to close the pipe upon ctrl-d
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-02-21 14:56:17 -08:00
1a4fb09219
Handle non-tty mode
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-02-21 14:56:17 -08:00
83dfdd1d95
Minor cleanup
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-02-21 14:56:17 -08:00
8dec4adcb3
Use a custom pipe instead of stdin for sync net namespace
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-02-21 14:56:16 -08:00
b519d3ea5a
Use flag for init
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-02-21 14:56:16 -08:00
7020e208c7
Move rest of cgroups functions into cgroups pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 14:56:16 -08:00
3cb698125d
Change IP to address because it includes the subnet
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 14:56:16 -08:00
c442586305
Refactory cgroups into general pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 14:56:16 -08:00
f00f374138
Remove clone_vfork
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 14:56:16 -08:00
5f84738ef1
Revert "WIP for setup kmsg"
...
This reverts commit 80db9a918337c4ae80ffa9a001da13bd24e848c8.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 14:56:16 -08:00
664fc54e65
libcontainer: Initial version of cgroups support
...
This is a minimal version of raw cgroup support for libcontainer.
It has only enough for what docker needs, and it has no support
for systemd yet.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-02-21 14:56:16 -08:00
f0b4dd6e58
WIP for setup kmsg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 14:56:16 -08:00
e133d895a6
Remove privileged.json config
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 14:56:16 -08:00
70593be139
Add comments to many functions
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 14:56:16 -08:00
e0ff0f4dd6
Add CAP_NET_ADMIN
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 14:56:16 -08:00
3a97fe27d8
Update readme and add TODO
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 14:56:16 -08:00
d84feb8fe5
Refactor to remove cmd from container
...
Pass the container's command via args
Remove execin function and just look for an
existing nspid file to join the namespace
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 14:56:16 -08:00
420b5eb211
Add execin function to running a process in a namespace
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 14:56:16 -08:00
5d62916c48
Refactor large funcs
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 14:56:16 -08:00
f3c48ec584
OSX compilation
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@dotcloud.com > (github: creack)
2014-02-21 14:56:16 -08:00
61a119220d
General cleanup of libcontainer
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 14:56:16 -08:00
5428964400
Add dynamic veth name
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 14:56:16 -08:00
34671f2010
Implement init veth creation
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 14:56:15 -08:00
7bc3c01250
Simplify namespaces with only nsinit
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 14:56:15 -08:00
e25065a6b1
Use nsinit as app
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 14:56:15 -08:00
18f06b8d16
Fix ptmx issue on libcontainer
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-02-21 14:56:15 -08:00
93d41e53ae
Improve general quality of libcontainer
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-02-21 14:56:15 -08:00
1142945769
Use nsinit for setting up namespace
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 14:56:15 -08:00
72e65b654b
WIP moving to nsini
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 14:56:15 -08:00
68b049aed4
Make separate nsinit pkg for a dockerinit like init
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 14:56:15 -08:00
e8abaf217b
Initial commit of libcontainer
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 14:56:15 -08:00
75e62a60a2
Merge pull request #4284 from crosbymichael/refactor-tty
...
Move tty into drivers
2014-02-22 00:09:54 +02:00
aac702727e
Move current tty and pipe impl to lxc driver
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 13:27:34 -08:00
8e2284aaa2
Add CloseWriters back and do an interface cast
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 12:52:18 -08:00
592c2f6f9a
Move term creation into driver
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 12:42:37 -08:00
1e74287698
Change Console to Terminal
...
Move creation and attach to driver
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 12:32:14 -08:00
8c783c1c13
Move console into execdriver
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-21 11:47:53 -08:00
36fd9f3c53
Merge pull request #4280 from dpb587/bugfix-mtu-typo
...
Fix argument usage typo for docker --mtu
2014-02-21 10:59:42 -08:00
0c8c87d9ff
Merge pull request #4277 from SvenDowideit/tianon-made-me-doit
...
small update to API docs to go with #4276
2014-02-21 10:57:51 -08:00
afb565e97c
Drop -mtu from docs in favor of --mtu only
...
Docker-DCO-1.1-Signed-off-by: Danny Berger <dpb587@gmail.com > (github: dpb587)
2014-02-21 13:43:50 -05:00
59d9edd9f5
Merge pull request #4283 from tianon/hide-no-packages-being-tested
...
Add simple "grep" to hide the harmless "warning: no packages being tested depend on ..." in "go test -coverpkg ..." output
2014-02-21 11:40:12 -07:00
41b1f93bf7
Add simple "grep" to hide the harmless "warning: no packages being tested depend on ..." in "go test -coverpkg ..." output
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-02-21 11:26:04 -07:00
c3faab3955
docs: document some JSON parameters /containers/create and /containers/(id)/start in remote api ( fixes #2948 )
...
Docker-DCO-1.1-Signed-off-by: Manuel Woelker <github@manuel.woelker.org > (github: manuel-woelker)
2014-02-21 19:25:49 +01:00
81cd2054f6
Merge pull request #4271 from DevTable/fixbuildauth
...
Fix build auth by adding config to the build job environment
2014-02-21 13:03:31 -05:00
ab63975b8e
Merge pull request #4260 from unclejack/onbuild_fixes
...
forbid chained onbuild, from & maintainer triggers
2014-02-21 12:50:40 -05:00
8c4160fe61
Fix cli argument usage typo for docker --mtu
...
Docker-DCO-1.1-Signed-off-by: Danny Berger <dpb587@gmail.com > (github: dpb587)
2014-02-21 10:51:51 -05:00
ea9dd4ca59
Merge pull request #4248 from unclejack/https_fixes
...
don't skip cert check for an example & use HTTPS
2014-02-21 10:47:44 -05:00
0db53bd2ec
Add MTU to lxc conf to make host and container MTU match
...
If you are using jumbo frames the host side of the veth was being set to
1500. Docker would set the MTU of the container side of the veth to 9001.
This would lead to a situation in which the two sides of the veth had
different MTU sizes causing issues in network traffic.
Docker-DCO-1.1-Signed-off-by: Darren Shepherd <darren.s.shepherd@gmail.com > (github: ibuildthecloud)
2014-02-21 03:02:06 -07:00
f83e553452
small update to API docs to go with #4276
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-02-21 17:42:02 +10:00
060da572d2
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)
2014-02-21 00:07:44 -07:00
4f20538f73
Merge pull request #4273 from SvenDowideit/docker-build-rm
...
reinforce that docker build --rm is a good default to use
2014-02-20 23:42:57 -05:00
e59485e148
reinforce that docker build --rm is a good default to use
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-02-21 13:51:08 +10:00
a5515d27e5
Merge pull request #4233 from deedubs/patch-1
...
FIX: Linux mint troubleshooting tip
2014-02-20 18:07:39 -08:00
2018d4f9cd
Merge pull request #4251 from tianon/add-back-grub-info
...
Add back the Ubuntu "Memory and Swap Accounting" section that was lost when the "Kernel" page was culled
2014-02-20 18:04:50 -08:00
bb368b0563
Merge pull request #4261 from amouat/patch-1
...
Fix misspelling
2014-02-20 17:13:54 -08:00
93b98c9fe3
Merge pull request #4252 from SvenDowideit/mention-scratch-image
...
lets talk about the other way to make base images
2014-02-20 17:12:36 -08:00
7aa403df75
Merge pull request #4265 from unclejack/explain_networkmanager_and_dns_problems
...
docs: explain DNS warnings & how to fix them
2014-02-21 10:48:35 +10:00
7dcbae485c
Fix build command auth by adding the auth config and registry objects to the build job environment.
...
Docker-DCO-1.1-Signed-off-by: Jake Moshenko <jake@devtable.com > (github: jakedt)
2014-02-20 19:22:13 -05:00
90b0cce07b
Fix registry auth by storing the string passed on the command line, and allowing for credential selection by normalizing on hostname. Also, remove remote ping calls from CmdPush and CmdPull.
...
Docker-DCO-1.1-Signed-off-by: Jake Moshenko <jake@devtable.com > (github: jakedt)
2014-02-20 18:32:33 -05:00
a6909084e9
Merge pull request #3845 from alexlarsson/tar-caps
...
Implement capabilitiy bit storage in layers
2014-02-20 12:01:34 -08:00
b829e96cde
forbid chained onbuild, from & maintainer triggers
...
This changes the way onbuild works:
- forbids the chaining of onbuild instructions
- forbids the use of `onbuild from`
- forbids the use of `onbuild maintainer`
It also makes docker throw errors when encountering such triggers when
executing the triggers during `FROM`.
Three tests have been added:
- ensure that chained onbuild (`onbuild onbuild`) is forbidden
- ensure that `onbuild from` is forbidden
- ensure that `onbuild maintainer` is forbidden
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-02-20 20:31:04 +02:00
cae554b32e
docs: explain DNS warnings & how to fix them
...
This explains how to fix the DNS warnings on Ubuntu and why they're
shown.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-02-20 19:53:05 +02:00
937ea1d380
Don't call applyVolumesFrom on containers with volumes already configured ( closes #2973 )
...
Docker-DCO-1.1-Signed-off-by: Nolan Darilek <nolan@thewordnerd.info > (github: ndarilek)
2014-02-20 11:18:27 -06:00
88d24df668
Fix misspelling
...
Docker-DCO-1.1-Signed-off-by: Adrian Mouat <adrian@adrianmouat.com > (github: amouat)
2014-02-20 16:55:07 +01:00
70771ad2ed
Merge pull request #4257 from jamtur01/sitever
...
Site ver for Webmaster tools
2014-02-20 09:54:29 -05:00
ef82662158
Site ver for Webmaster tools
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-02-20 08:51:39 -05:00
3b9953903b
archive: Handle capabilities in tar files
...
If a file has a security.capability set, we push this to the tar file.
This is important to handle in e.g. layer files or when copying files
to containers, as some distros (e.g. Fedora) use capability bits as
a more finegrained version of setuid bits, and thus if the capabilites
are stripped (and setuid is not set) the binaries will fail to work.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-02-20 09:23:34 +01:00
87ca750cdc
archive: Detect file changes to capability bits
...
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-02-20 09:23:34 +01:00
c8428d77fd
archive: extract xattrs from tarfiles
...
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-02-20 09:23:34 +01:00
d19e998e7a
Archive: Add Add Lgetxattr and Lsetxattr implementations
...
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-02-20 09:23:34 +01:00
9f1c69ca7b
lets talk about the other way to make base images
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-02-20 13:49:15 +10:00
d45538f243
Merge pull request #4231 from thschroeter/correct-port-range-in-os-x-install
...
Correct port range in OS X installation doc
2014-02-20 10:26:11 +10:00
42b97be441
Add back the Ubuntu "Memory and Swap Accounting" section that was lost when the "Kernel" page was culled
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-02-19 16:54:24 -07:00
73a277eb2f
don't skip cert check for an example & use HTTPS
...
This changes two URLs from http to https and it fixes a Dockerfile to
stop skipping certificate validation. It also adds the ca-certificates
package to that Dockerfile example.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-02-20 01:11:04 +02:00
6073b450e8
FIX: Linux mint troubleshooting tip
...
Package is called 'cgroup-lite' not 'cgroups-lite'. Verified on Linux Mint 16.
Ref http://packages.ubuntu.com/search?keywords=cgroup-lite
Docker-DCO-1.1-Signed-off-by: Dan Williams <me@deedubs.com > (github: deedubs)
2014-02-19 17:30:21 -05:00
16c2031137
Merge pull request #4225 from cpuguy83/4208-update_docs_to_better_explain_docker_run
...
Doc: Add basics for controlling a container's lifecycle
2014-02-19 13:31:31 -08:00
f1167096ca
Merge pull request #4226 from metalivedev/updatedocdoc
...
Update Docs doc
2014-02-19 10:36:34 -08:00
196702fbf9
update links
...
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net > (github: metalivedev)
2014-02-19 10:32:43 -08:00
ea0cce6270
Merge pull request #4048 from fabiofalci/test_integration_coverage
...
Collect package coverage information when running integration tests
2014-02-19 10:44:13 -07:00
b3d5e9527a
Package coverage when running integration tests
...
If coverpkg is missing on `go test` command, only the current package
will be covered. That's the case of unit tests. For integration tests
we need to explicitly declare each package.
Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com > (github: fabiofalci)
2014-02-19 16:59:51 +00:00
8a289a8a54
Correct port range in OS X installation doc
...
Docker-DCO-1.1-Signed-off-by: Thomas Schroeter <thschroeter@gmail.com > (github: thschroeter)
2014-02-19 11:21:29 +00:00
05c692d64e
Update the documentation docs with new branch information.
...
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net > (github: metalivedev)
2014-02-18 19:21:12 -08:00
6dc2f55136
Add basics for controlling a container's lifecycle
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
2014-02-18 22:11:29 -05:00
d0f4bc7cca
Merge pull request #4223 from SvenDowideit/update-boot2docker-repo
...
we moved the boot2docker repo
2014-02-18 17:42:59 -08:00
e2da84ee63
we moved the repo
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-02-19 11:35:58 +10:00
ba3cbeb86b
Merge pull request #4173 from SvenDowideit/add-most-spacing-to-headers
...
add a little space above h2->h6 - it gets a bit dense in there when there are lots of steps
2014-02-18 16:55:10 -08:00
113629efb1
Merge pull request #4011 from crosbymichael/add-netlink-functions
...
Add more netlink functions
2014-02-18 19:37:52 -05:00
ab8e0d1f84
Merge pull request #4218 from crosbymichael/merge_release_v0.8.1
...
Merge release v0.8.1
2014-02-18 19:37:26 -05:00
2845c798d6
Merge pull request #4207 from crosbymichael/bump_v0.8.1
...
Bump to version 0.8.1
2014-02-18 19:22:30 -05:00
97ed268a82
Change version to v0.8.1
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-18 16:01:04 -08:00
961023b873
Merge remote-tracking branch 'origin/release' into merge_release_v0.8.1
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-18 16:00:38 -08:00
1308673965
Merge pull request #4210 from cpuguy83/4208-update_docs_to_better_explain_docker_run
...
Add extra info regarding docker run funcationality
2014-02-18 15:44:26 -08:00
a1598d1e1c
Bump to version 0.8.1
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-18 12:36:05 -08:00
836a49a46e
Merge pull request #4114 from SvenDowideit/update-sshd-example
...
update the sshd example to use just a Dockerfile
2014-02-18 12:12:52 -08:00
349adf4d4d
Add extra info regarding docker run funcationality
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
2014-02-18 15:08:09 -05:00
3a2fa54857
Merge pull request #4147 from float64/patch-1
...
Env Clarification
2014-02-18 12:07:39 -08:00
57c4f7185d
Merge pull request #2980 from SvenDowideit/1439-add-registry-repository-terms
...
my attempt to disentagle repository and registry
2014-02-18 11:26:45 -08:00
c14c539c6c
Merge pull request #4145 from SvenDowideit/redo-python-example
...
touch up the examples
2014-02-18 11:08:45 -08:00
049c7effe9
Merge branch 'master' into bump_v0.8.1
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-18 10:51:19 -08:00
277262d9c7
Merge pull request #4205 from tianon/fix-dyntest
...
Fix dyntest problems finding dockerinit
2014-02-18 11:50:16 -07:00
b10cfaef62
Merge pull request #4206 from tianon/ubuntu-conflicts
...
Add "Conflicts" to our lxc-docker package
2014-02-18 11:49:47 -07:00
6d1c0a91f8
Add "Conflicts" to our lxc-docker package to make it more clear that we can't/shouldn't be installed alongside either "docker" or "docker.io"
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-02-18 11:24:33 -07:00
6ccb30a0e5
Fix dyntest problems finding dockerinit
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-02-18 11:23:37 -07:00
6af6b72023
Merge pull request #4198 from alexlarsson/fix-setuid
...
archive: Fix the storing of setuid bits, etc
2014-02-18 13:11:32 -05:00
311cb5ca45
Reword - one sentence :-)
...
Docker-DCO-1.1-Signed-off-by: Matthias Kühnle <git.nivoc@neverbox.com > (github: float64)
2014-02-18 16:04:47 +01:00
c1dfc63845
Updated environment description
...
.. to make it even more clear that this env variables are there because of the --link option.
Docker-DCO-1.1-Signed-off-by: Matthias Kühnle <git.nivoc@neverbox.com > (github: float64)
2014-02-18 12:47:44 +01:00
d73d3b03e4
Reworded description of the environment variables
...
Removed the "test now..." b/c the code example is only about inspection
of env-variables.
Test follows in the next section.
Docker-DCO-1.1-Signed-off-by: Matthias Kühnle <git.nivoc@neverbox.com > (github: float64)
2014-02-18 12:36:14 +01:00
8a3cb0c65e
Fixed misspelling
...
Docker-DCO-1.1-Signed-off-by: Matthias Kühnle <git.nivoc@neverbox.com > (github: float64)
2014-02-18 11:38:23 +01:00
a7f1b74dd8
Env Clarification
...
Clarified that the env variables here are an example output of env. The user should not set them to the example values.
Docker-DCO-1.1-Signed-off-by: Matthias Kühnle <git.nivoc@neverbox.com > (github: float64)
2014-02-18 11:36:46 +01:00
a049e93a4c
try out @metalivedev's suggestion, including FQIN
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-02-18 20:16:09 +10:00
940c381dd5
my attempt to disentagle repository and registry (Issue #1439 )
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-02-18 20:16:08 +10:00
5ba2462961
archive: Fix the storing of setuid bits, etc
...
In commit 3dfc910d77alexl@redhat.com > (github: alexlarsson)
2014-02-18 09:53:30 +01:00
ef844adc3e
Merge pull request #4196 from mahata/fixTypo
...
Fix typo in 'Using Supervisor with Docker' example
2014-02-17 22:48:54 -05:00
68de32888b
Fix typo in 'Using Supervisor with Docker' example
...
Docker-DCO-1.1-Signed-off-by: Yasunori Mahata <mahata777@gmail.com > (github: mahata)
2014-02-17 19:43:56 -08:00
29f7e1bfcb
suggested improvements
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-02-18 13:23:28 +10:00
b05602a0fe
update a new movie: http://asciinema.org/a/7658
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-02-18 13:23:28 +10:00
f535a58959
swap busybox for ubuntu, its quicker..
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-02-18 13:23:28 +10:00
3036b5a196
rejig the helloflask example as more advanced, and move it to the end
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-02-18 13:23:28 +10:00
8f11a1a61f
Merge pull request #4193 from creack/3964-add_tar-fix
...
Fix remote tar ADD behavior
2014-02-17 20:37:42 -05:00
98ce0cdb4f
Fix remote tar ADD behavior
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-02-17 17:08:17 -08:00
5f84d7f314
execdriver flag for docker daemon
...
like the storage-driver flag, this implements a flag for choosing the
execdriver to be used, defaulting to lxc.
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
2014-02-17 20:03:53 -05:00
a3bc3bb8c3
Merge pull request #4159 from crosbymichael/move-volumes
...
Move volumes out of container.go and into volumes.go
2014-02-17 16:43:20 -08:00
e9db157bee
Merge pull request #4162 from crosbymichael/movelinks
...
Move links functionality into pkg
2014-02-17 16:34:47 -08:00
4187f4e750
Merge pull request #4168 from crosbymichael/add-listenbuffer
...
Hold connections until the daemon has fully loaded
2014-02-17 16:04:49 -08:00
045462a367
Merge pull request #4192 from crosbymichael/fix-404
...
Fix error message only if no body is retuned
2014-02-18 01:49:08 +02:00
e23190b6b3
Improve error message only if no body is returned
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-17 15:29:52 -08:00
d55cc64c4e
Revert "Merge pull request #4151 from crosbymichael/improve-404-client-message"
...
This reverts commit 6dd1bb9eb023aec9d7fcmichael@crosbymichael.com > (github: crosbymichael)
2014-02-17 15:25:00 -08:00
e743021193
Move job register into servapi
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-17 15:10:51 -08:00
518670f3d8
Merge pull request #4153 from crosbymichael/move-proxy
...
Move proxy into pkg
2014-02-17 14:51:16 -08:00
14ed82fc89
Merge pull request #4188 from unclejack/update_dns_resolver_warning
...
update warning about local dns resolvers
2014-02-17 14:39:59 -08:00
c7c825d9a5
Merge pull request #4171 from SvenDowideit/4061-remote-api-warning
...
change the -H TCP / docker group warning to not reference a resolved issue
2014-02-17 14:36:05 -08:00
66c92140c9
Merge pull request #4155 from crosbymichael/remove-reflink
...
Remove unused reflink files
2014-02-18 00:29:35 +02:00
055f1a1f81
Remove verbose logging for non errors
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-17 13:31:13 -08:00
85b8025a35
update warning about local dns resolvers
...
This changes the local DNS resolver warning to explain what the
warning is about and why the default external DNS server is used.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-02-17 23:29:36 +02:00
b7c2e8f54e
Merge pull request #3817 from philips/CONTRIBUTING-is-just-a-dco
...
fix(CONTRIBUTING): Developer Certificate of Origin w/o Grant
2014-02-17 12:28:05 -08:00
8f140b2ded
Merge pull request #4178 from alexlarsson/fix-aufs-plnk
...
archive: Handle aufs plink hardlinks in ApplyLayer
2014-02-17 11:48:39 -08:00
6889cd9f9c
archive: Handle aufs plink hardlinks in ApplyLayer
...
Files in the .wh..wh.plnk directory are ignored, but other files
inside the tarfile can be hardlinks to these files. This is not
something that normally happens, as on aufs unmount such files are
supposed to be dropped via the "auplink" too, yet images on the index
(such as shipyard/shipyard, e.g. layer
f73c835af6d58b6fc827b400569f79a8f28e54f5bb732be063e1aacefbc374d0)
contains such files.
We handle these by extracting these files to a temporary directory
and resolve such hardlinks via the temporary files.
This fixes https://github.com/dotcloud/docker/issues/3884
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-02-17 20:46:32 +01:00
24498a896f
Merge pull request #4187 from creack/fix_hostflag_panic
...
Fix DOCKER_HOST=tcp:// panic
2014-02-17 11:43:53 -08:00
2769d66f78
Merge pull request #4030 from TheDude05/fix-incorrect-ip-test
...
Fix IPv4 Subnet Test
2014-02-17 14:41:33 -05:00
513d864880
Fix DOCKER_HOST=tcp:// panic
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-02-17 11:35:26 -08:00
581ee7e584
Merge pull request #4186 from crosbymichael/netlink-maintainer
...
Make crosbymichael and creack netlink maintainers
2014-02-17 11:19:55 -08:00
a75c6907b4
Make crosbymichael and creack netlink maintainers
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-17 11:17:05 -08:00
f3ff190491
Merge pull request #4131 from tianon/vendor-golang-xattrs
...
Add vendored archive/tar that includes xattrs patch
2014-02-17 21:12:28 +02:00
19e44217f5
Merge pull request #4167 from shykes/fix-tests-mac
...
Fix or document broken tests on mac
2014-02-17 11:01:17 -08:00
f056a5d8c5
Merge pull request #4163 from mzdaniel/docker-ci
...
docker-ci 0.5.6: Fully dockerize docker-ci. Add build test coverage. Add backup builder.
2014-02-17 18:56:32 +00:00
032f45683b
Merge pull request #4185 from tmc/fix-building-with-space
...
Quote volume path in Makefile to allow spaces
2014-02-17 11:53:41 -07:00
bc286d651d
Merge pull request #4172 from fabiofalci/test_save_and_load
...
Test for save and load commands
2014-02-17 13:52:44 -05:00
b7db2d5f80
docker-ci 0.5.6: Fully dockerize docker-ci. Add build test coverage. Add backup builder.
...
Docker-DCO-1.1-Signed-off-by: Daniel Mizyrycki <daniel@docker.com > (github: mzdaniel)
2014-02-17 10:52:39 -08:00
382659e03a
Merge pull request #4113 from SvenDowideit/build-quiet-help
...
add a little reenforcement to the help for docker build -q
2014-02-17 10:38:43 -08:00
a1fb3b5282
Merge pull request #3463 from songgao/patch-2
...
Support submodules when building from a gh repo
2014-02-17 10:28:17 -08:00
5006509131
Quote volume path to allow spaces
...
Docker-DCO-1.1-Signed-off-by: Travis Cline <travis.cline@gmail.com > (github: tmc)
2014-02-17 10:24:50 -08:00
1f66296c6e
Merge pull request #4180 from alexlarsson/fix-restart-race
...
Avoid temporarily unmounting the container when restarting it
2014-02-17 13:21:53 -05:00
c9ae66ffe3
Support submodules when building from a gh repo
...
Docker-DCO-1.1-Signed-off-by: Song Gao <song@gao.io > (github: songgao)
2014-02-17 12:08:23 -06:00
59e88b0967
Merge pull request #4164 from fabiofalci/cp_error_message
...
`docker cp` error when container doesn't exist
2014-02-17 19:13:55 +02:00
b762d3a739
Add vendored archive/tar that includes xattrs patch
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-02-17 08:20:21 -07:00
ab49015523
Merge pull request #4061 from mikemaccana/patch-1
...
Add dockerode NodeJS implementation
2014-02-17 10:14:17 -05:00
ab0f3f86c8
Avoid temporarily unmounting the container when restarting it
...
Stopping the container will typicall cause it to unmount, to keep it mounted
over the stop/start cycle we aquire a temporary reference to it during this time.
This helps with https://github.com/dotcloud/docker/issues/4036
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-02-17 16:10:54 +01:00
02d94dcf6e
Add dockerode NodeJS implementation
...
Also correctly case 'JavaScript'
Docker-DCO-1.1-Signed-off-by: Mike MacCana <mike.maccana@gmail.com > (github: mikemaccana)
2014-02-17 14:04:47 +00:00
6a5a1d44f5
add a little space above h2->h6 - it gets a bit dense in there when there are lots of steps
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-02-17 12:24:19 +10:00
4ab3c31b15
Test for save and load commands
...
Improve test for save to tar and load from tar commands.
Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com > (github: fabiofalci)
2014-02-17 01:52:50 +00:00
797b7d3446
add a little reenforcement to the help for docker build -q
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-02-17 11:35:55 +10:00
8871fd3a31
change the -H TCP / docker group warning to not reference a resolved issue
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-02-17 10:02:23 +10:00
a51441278a
docker cp error when container doesn't exist
...
Fix cp api to return a 404 notfound if container doesn't exist.
Fixes #4119 .
Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com > (github: fabiofalci)
2014-02-16 15:49:36 +00:00
d5e41c1cb6
Change name to listenbuffer
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-15 21:10:37 -08:00
778f1bf663
Integration generic socket wait for docker api
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-15 20:49:50 -08:00
64716a21e4
Use socket activation pkg for listeners
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-15 20:24:55 -08:00
cfb7711a74
Add socket activation for go apps
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-15 20:18:47 -08:00
72ed2537b3
Merge pull request #4107 from shykes/separate-api-client
...
Move remote API client out of the core and into api/
2014-02-15 18:56:49 -05:00
4bc966f302
Merge pull request #4102 from shykes/separate-mkbuildclient
...
Refactor utility `MkBuildContext` to the more generic `archive.Generate`
2014-02-15 18:27:13 -05:00
44e10433c7
api/container.go: an API-specific representation of a container
...
This breaks the dependency from the remote API implementation to the
internal representation of a container. Instead it uses its own partial
representation of a container, with only required fields.
* This preserves reverse-compatibility with all past implementations of the remote API.
* This clarifies which fields are guaranteed to be present in a response
A docker remote api server *may* return more fields in a Container
object, but their presence and semantics are not guaranteed and should
not be relied upon by client implementations.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-02-15 23:24:51 +00:00
567a422a65
Remove duplicate function displayablePorts
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-02-15 14:55:57 -08:00
ee59ba969f
Move remote api client to api/
...
This moves `commands.go` out of the core and into `api/client.go`
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-02-15 14:55:51 -08:00
9b56da78e0
Refactor utility MkBuildContext to the more generic archive.Generate
...
This facilitates refactoring commands.go.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-02-15 14:52:08 -08:00
7286842a12
Document Darwin test failure in a FIXME
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-02-15 14:40:07 -08:00
353cc8c2a5
Fix engine tests on systems where temp directories are symlinked.
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-02-15 14:39:51 -08:00
147b09fae9
Move links to sub pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-14 18:18:16 -08:00
fc952e0de9
Remove container dependency for links
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-14 18:07:33 -08:00
a7ecc3ea11
Merge pull request #4160 from crosbymichael/cleanup-exec-drivers
...
Cleanup some statements from exec driver work
2014-02-14 17:32:01 -08:00
9e3da87a3a
Cleanup some statements from exec driver work
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-14 17:28:50 -08:00
bd54d40f68
Move volumes out of container.go and into volumes.go
...
This helps clean up the container file and move volumes into
one location. We currently cannot move volumes to a sub pkg
because they depend on Container and also modify fields on the
container.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-14 17:15:40 -08:00
8c39db8f96
Move proxy into pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-14 15:48:05 -08:00
055bfb699b
Remove unused reflink files
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-14 15:32:39 -08:00
072268ae56
Merge pull request #4152 from crosbymichael/update-fixme
...
Update fixme
2014-02-14 15:19:16 -08:00
106079daca
Update fixme
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-14 15:17:12 -08:00
1140411d4c
Merge branch 'add-netlink-functions' of github.com:crosbymichael/docker into add-netlink-functions
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-14 12:13:09 -08:00
17719cab91
Add new functions to unsupported file
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-14 12:12:35 -08:00
6dd1bb9eb0
Merge pull request #4151 from crosbymichael/improve-404-client-message
...
Improve error message for 404 returned by daemon
2014-02-14 11:57:56 -08:00
190504472b
Improve error message for 404 returned by daemon
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-14 11:56:52 -08:00
23aec9d7fc
Merge pull request #4010 from tianon/iceweasel
...
Swap Firefox to Iceweasel so that the Desktop Integration example is simplified and easier to understand
2014-02-14 21:38:40 +02:00
d3a2c15a5d
Merge pull request #4146 from alexlarsson/clean-up-archive-closing
...
Clean up archive closing
2014-02-14 13:48:26 -05:00
d8c888b3f8
Drop EofReader
...
This is not used any more
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-02-14 13:46:21 +01:00
f198ee525a
Properly close archives
...
All archive that are created from somewhere generally have to be closed, because
at some point there is a file or a pipe or something that backs them. So, we
make archive.Archive a ReadCloser. However, code consuming archives does not
typically close them so we add an archive.ArchiveReader and use that when we're
only reading.
We then change all the Tar/Archive places to create ReadClosers, and to properly
close them everywhere.
As an added bonus we can use ReadCloserWrapper rather than EofReader in several places,
which is good as EofReader doesn't always work right. For instance, many compression
schemes like gzip knows it is EOF before having read the EOF from the stream, so the
EofCloser never sees an EOF.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-02-14 13:46:17 +01:00
804690bd07
archive.TarFilter() - properly close readers
...
CompressStream() now always returns a stream that is closable, and it never
closes the underlying writer. TarFilter() makes sure the decompressed stream
is closed at the and, as well as the PipeWriter.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-02-14 12:56:55 +01:00
0d9213f859
archive: Close decompressed streams
...
Various kinds of decompressed streams are really ReadClosers. For instance
gzip.NewReader() is, and the one returned from CmdStream is changed to be
because it returns a PipeReader which is a ReadCloser.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-02-14 12:56:55 +01:00
32535e0b82
Merge pull request #4123 from tianon/darwin-shasum
...
Add shasum fallback to hack/make/dynbinary for Darwin
2014-02-13 21:20:49 -07:00
a6182dc62e
update the sshd example to use just a Dockerfile
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-02-14 13:27:58 +10:00
7aff7cc4bb
Merge pull request #4135 from creack/console_support
...
Mount-bind the PTY as container console - allow for tmux/screen to run
2014-02-14 03:47:33 +02:00
1b8ec8ff1d
Merge pull request #4134 from crosbymichael/fix-add-magic-regression
...
Fix regression with ADD of tar files
2014-02-14 03:43:39 +02:00
968f4800b5
Merge pull request #4128 from vieux/fix_header_content-type_api
...
Fix header content type api
2014-02-13 20:29:09 -05:00
408ea0771a
Mount-bind the PTY as container console - allow for tmux/screen to run
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-02-13 17:23:09 -08:00
cad7f7ee50
Fix regression with ADD of tar files
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-13 17:18:38 -08:00
a4d1da709e
Merge pull request #4120 from apocas/master
...
Image tag endpoint HTTP code typo
2014-02-13 15:49:45 -08:00
cc14441845
Merge pull request #4093 from stpierre/mkimage-yum
...
Fix bogus variable reference in mkimage-yum.sh
2014-02-13 15:28:47 -07:00
da3a52746b
hack/RELEASE: add step for updating doc branch
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: google)
2014-02-13 12:01:55 -08:00
8d2a2ed457
Merge pull request #4125 from maxamillion/maxamillion/add_redhat_sysvinit
...
Remove unneeded sysctl changes in sysvinit-redhat init script
2014-02-13 12:53:53 -07:00
6cb0a7e04e
Merge pull request #4108 from unclejack/remove_default_tcp_bind_address
...
disallow tcp:// from defaulting to 127.0.0.1:4243
2014-02-13 11:44:31 -08:00
0b403b3531
fix content-type for legacy
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-13 19:24:40 +00:00
4611a6bdd3
fix content-type for job.Stdout.Add
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-13 19:21:27 +00:00
9997d0c9ed
Merge pull request #4062 from alexlarsson/clean-shutdown
...
devmapper: Fix shutdown warnings
2014-02-13 10:45:03 -08:00
6f10f33387
Merge pull request #4103 from vieux/add_error_build-rm
...
add error to docker build --rm
2014-02-13 10:35:55 -08:00
4317011e21
remove unneeded sysctl changes in sysvinit-redhat init script
...
Docker-DCO-1.1-Signed-off-by: Adam Miller <admiller@redhat.com > (github: maxamillion)
2014-02-13 12:11:38 -06:00
3417dd4b3b
Image tag endpoint doc typo.
...
Docker-DCO-1.1-Signed-off-by: Pedro Dias <petermdias@gmail.com > (github: apocas)
2014-02-13 18:11:07 +00:00
3f1e6b6368
Merge pull request #4096 from alexlarsson/fix-devmapper-race-2
...
Avoid extra mount/unmount during build
2014-02-13 12:53:29 -05:00
c7840f522c
Add shasum fallback to hack/make/dynbinary for Darwin (where sha1sum is not available)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-02-13 10:27:45 -07:00
f794fbc230
Merge pull request #4043 from tianon/hack-git-detection-and-use
...
Add better ".git" detection and use
2014-02-13 09:56:14 -07:00
47df7a360a
Merge pull request #4056 from alexlarsson/fix-devmapper-test
...
devicemapper: Fix tests on fedora
2014-02-13 15:06:50 +02:00
c6edac9a1a
Merge pull request #4073 from crosbymichael/fix-docker-cp-close
...
Ensure docker cp stream is closed properly
2014-02-13 14:12:53 +02:00
31dde3ea05
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)
2014-02-13 13:54:37 +02:00
cddea301ab
Merge pull request #4111 from merriam/patch-4
...
Minor error in example code (resubmit #4109 )
2014-02-12 18:34:17 -08:00
9d75155459
Merge pull request #4112 from merriam/patch-3
...
(resubmit #4110 ) Add notes about OS/X and remote daemons
2014-02-12 18:33:11 -08:00
ba650e0517
Minor error in example code (resubmit #4109 )
...
Docker-DCO-1.1-Signed-off-by: Charles Merriam <charles.merriam@gmail.com > (github: merriam)
2014-02-12 18:13:46 -08:00
2a17bdce9e
(resubmit) Add notes about OS/X and remote daemons
...
Docker-DCO-1.1-Signed-off-by: Charles Merriam <charles.merriam@gmail.com > (github: merriam)
2014-02-12 18:11:01 -08:00
989fee2490
Merge pull request #4090 from SvenDowideit/add-install-make-git-to-devenv
...
tell the reader that they need git and make for this tutorial
2014-02-12 15:48:39 -08:00
a895c7238d
add error to docekr build --rm
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-12 23:23:42 +00:00
9fd44cb569
Merge pull request #8 from creack/implement_create_veth
...
Simplify code + Allow more generic attr children + remove prefix
2014-02-12 13:33:29 -05:00
3a7f69a3d8
Merge branch 'implement_create_veth' of https://github.com/creack/docker into add-netlink-functions
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-12 10:25:06 -08:00
e7f91a6456
Merge pull request #3947 from maxamillion/maxamillion/add_redhat_sysvinit
...
Add sysvinit/sysconfig files for redhat family of distros (RHEL/CentOS/SL/etc.)
2014-02-12 11:11:42 -07:00
e36d4d8821
Merge branch 'master' into maxamillion/add_redhat_sysvinit
...
* master: (64 commits)
Move the canonical run configuration objects to a sub-package
Remove useless code in client implementation of 'run'.
pkg/opts: a collection of custom value parsers implementing flag.Value
Move api-specific code to the api package
Fix the tests, too
Fix the one spot I missed dockerversion
fix underline/heading
New package `nat`: utilities for manipulating the text description of network ports.
rewrite the PostgreSQL example using a Dockerfile, and add details to it
Move even more stuff into dockerversion
fix underline/heading
Move docker version introspection to a sub-package.
add port forwarding notes for mac/boot2docker docs
Update remote_api_client_libraries.rst
Avoid extra mount/unmount during container registration
add a little more information about the docker run -P option
lxc: Drop NET_ADMIN capability in non-privileged containers
devmapper: Remove directory when removing devicemapper device
add a little info on upgrading
point out that ENV DEBIAN_FRONTEND will persist, so its not recommended
...
2014-02-12 12:04:02 -06:00
2222cba5ac
Added sysvinit/sysconfig files for redhat family of distros (RHEL/CentOS/SL/etc.)
...
Docker-DCO-1.1-Signed-off-by: Adam Miller <admiller@redhat.com > (github: maxamillion)
2014-02-12 12:03:32 -06:00
38e5b4e70f
Simplify code + Allow more generic attr children + remove prefix
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-02-12 09:29:06 -08:00
e941111f33
Merge pull request #7 from creack/implement_create_veth
...
Implement create veth
2014-02-12 11:37:27 -05:00
59347fa66d
Avoid extra mount/unmount during build
...
CmdRun() calls first run() and then wait() to wait for it to exit,
then it runs commit(). The run command will mount the container and
the container exiting will unmount it. Then the commit will
immediately mount it again to do a diff.
This seems minor, but this is actually problematic, as the Get/Put
pair will create a spurious mount/unmount cycle that is not needed and
slows things down. Additionally it will create a supurious
devicemapper activate/deactivate cycle that causes races with udev as
seen in https://github.com/dotcloud/docker/issues/4036 .
To ensure that we only unmount once we split up run() into create()
and run() and reference the mount until after the commit().
With this change docker build on devicemapper is now race-free, and
slightly faster.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-02-12 16:02:53 +01:00
85263cdee8
Fix bogus variable reference in mkimage-yum.sh
...
Fixes this: https://github.com/dotcloud/docker/commit/d419da7227826e84e9375ece4fd9d4978a42cbf7#commitcomment-5344982
Docker-DCO-1.1-Signed-off-by: Chris St. Pierre <chris.a.st.pierre@gmail.com > (github: stpierre)
2014-02-12 08:02:36 -05:00
dce7b6a69c
Merge remote-tracking branch 'mike/add-netlink-functions' into implement_create_veth
...
Conflicts:
pkg/netlink/netlink_linux.go
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-02-12 04:17:12 -08:00
2d2c237f50
Implement create veth
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-02-12 04:09:56 -08:00
d9f215eb2a
tell the reader that they need git and make for this tutorial
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-02-12 16:30:18 +10:00
d3c084beee
Merge pull request #4085 from shykes/separate-config-hostconfig
...
Move canonical run configuration objects to a sub-package
2014-02-11 23:37:40 -05:00
19755bcdae
Merge pull request #4089 from shykes/autopull-useless-code
...
Remove useless code in client implementation of 'run'.
2014-02-11 23:23:12 -05:00
6393c38339
Move the canonical run configuration objects to a sub-package
...
* Config is now runconfig.Config
* HostConfig is now runconfig.HostConfig
* MergeConfig is now runconfig.Merge
* CompareConfig is now runconfig.Compare
* ParseRun is now runconfig.Parse
* ContainerConfigFromJob is now runconfig.ContainerConfigFromJob
* ContainerHostConfigFromJob is now runconfig.ContainerHostConfigFromJob
This facilitates refactoring commands.go and shrinks the core.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-02-11 20:18:46 -08:00
e3140e1e69
Remove useless code in client implementation of 'run'.
...
This facilitates refactoring commands.go.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-02-11 20:16:58 -08:00
9a9690360c
Merge pull request #4074 from shykes/separate-version
...
Move docker version introspection to a sub-package.
2014-02-11 20:16:00 -08:00
28e4de8bfa
Merge pull request #4083 from shykes/api-validate-host
...
Move api-specific code to the api package
2014-02-11 20:10:35 -08:00
0dc9c5531e
Merge pull request #76 from tianon/fix-broken-eagle-tests
...
Fix the tests, too
2014-02-11 20:07:47 -08:00
e6e320acc7
pkg/opts: a collection of custom value parsers implementing flag.Value
...
This facilitates the refactoring of commands.go.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-02-11 19:59:52 -08:00
e08a1c53aa
Move api-specific code to the api package
...
This facilitates the refactoring of commands.go.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-02-11 19:59:52 -08:00
0d871840b2
Fix the tests, too
...
Seriously. There's not much codebase left we haven't touched.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-02-11 19:10:23 -07:00
6da1e092dc
Merge pull request #4079 from shykes/separate-nat
...
New package `nat`: utilities for manipulating the text description of network ports
2014-02-11 20:45:58 -05:00
b609e28e5c
Merge pull request #75 from tianon/fix-my-broken-eagle
...
Fix the one spot I missed dockerversion
2014-02-11 17:32:11 -08:00
7ea725fdc5
Fix the one spot I missed dockerversion
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-02-11 18:23:17 -07:00
6fd8e5d976
fix underline/heading
...
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net > (github: metalivedev)
2014-02-11 16:53:08 -08:00
3ecd8ff0c8
New package nat: utilities for manipulating the text description of network ports.
...
This facilitates the refactoring of commands.go
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-02-11 16:51:01 -08:00
e9e4b8dc15
Merge pull request #4034 from SvenDowideit/postgres-example
...
rewrite the PostgreSQL example using a Dockerfile, and add details to it
2014-02-11 16:49:22 -08:00
6b925a4991
Merge pull request #4050 from SvenDowideit/put-back-LGTM
...
bring back the explanation of our LGTM process
2014-02-12 10:41:49 +10:00
619ad84216
Merge pull request #74 from tianon/more-separate
...
Move even more stuff into dockerversion
2014-02-11 16:37:27 -08:00
2ed2ba4e8c
rewrite the PostgreSQL example using a Dockerfile, and add details to it
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-02-12 10:30:57 +10:00
7396741757
Merge pull request #3988 from dafyddcrosby/fix_formatting
...
Fix RST formatting
2014-02-11 16:30:21 -08:00
7fe8b50e2e
Merge pull request #4057 from SvenDowideit/add-P-docs
...
add a little more information about the docker run -P option
2014-02-11 16:27:25 -08:00
da04f49b38
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)
2014-02-11 17:26:54 -07:00
ff2260099a
Merge pull request #4054 from SvenDowideit/boot2docker-upgrade-doc
...
add a little info on upgrading b2d
2014-02-11 16:23:11 -08:00
c76a4e3489
fix underline/heading
2014-02-11 16:19:42 -08:00
3122b4b470
Merge pull request #4020 from cameronboehmer/patch-1
...
add vm port forwarding note/example in osx install docs
2014-02-11 16:18:54 -08:00
0bcabdbdc7
Merge pull request #4072 from 13W/patch-1
...
Update remote_api_client_libraries.rst
2014-02-11 16:14:22 -08:00
ae3c7dec3b
Move docker version introspection to a sub-package.
...
This facilitates the refactoring of commands.go.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-02-11 16:10:51 -08:00
9176b6fd88
Merge pull request #4035 from SvenDowideit/dont-env-debian-frontend
...
point out that ENV DEBIAN_FRONTEND will persist, so its not recommended
2014-02-11 15:59:10 -08:00
49b928c0b0
add port forwarding notes for mac/boot2docker docs
...
Docker-DCO-1.1-Signed-off-by: Cameron Boehmer <cameron.boehmer@gmail.com > (github: cameronboehmer)
2014-02-11 15:26:12 -08:00
d35b03ef8d
Update remote_api_client_libraries.rst
...
hello, add please my interface
Docker-DCO-1.1-Signed-off-by: Vladimir <xx@ccxx.cc > (github: 13w)
2014-02-12 01:09:06 +02:00
da3e539133
Merge pull request #4067 from alexlarsson/fix-devmapper-race
...
Avoid extra mount/unmount during container registration
2014-02-11 17:13:33 -05:00
a66124ec6a
Merge pull request #4055 from alexlarsson/remove-devmapper-dirs
...
devmapper: Remove directory when removing devicemapper device
2014-02-11 17:05:56 -05:00
2a9a83cf94
Merge pull request #4049 from vieux/fix_commit
...
fix --run in docker commit
2014-02-11 22:33:27 +02:00
029a045ef5
Merge pull request #3990 from 1uptalent/3989-fix-textmate-syntax
...
Fix textmate syntax bundler organization
2014-02-11 13:16:26 -07:00
3c215ba410
Merge pull request #4059 from alexlarsson/no-netadmin-caps
...
lxc: Drop NET_ADMIN capability in non-privileged containers
2014-02-11 14:20:34 -05:00
0c71015dcf
Avoid extra mount/unmount during container registration
...
Runtime.Register() called driver.Get()/Put() in order to read back the
basefs of the container. However, this is not needed, as the basefs
is read during container.Mount() anyway, and basefs is only valid
while mounted (and all current calls satisfy this).
This seems minor, but this is actually problematic, as the Get/Put
pair will create a spurious mount/unmount cycle that is not needed and
slows things down. Additionally it will create a supurious
devicemapper activate/deactivate cycle that causes races with udev as
seen in https://github.com/dotcloud/docker/issues/4036 .
With this change devicemapper is now race-free, and container startup
is slightly faster.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-02-11 18:02:30 +01:00
35821ad78f
Ensure docker cp stream is closes properly
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-11 06:21:53 -08:00
6128dcea4a
devmapper: Remove byHash hack
...
We no longer pass "pool" anywhere that uses byHash() per the last
commit, so we can now remove this hack.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-02-11 13:02:00 +01:00
eab270395e
devmapper: Fix shutdown warnings
...
Shutdown contains debug warnings like:
[debug] deviceset.go:699 [deviceset docker-0:33-17945897] waitRemove(/dev/mapper/docker-0:33-17945897-pool)
[debug] deviceset.go:380 libdevmapper(3): libdm-common.c:552 (-1) Device /dev/mapper/docker-0:33-17945897-pool not found
This is because shutdown is using removeDeviceAndWait() to remove the pool device and the
wait part fails because the pool is gone.
We fix this by adding a pool specific removal function which avoids all the trickiness of the
normal remove.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-02-11 12:47:59 +01:00
34f5d94b2c
Merge branch 'add-netlink-functions' of github.com:crosbymichael/docker into add-netlink-functions
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-11 03:33:18 -08:00
2205707084
Merge pull request #5 from tianon/null-terminators-are-important
...
Add comment clarifying null termination
2014-02-11 12:33:07 -05:00
c626349f65
Add comment clarifying null termination
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-02-11 10:32:31 -07:00
27ed9a9f98
Exec out to ip right now for creating the veth pair
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-11 03:32:35 -08:00
b2146cb0e7
add a little more information about the docker run -P option
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-02-11 20:34:26 +10:00
02fddffd51
lxc: Drop NET_ADMIN capability in non-privileged containers
...
With this capability set the container can e.g. change the ip address
of his devices to that of another container on the docker0 bridge. In
a quick test I was able to listen to a port on a different ip than the
one docker assigned me, but was not able to hijack an open port
redirection that another container had open. Maybe its possible with
some more knowledge of networking though.
Anyway, network setup is meant to be handled by docker, not the apps,
so I believe denying this is generally in the spirit of docker, and
it closes down potential security issues.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-02-11 11:17:34 +01:00
eb4578daee
devicemapper: Fix tests on fedora
...
If /dev/loop-control exists on the system running the test then
ioctlLoopCtlGetFree() will be called, but if not it won't. It does
not exist in the standard docker build environment, so the tests
currently require this to not be called. This makes it instead
optional, allowing the tests to run on e.g. Fedora.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-02-11 09:42:34 +01:00
2343fe4453
devmapper: Remove directory when removing devicemapper device
...
We're currently leaving around lots of empty directories in
/var/lib/docker/devicemapper/mnt/ for removed images and containers.
Fix this by removing the directory when the device is removed.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-02-11 09:40:13 +01:00
f9cd1be6ff
Add more netlink functions for set ns by fd and bring iface down
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-10 22:32:07 -08:00
82863aecab
add a little info on upgrading
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-02-11 14:58:42 +10:00
c4b9e1c9ad
point out that ENV DEBIAN_FRONTEND will persist, so its not recommended
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-02-11 13:16:54 +10:00
4dec36d1ee
Allow add of empty name
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-10 16:41:16 -08:00
5051b8610d
bring back the explaination of our LGTM process
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-02-11 10:10:50 +10:00
5d29749e9d
fix --run in docker commit
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-10 23:52:15 +00:00
2975ba6f73
Merge pull request #4019 from ostezer/fix-installation-windows-doc-title
...
docs: Installation Instruction Title & Description Fixes
2014-02-10 15:26:32 -08:00
2dcb48af0f
Merge pull request #3524 from tianon/supplementary-groups
...
Add supplementary groups lookup in sysinit
2014-02-10 14:42:14 -08:00
036900a63a
Merge pull request #3871 from jdef/patch-1
...
Update lxc_template.go
2014-02-10 14:38:39 -08:00
38eabfa65c
Create veth pair via netlink
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-10 13:37:16 -08:00
10d57b648f
docs: Installation Instruction Title & Description Fixes
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
1. All titles are listed by simple platform names apart from Windows' "Installing Docker On Windows". Changed this to "Windows" to match the rest.
2. Some articles' description (and title) information does not match the majority. Modified them to match the rest (i.e. Please note this project is currently under heavy development. It should not be used in production.)
3. Removed "Linux" from Gentoo & Ubuntu descriptions.
2014-02-10 23:34:56 +02:00
63f0bbaf14
Merge pull request #4026 from crosbymichael/fix-linking-icc
...
Add bidirectional iptables rule back to links
2014-02-10 13:13:28 -08:00
0a0406450f
Add better ".git" detection and use
...
This way, packagers can set GIT_DIR appropriately if they'd prefer to not have ".git" inside their working directory.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-02-10 13:48:43 -07:00
19e01a6363
Merge pull request #3983 from creack/remove_linux_specific
...
Remove linux specific calls
2014-02-10 12:10:38 -08:00
b42e669a19
Merge pull request #4042 from crosbymichael/allow-empty-cmd
...
Improve no command handling
2014-02-10 11:53:14 -08:00
27df18ff11
Improve get if socket loop
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-10 11:36:23 -08:00
4482115840
Improve no command handling
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-10 11:04:24 -08:00
66f639e8a6
Merge pull request #4017 from alexlarsson/skip_block_zeroing
...
devmapper: Enable skip_block_zeroing
2014-02-10 10:33:37 -08:00
6174bad135
Merge pull request #4031 from tianon/gopath
...
Add slightly better GOPATH detection/handling
2014-02-10 13:06:41 -05:00
40ede286b8
Merge pull request #4013 from creack/remove_panic_lxc
...
Remove panic in lxc driver.
2014-02-10 12:52:52 -05:00
ccf2b96fbc
Merge pull request #4 from tianon/slight-netlink-cleanup
...
Update NetworkChangeName to be more similar to my original
2014-02-10 01:42:05 -05:00
d3d85d38fb
Add slightly better GOPATH detection/handling
...
This also adds a new "AUTO_GOPATH" environment variable that will create an appropriate GOPATH as part of the build process.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-02-09 18:21:01 -07:00
3a7c144e99
Update NetworkChangeName to be more similar to my original (moving IFNAMSIZ constant outside the function like it should've been)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-02-09 18:14:17 -07:00
95bcb8924a
Adjust test to match its comment
...
Docker-DCO-1.1-Signed-off-by: Andrew Williams <williams.andrew@gmail.com > (github: TheDude05)
2014-02-09 15:36:04 -06:00
524416560a
Replace my C code with tianons Go code
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-09 05:54:13 -08:00
3dfc910d77
Remove linux specific calls
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-02-09 04:23:57 -08:00
0cba91e264
Add bidirectional iptables rule back to links
...
Fixes #4014
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-09 01:43:46 -08:00
695719b29a
devmapper: Enable skip_block_zeroing
...
This makes the device mapper not zero out blocks allocated on the
thinp device. This is safe in our use case, as we access the device
via a filesystem that doesn't leak any uninitialized data to userspace.
This partially helps with https://github.com/dotcloud/docker/issues/3280
and should generally improve preformance on the devicemapper backend.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-02-09 07:29:28 +01:00
ee39033073
Use c to change interface name
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-08 20:44:04 -08:00
72c72f91c6
Swap Firefox to Iceweasel so that the Desktop Integration example is simplified and easier to understand
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-02-08 11:34:11 -07:00
e3762e8d69
Add network set interface in namespace by pid
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-08 10:03:16 -08:00
a6c791e8a9
Add set master for interface
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-08 09:53:04 -08:00
7c06d5e34e
Remove panic in lxc driver.
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-02-07 19:09:52 -08:00
8228e50581
Merge pull request #3987 from SvenDowideit/warn-against-symlinks
...
please, for the love of Docker, do. not. use. symlinks
2014-02-07 18:48:19 -08:00
105188be2e
Merge pull request #3932 from SvenDowideit/no-docker-meeting-channel
...
remove mention of #docker-meeting
2014-02-07 16:28:10 -08:00
36aafeb0b4
Merge pull request #3978 from philips/add-philips-as-pkg-systemd-maintainer
...
pkg: systemd: add initial MAINTAINERS
2014-02-07 12:32:21 -05:00
f787bec4a6
please, for the love of Docker, do. not. use. symlinks
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-02-07 20:20:41 +10:00
ac06646b1f
Instructions for Textmate's bundle installation
...
Docker-DCO-1.1-Signed-off-by: German Del Zotto <germ@ndz.com.ar > (github: GermanDZ)
2014-02-07 09:30:11 +01:00
f289b3a19e
New folder structure to support TextMate2 bundles format
...
Docker-DCO-1.1-Signed-off-by: German Del Zotto <germ@ndz.com.ar > (github: GermanDZ)
2014-02-07 09:29:14 +01:00
b2945f2776
Fix RST formatting
2014-02-07 00:10:47 -07:00
31a1a815c4
Merge pull request #3984 from jamtur01/secfaw
...
Added Security FAQ question
2014-02-06 17:40:59 -08:00
55b74bfe46
Added Security FAQ security
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-02-07 01:42:11 +01:00
547ac42199
Add Freebsd client support
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-02-06 16:40:39 -08:00
d0fc598ce2
Merge pull request #3948 from alexlarsson/devmapper-unmount
...
Devmapper cleanup and unmount fix
2014-02-06 15:10:06 -08:00
e8740685ce
Remove linux specific calls
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-02-06 14:13:03 -08:00
693d3f8c6a
devmapper: Fix MountDevice for non-existing Device
...
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-02-06 23:08:17 +01:00
304e33a2fe
devmapper: Fix UnmountDevice for non-existing device
...
Properly error out if passed an id that doesn't exist.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-02-06 22:26:09 +01:00
84285f7539
Merge pull request #3966 from asbjornenge/updated_tmlang
...
Update TextMate & Sublime Text Syntaxt Highlighting with ONBUILD
2014-02-06 14:20:52 -07:00
1c6f909d32
Merge pull request #3977 from tianon/vim-onbuild
...
Add "ONBUILD" highlighting to our vim syntax file
2014-02-06 14:20:09 -07:00
15711ed670
pkg: systemd: add initial MAINTAINERS
...
I volunteered for pkg/systemd MAINTAINER and there were no objections
during the #docker-dev meeting. For context I wrote most of the stuff in
here and wrote the dependent calls in api.go. Plus, I actively test the
code via CoreOS.
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com > (github: philips)
2014-02-06 12:04:35 -08:00
c94ad37370
Merge pull request #3913 from mzdaniel/docker-ci-coverage
...
docker-ci: Add new docker coverage report
2014-02-06 20:04:21 +00:00
25d87553f6
docker-ci: Add new docker coverage report
...
Docker-DCO-1.1-Signed-off-by: Daniel Mizyrycki <daniel@docker.com > (github: mzdaniel)
2014-02-06 11:59:29 -08:00
f6c6f303f8
Added support for single quoted strings
...
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net > (github: asbjornenge)
2014-02-06 20:50:36 +01:00
888e8da283
Improved regex
...
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net > (github: asbjornenge)
2014-02-06 20:48:15 +01:00
3d86f07f87
Updated readme
...
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net > (github: asbjornenge)
2014-02-06 20:38:25 +01:00
647db3938d
Added suppport for the ONBUILD instruction
...
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net > (github: asbjornenge)
2014-02-06 20:38:20 +01:00
e95bb0b4a9
Removed the YAML file since I wasn't using it
...
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net > (github: asbjornenge)
2014-02-06 20:37:49 +01:00
6561d65438
Added Dockerfile.tmPreferences for hotkey commenting
...
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net > (github: asbjornenge)
2014-02-06 20:35:45 +01:00
22aeae34c1
Merge pull request #3974 from creack/3967-add_content_type-fix
...
Add json content type to /containers/json api endpoint
2014-02-06 14:18:00 -05:00
3ff62eb227
Merge pull request #3963 from unclejack/update-contributing
...
Update issue filing & PR submission instructions
2014-02-06 14:17:07 -05:00
e634f23940
Add "ONBUILD" highlighting to our vim syntax file
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-02-06 11:12:57 -07:00
1a12e9fbc6
Merge pull request #3972 from crosbymichael/fix-release-panic
...
Check for nil information return
2014-02-06 19:39:07 +02:00
d5d948a038
Add json content type to /containers/json api endpoint
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-02-06 09:28:30 -08:00
983edd40fa
Merge pull request #3956 from crosbymichael/no-ping-from-client
...
Do not ping registry from the cli
2014-02-06 08:14:35 -08:00
2a1609d618
Merge pull request #3945 from crosbymichael/fix-brigeiface
...
Fix bad rebase where bridgeiface was removed
2014-02-06 07:38:32 -08:00
2c82fd93d8
devmapper: Handle EBUSY while removing
...
For some reason we seem to get transient EBUSY when removing
thinp devices, which prohibit removing containers. When
this happens we retry a few times which seems to fix the
issue for me.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-02-06 13:14:49 +01:00
7e25cd5891
devmapper: Use removeDeviceAndWait in DeviceSet.removeDevice()
...
This makes sure the device is removed just like in deactivateDevice.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-02-06 13:14:49 +01:00
b95c560fdd
devmapper: Move refcounting to DeviceSet
...
We already have some kind of refcounting in DeviceSet, this fleshes
it out to allow it to completely subsume the refcounting in
devmapper.Driver.
This allows us to drop the double refcounting, and the locking inside
devmapper.Driver. This, in particular the locking simplification will
make it easier in the future to parallelize the device mapper.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-02-06 13:14:42 +01:00
bbe382bec4
Check for nil information return
...
Fixes #3912
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-06 03:18:12 -08:00
1f6000eaa0
update issue filing & PR submission instructions
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-02-06 11:06:25 +02:00
09702f4c31
Merge pull request #3954 from ibuildthecloud/broken-1.6-images-api
...
Fix broken images API for version <1.7
2014-02-06 10:25:14 +02:00
4f7d325c0a
Merge pull request #3888 from therealprologic/master
...
Added installation docs for CRUX as a Docker Host.
2014-02-06 18:15:49 +10:00
55e5e37c4f
Fix broken images API for version <1.7
...
Simple typo, "ID" should be "Id". This is causing the images response
to not have IDs in it.
Docker-DCO-1.1-Signed-off-by: Darren Shepherd <darren.s.shepherd@gmail.com > (github: ibuildthecloud)
2014-02-05 19:09:55 -07:00
e2eace9715
Do not ping registry from the cli
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-05 16:49:43 -08:00
f5d028c838
Added installation docs for CRUX as a Docker Host.
...
Docker-DCO-1.1-Signed-off-by: James Mills <prologic@shortcircuit.net.au > (github: therealprologic)
2014-02-06 10:37:33 +10:00
9dd92a9823
Merge pull request #3944 from joeshaw/patch-1
...
Always download things over https
2014-02-05 13:56:41 -08:00
f9f30f1ced
Merge pull request #3938 from SvenDowideit/workdir-doc-tweak
...
be a little more explicit about what WORKDIR does
2014-02-05 13:54:49 -08:00
3841e88625
Always download things over https
...
Docker-DCO-1.1-Signed-off-by: Joe Shaw <joe@joeshaw.org > (github: joeshaw)
2014-02-05 15:46:41 -05:00
dca21dfac7
devmapper: add and use removeDeviceAndWait helper
...
This adds a function that calls the lowlevel removeDevice
and then waits for it to finish.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-02-05 21:27:12 +01:00
63d4b293e7
devmapper: Rename DeviceSet.RemoveDevice to DeleteDevice
...
"Remove" is a bit overloaded, as it is also what deactivating a
device mapper device is called. Using "delete" is more clear here.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-02-05 21:27:12 +01:00
347dc39427
Fix bad rebase where bridgeiface was removed
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-05 11:20:59 -08:00
7fb8738839
Merge pull request #3941 from crosbymichael/merge_release_v0.8.0
...
Merge release v0.8.0
2014-02-05 14:16:25 -05:00
5cb45544c6
Change version to v0.8.0-dev
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-05 09:54:34 -08:00
3a8fff964c
Merge branch 'release' into merge_release_v0.8.0
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-05 09:54:15 -08:00
fe6406b0f2
Merge pull request #3916 from crosbymichael/bump_v0.8.0
...
Bump to v0.8.0
2014-02-05 12:49:41 -05:00
a17d7d9a73
be a little more explicit about what WORKDIR does
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-02-05 13:26:49 +10:00
880dc34c0e
Merge pull request #3933 from proppy/patch-1
...
docs/installation/google: remove -mtu flag
2014-02-04 17:24:18 -08:00
650200239b
docs/installation/google: remove -mtu flag
2014-02-04 17:19:05 -08:00
d43c85961f
remove mention of #docker-meeting
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-02-05 10:15:22 +10:00
cc3a8c8d8e
Bump to version 0.8.0
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-04 16:08:57 -08:00
501d0499f8
Merge pull request #3928 from metalivedev/fixheadings
...
Fixes headings in Table of Contents, link from FAQ.
2014-02-04 14:59:24 -08:00
fa0afe89ad
Merge pull request #3929 from ostezer/master
...
mac-installation-docs: Update the installation dir.
2014-02-04 14:51:05 -08:00
5a49fba15e
Merge pull request #3927 from tianon/release-checklist-mention-contributors
...
Update RELEASE-CHECKLIST to mention how to get a decent contributors list
2014-02-04 14:46:41 -08:00
aed37e70b9
mac-installation-docs: Update the installation dir.
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
2014-02-05 00:44:55 +02:00
18b896e0f0
Fixes headings in Table of Contents, link from FAQ.
...
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net > (github: metalivedev)
2014-02-04 14:16:27 -08:00
9fbb134d87
Merge pull request #3926 from tianon/update-mailmap
...
Update .mailmap and AUTHORS
2014-02-04 13:33:41 -08:00
bd85631ca5
Update .mailmap and AUTHORS
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-02-04 13:40:56 -07:00
3455c6f470
Merge pull request #3918 from ostezer/master
...
docs: Requirements And Installation on Mac OS X 10.6 Snow Leopard
2014-02-04 12:38:51 -08:00
bac7e741bf
Update RELEASE-CHECKLIST to mention how to get a decent contributors list
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-02-04 13:34:24 -07:00
a9b325e5b0
docs: Installation on Mac OS X 10.6 Snow Leopard
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
2014-02-04 22:26:06 +02:00
81b2940c89
Merge pull request #3254 from shykes/onbuild
...
New build instruction: ONBUILD defines a trigger to execute when extending an image with a new build
2014-02-04 11:38:27 -08:00
ded9e0d6df
builder: clearly display ONBUILD triggers during a build.
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-02-04 19:11:56 +00:00
6ed7461eac
Merge pull request #3557 from unclejack/improve_vagrantfile
...
improve the Vagrant VMs: bump RAM to 512 MB & correct forwarded ports
2014-02-04 10:23:52 -08:00
495135b68a
Merge pull request #3922 from jpoimboe/iptables-public-dest-port-fix
...
iptables: use dest_addr and dest_port for public port FORWARD rule
2014-02-04 10:06:43 -08:00
23959e6cf8
Merge pull request #3919 from SvenDowideit/missing-quote
...
missing quote quota
2014-02-04 10:03:26 -08:00
ea63ade772
iptables: use dest_addr and dest_port for public port FORWARD rule
...
Docker-DCO-1.1-Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com > (github: jpoimboe)
2014-02-04 11:32:50 -06:00
297001f515
improve the Vagrant VMs
...
This bumps the VM memory and corrects forwarded ports when they're used
already.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-02-04 12:26:14 +02:00
3fda1819ee
Merge pull request #3920 from SvenDowideit/hack-spelling
...
Fix hack/MAINTAINERS.md spelling problems
2014-02-03 21:34:51 -08:00
df4682907d
i was reading, and it sprang out at me :)
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-02-04 15:32:19 +10:00
64426c74f2
missing quote quota
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-02-04 15:29:47 +10:00
cb0ac55b5b
Merge pull request #3897 from sandaya/master
...
Update mkimage-arch.sh to set proper permissions on rootfs directory
2014-02-03 18:42:58 -08:00
736bf3f7e6
Update mkimage-arch.sh
...
mktemp creates a root directory ("/") with permissions set to 700. Default should be 755 so other users in the container can access its subdirs (e.g http user for nginx for /srv/http/test/index.html).
Docker-DCO-1.1-Signed-off-by: Samuel Andaya <samuel@andaya.net > (github: sandaya)
2014-02-03 21:26:47 -05:00
9f994c9646
New build instruction: ONBUILD defines a trigger to execute when extending an image with a new build
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-02-04 01:31:19 +00:00
a51f5a287b
Builder: extract the execution of a single build step into buildFile.BuildStep
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-02-04 01:23:01 +00:00
b5d6208ccf
Merge pull request #3915 from crosbymichael/no-double-put
...
No no put put
2014-02-03 16:40:44 -08:00
b56440fa24
Merge pull request #3887 from proppy/detect-network-mtu
...
docker: detect defaultNetworkMtu from default route
2014-02-03 16:35:15 -08:00
5fcd4efd26
Merge pull request #3188 from keyvanfatehi/vagrant-port-forwarding-list
...
Vagrantfile port forwarding made more flexible (w/ comments)
2014-02-03 16:29:47 -08:00
02fdc194fc
Fix unmounts out of container export funcs
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-03 16:14:16 -08:00
d277a4c0f8
Do not call Put twice and do not call it on defer
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-03 16:14:02 -08:00
8beca66741
Merge pull request #3883 from metalivedev/fix-3879
...
Fixes #3879 by updating embedding of ascii.io (now asciinema.io)
2014-02-03 16:09:54 -08:00
d8718e435d
Vagrantfile port forwarding usages documented. Added usage via envvar FORWARD_PORTS for custom port or list of comma-separated ports
...
Docker-DCO-1.1-Signed-off-by: Keyvan Fatehi <keyvanfatehi@gmail.com > (github: keyvanfatehi)
2014-02-03 16:07:52 -08:00
fca2f3e742
Updated width to 815 per comment.
...
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net > (github: metalivedev)
2014-02-03 16:06:29 -08:00
ab1482e9c2
docs/cli: add mtu option
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: google)
2014-02-03 16:01:38 -08:00
92e61f89aa
docker/config: update -mtu flag default
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: google)
2014-02-03 15:36:39 -08:00
1b9c5edc6c
networkdriver: add ErrNoDefaultRoute
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: google)
2014-02-03 14:27:59 -08:00
4e9164ff5f
Merge pull request #3908 from crosbymichael/fix-login-prompt
...
Fix login prompt on push and pull because of error message
2014-02-03 14:19:14 -08:00
a9860d8553
Merge pull request #3911 from crosbymichael/fix-remove-volume
...
Fix comparing binds and volume ids from other containers
2014-02-03 14:03:57 -08:00
720c5774e9
Fix comparing binds and volume ids from other containers
...
Currently comparing volume ids for binds and other containers are broken
Fixes #3749
Fixes #3885
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-03 13:18:10 -08:00
17c124baf6
Update lxc_template.go
...
If networking is disabled, but then pipework is used later to add nics, the network still doesn't function. Using flags=up for empty networking fixes this.
Docker-DCO-1.1-Signed-off-by: James DeFelice <james.defelice@ishisystems.com > (github: jdef)
2014-02-03 16:14:15 -05:00
0fa9199f78
Fix login prompt on push and pull because of error message
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-02-03 11:38:34 -08:00
88d66600b3
Merge pull request #3906 from tianon/unprefix-ubuntu
...
Remove stackbrew prefix on ubuntu images now that they're reasonably up-to-date and stable
2014-02-03 10:28:50 -08:00
f4a7c43776
Remove stackbrew prefix on ubuntu images now that they're reasonably up-to-date and stable
...
Everyone probably wants to run `docker pull ubuntu` before building with this change.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-02-03 11:08:35 -07:00
6863145148
Merge pull request #3904 from alexlarsson/fix-docker-commit-output
...
Fix docker commit output
2014-02-03 10:00:53 -08:00
9431b8d503
Merge pull request #3893 from tianon/clean-up-btrfs-error-messages
...
Fix several btrfs driver error messages
2014-02-03 09:51:41 -08:00
fb796900fb
Merge pull request #3892 from tianon/remove-btrfs-header-reference
...
Remove reference to <linux/btrfs.h>, and instead use <btrfs/ioctl.h> like we're supposed to (from btrfs-progs)
2014-02-03 09:41:11 -08:00
f7f8e3c2b3
Fix several btrfs driver error messages
...
Several of the error messages were wrong, but not one of them was helpful, so this fixes them to include the important information (the actual error), and a correct description of which operation failed.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-02-03 09:12:18 -07:00
62aa446101
Merge pull request #3899 from tianon/do-not-strip-binaries
...
Update PACKAGERS.md to explicitly talk about stripping
2014-02-03 07:08:49 -08:00
b61c1d0d42
Fix docker commit output
...
The id is returned as Id, not ID, so print the right thing.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-02-03 14:59:09 +01:00
7ffd2b0785
Update PACKAGERS.md to explicitly talk about stripping, quoting Dave Cheney from Golang upstream (who is very, very adamant about not stripping Golang compiled binaries)
...
While there, remove the now-outdated section about `CGO_ENABLED=0`
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-02-02 22:47:42 -07:00
6922f1be08
Remove reference to <linux/btrfs.h>, and instead use <btrfs/ioctl.h> like we're supposed to (from btrfs-progs)
...
This fixes compilation issues when btrfs.h isn't available (because we just need the relevant structs, which for userspace programs are supposed to come from btrfs-progs instead of the kernel headers).
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-02-01 23:23:33 -07:00
4d0a026c98
docker: detect defaultNetworkMtu from default route
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: google)
2014-02-01 03:46:37 -08:00
e8963748fc
Consolidate a bunch of the supplementary-groups tests to cut down on the number of RUN lines in a single Dockerfile within TestBuild
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-31 20:15:24 -07:00
4ffc52385c
Use type switch instead of reflection
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-31 20:15:24 -07:00
ee93f6185b
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)
2014-01-31 20:15:24 -07:00
a446b34719
Merge pull request #3832 from jlhawn/3831-auth-tests-server-address
...
Prevent Tests from creating users on Prod Index
2014-01-31 18:34:13 -08:00
c9f6e446ee
Merge pull request #3881 from crosbymichael/no-all-number
...
Do not generate all numberic truncated ids
2014-01-31 18:07:01 -08:00
b0f4ad431d
Fixes #3879 by updating embedding of ascii.io (now asciinema.io)
...
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net > (github: metalivedev)
2014-01-31 18:02:45 -08:00
f9b4146ad4
Merge pull request #3868 from 1uptalent/3867-allow-pax-global-extended-headers-to-passthrough
...
FIX 3867 allow pax global extended headers to passthrough
2014-01-31 17:54:08 -08:00
9b7054fd0b
Do not generate all numberic truncated ids
...
Fixes #3869
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-31 17:37:13 -08:00
87c1403948
Merge pull request #3880 from vieux/fix_docker_login
...
fix docker login
2014-01-31 17:31:27 -08:00
31ee45e6ae
Merge pull request #3882 from vieux/fix_compat_api
...
fix api with old version
2014-01-31 17:25:39 -08:00
e43236c78a
fix api with old version
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-01 01:24:39 +00:00
819c2e3eca
Merge pull request #3872 from crosbymichael/network-driver
...
Remove networking out of core and into a driver
2014-01-31 17:22:37 -08:00
d22a39db26
fix docker login
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-02-01 01:14:59 +00:00
23815414ea
Merge pull request #3878 from vieux/remove_REMOTE_TODO.md
...
remove REMOTE_TODO.md
2014-01-31 15:50:57 -08:00
bf1f655fa2
remove REMOTE_TODO.md
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-31 23:50:34 +00:00
6a1ee89d2d
Merge pull request #3827 from vieux/mova_api_package
...
Move api into sub package
2014-01-31 15:39:33 -08:00
9eea7f28f0
Move serveapi to api/api.go
...
Remove api import from server.go
Rename initapi to init server
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-31 23:06:00 +00:00
78189c9bcf
Merge pull request #3876 from dotcloud/fix_panic_mflag
...
fix panic in mflag
2014-01-31 14:43:16 -08:00
cb3bd91689
Fix IP case for BridgeIP
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-31 12:18:45 -08:00
50fea89782
Fix links test to not accept bridge
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-31 12:07:51 -08:00
a11bee44d7
Update code from pr #3842 post rebase
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-31 12:04:44 -08:00
1d4de9ce1f
Fix port mapping unit tests
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-31 12:04:44 -08:00
167403988d
Move network aspect of links into driver as a job
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-31 12:04:44 -08:00
2df0166107
Implement requesting the name ip
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-31 12:04:44 -08:00
49b9813035
Fix integration tests
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-31 12:04:44 -08:00
2d8709696c
Fix sending []byte in job env
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-31 12:04:44 -08:00
c712e74b45
Update core calls to network drivers
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-31 12:04:44 -08:00
90494600d3
Finish moving networking information into driver
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-31 12:04:44 -08:00
53ee1daa69
Merge pull request #3841 from alexlarsson/separate-base-fs
...
Separate out graphdriver mount and container root
2014-01-31 11:49:14 -08:00
523341d994
Merge pull request #3857 from creack/remove_darwin_files
...
Remove all darwin specific files and use more generic _unsupported with build tags.
2014-01-31 11:48:10 -08:00
65794a2c49
fix panic in mflag
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-31 11:39:29 -08:00
674ee1bc8e
Merge pull request #3828 from tianon/add-user-email-to-dockerfile
...
Add dummy "user.email" setting in our Dockerfile for smooth in-container merge commits
2014-01-31 11:03:17 -08:00
b881a6c3c2
merge master
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-31 19:00:06 +00:00
f267938fb8
Merge pull request #3844 from clkao/lxc-kill-deprecation
...
Use lxc-stop -k instead of lxc-kill
2014-01-31 10:57:40 -08:00
ff6409382b
Merge pull request #4 from tianon/cross-compile-and-release-linux-i386-and-arm-clients
...
Update/fix build tags, Dockerfile, and release.sh for proper building and releasing of linux/386 and linux/arm cross-compiled client binaries
2014-01-31 10:51:25 -08:00
51d280f944
merge master
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-31 18:43:34 +00:00
643c7dc25d
Merge pull request #3829 from vieux/fix_api_regression
...
Fix ID -> Id api
2014-01-31 10:38:57 -08:00
70ab72ff32
Merge pull request #3864 from SvenDowideit/lxc-kill-script-workaround-doc
...
add a known issue for lxc-1.0.0.beta3 and beyond for removeal of lxc-kil...
2014-01-31 10:27:04 -08:00
feea1dda41
Merge pull request #3861 from metalivedev/fixkerneldeps
...
Fixed link to kernel dependencies.
2014-01-31 10:25:25 -08:00
5258f833bc
Merge pull request #3866 from crosbymichael/dont-allocate-1
...
Do not allocate networks first ip
2014-01-31 09:47:28 -08:00
35ef0d37c2
Merge pull request #3800 from vieux/cleanup_jobs
...
Cleanup jobs
2014-01-31 06:55:12 -08:00
ce74c8b4d2
Ignore tar.TypeXGlobalHeader
...
Docker-DCO-1.1-Signed-off-by: Abel Muiño <amuino@gmail.com > (github: amuino)
2014-01-31 14:57:30 +01:00
7b2ec7fb2d
Unit test ensuring that a tar.TypeXGlobalHeader does not cause an error
...
Docker-DCO-1.1-Signed-off-by: Abel Muiño <amuino@gmail.com > (github: amuino)
2014-01-31 14:57:18 +01:00
065dd231dd
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)
2014-01-31 03:16:42 -07:00
59ec012efc
Merge pull request #3125 from rjeczalik/master
...
vagrant: added PRIVATE_NETWORK env var
2014-01-31 01:06:47 -08:00
b4604ae7cf
Merge pull request #3822 from tianon/install-your-user
...
Make get.docker.io install directions slightly better by telling user exactly how to add themselves to the "docker" group
2014-01-31 00:56:30 -08:00
56317c74f7
Merge pull request #3760 from tianon/better-nondocker-warning
...
Update hack/make.sh with slightly clearer output and a more precise "are we in the Docker container?" check
2014-01-31 00:54:44 -08:00
d009cb0bed
Merge pull request #3848 from tianon/fix-yaml-space-parsing
...
Fix fun Travis DCO check YAML parsing issues (especially with commit messages that start with any kind of whitespace, like this one intentionally does)
2014-01-31 00:53:47 -08:00
d86c1b064d
Not not allocate networks first ip
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-30 23:10:19 -08:00
8fbdb7b59e
add setSubEnv and getSubEnv
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-31 04:01:46 +00:00
24086fa75d
job.error\* now return engine.StatusErr
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-31 04:01:46 +00:00
2b52d6e801
Remove api_params.go
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-31 03:59:14 +00:00
fc2f998822
remove some mkServerFromEngine
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-31 03:34:50 +00:00
a0d82b17c7
Merge pull request #3863 from vieux/default_getint_0
...
changed default value of getenvint to 0. fix tests
2014-01-30 19:04:46 -08:00
630459f2b8
add a known issue for lxc-1.0.0.beta3 and beyond for removeal of lxc-kill see #3844
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-01-31 12:30:16 +10:00
1498cd4e05
use exists
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-31 02:21:59 +00:00
28b5ae8cc4
changed default value of getenvint to 0. fix tests
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-31 02:06:08 +00:00
ce423cc9a8
vagrant: added PRIVATE_NETWORK env var
...
Docker-DCO-1.1-Signed-off-by: Rafal Jeczalik <rjeczalik@gmail.com > (github: rjeczalik)
2014-01-31 02:03:57 +01:00
7ced204372
Merge pull request #3860 from vieux/integration_makefile
...
Add "make test-integration"
2014-01-30 16:10:27 -08:00
e64a9a3bad
Merge pull request #3758 from metalivedev/2720-running
...
Fixes 2720
2014-01-30 16:09:19 -08:00
98518bbcad
Fixed link to kernel dependencies. Wrapped long lines. Removed old tar dependency from list.
...
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net > (github: metalivedev)
2014-01-30 16:03:13 -08:00
e4b3b391d6
Merge pull request #3858 from vieux/fix_testexitcode
...
fix TestExitCode
2014-01-30 15:52:28 -08:00
4326e541f8
add make test-integration
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-30 23:50:23 +00:00
9ae51c7403
Merge pull request #3859 from rogaha/add_missing_attributes
...
- Fixed the last cli.call's parameter from CmdSearch
2014-01-30 15:44:36 -08:00
2655a108e1
- Fixed the last cli.call's parameter from CmdSearch
...
Docker-DCO-1.1-Signed-off-by: Roberto Hashioka <roberto.hashioka@docker.com > (github: rogaha)
2014-01-30 23:21:42 +00:00
45dd051e8e
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)
2014-01-30 23:10:56 +00:00
720f64af18
fix TestExitCode
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-30 22:59:21 +00:00
9481afa617
Merge pull request #3854 from vieux/fix_tests
...
remove TestAllocateTCPPortLocalhost faillure in tests
2014-01-30 13:59:32 -08:00
8e619e13ca
remove TestAllocateTCPPortLocalhost faillure in tests
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-30 21:53:32 +00:00
0c8ddd502e
Merge pull request #3833 from vieux/fix_env_conversion_issues
...
Fix env conversion issues in env
2014-01-30 13:31:25 -08:00
9261511aa5
refactor all *FromJob functions
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-30 20:45:32 +00:00
c8d1596902
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)
2014-01-30 12:27:45 -07:00
0942e5c89c
Merge pull request #3842 from jpoimboe/iptables-insert-masq
...
network: insert masq rule
2014-01-30 11:26:32 -08:00
b111fc3646
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)
2014-01-31 03:22:22 +08:00
43b7667dcc
Merge pull request #3836 from SvenDowideit/mint-cgroups-lite-docs
...
Add troubleshooting for missing cgroups on mint 16
2014-01-30 10:58:26 -08:00
c7b415d3b4
Merge pull request #3846 from tianon/unclejack-maintainer
...
Make unclejack the official Vagrantfile maintainer
2014-01-30 10:55:38 -08:00
238dba831a
Make unclejack the official Vagrantfile maintainer
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-30 11:51:25 -07:00
637a1dcab6
Merge pull request #3718 from alexlarsson/btrfs
...
Add btrfs support to docker
2014-01-30 10:00:44 -08:00
cc382ec628
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)
2014-01-30 11:06:28 -06:00
fab19d197c
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)
2014-01-30 16:43:53 +01:00
fc1169a220
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)
2014-01-30 16:41:45 +01:00
626a2e1112
Add troubleshooting for missing cgroups on mint 16 #3602
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-01-30 20:53:27 +10:00
41c10fb256
Merge pull request #3835 from thinkingbox/master
...
Fix typo
2014-01-29 23:55:36 -08:00
7d95ce6ddd
Fix typo
...
Docker-DCO-1.1-Signed-off-by: Piergiuliano Bossi <pgbossi@gmail.com > (github: thinkingbox)
2014-01-29 23:07:23 -05:00
ab50985ac9
Merge pull request #3834 from philips/fix-socket-activation-systemd
...
contrib: systemd: make socket-activation Restart same as the main service file
2014-01-29 17:46:25 -08:00
4dab34c204
contrib: systemd: make socket-activation Restart=always
...
Do as was done to f09a78cd21brandon.philips@coreos.com > (github: philips)
2014-01-29 17:42:32 -08:00
de8480f656
Merge pull request #3531 from lsm5/docker-systemd
...
ExecStartPre commands updated in systemd service file
2014-01-29 17:38:10 -08:00
c914abaf15
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)
2014-01-29 17:18:11 -08:00
187646127f
fix convertion issues
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-30 00:56:42 +00:00
5b82a1b726
add tests
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-30 00:55:29 +00:00
95dff84728
Merge pull request #3734 from stpierre/mkimage-yum
...
Added new mkimage-yum.sh script to create CentOS base images
2014-01-29 14:52:51 -08:00
54072dbbd6
fix ID -> Id api
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-29 20:31:49 +00:00
94c5f51c4a
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)
2014-01-29 13:13:32 -07:00
6013cbdce8
Merge pull request #3810 from jpoimboe/iptables-forward-public-ports
...
network: add publicly mapped ports to FORWARD table
2014-01-29 11:53:26 -08:00
f556cd4186
move api to it's own package
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-29 19:26:54 +00:00
6fdc543443
Merge pull request #3819 from crosbymichael/move-port-mapper
...
Move port mapper out of core and into network drivers
2014-01-29 11:16:51 -08:00
7b7f7e4436
add setSubEnv and getSubEnv
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-29 18:53:43 +00:00
55d7aa1b49
job.error\* now return engine.StatusErr
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-29 18:52:55 +00:00
217ad5e5e6
Remove api_params.go
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-29 18:52:54 +00:00
c00cb1aca1
Merge pull request #3808 from alexlarsson/execdriver-get-pids-for-container
...
execdriver: Make GetPidsForContainer() a driver call
2014-01-29 10:38:10 -08:00
4a35146461
Merge pull request #3820 from vieux/remove_runtime_from_api
...
Remove runtime from api
2014-01-29 10:35:27 -08:00
e1b210bee9
Merge pull request #3588 from tianon/debootstrap-tweaks
...
Add a few small tweaks to mkimage-debootstrap, especially to help with lucid
2014-01-29 08:42:14 -08:00
a9d0bbcfc6
remove ip fowarding from systemd (fixed: commit #3801 )
...
Docker-DCO-1.1-Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com > (github: lsm5)
2014-01-29 11:06:23 -05:00
f09a78cd21
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
2014-01-29 11:06:23 -05:00
6cfe778c2c
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)
2014-01-29 00:10:39 -07:00
c82a2d1adf
Merge pull request #3813 from jpoimboe/update-ip_forward-docs
...
docs: remove ip_forward enabling step
2014-01-28 18:08:22 -08:00
f3a032f27b
Address feedback from @jamtur01.
...
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net > (github: metalivedev)
2014-01-28 17:32:05 -08:00
abd64a2b00
move warnings to the job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-29 01:17:55 +00:00
b3b12f0059
Move port mapper tests out of core and into portmapper
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-28 17:10:13 -08:00
d41844ed2d
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)
2014-01-29 00:20:51 +00:00
99756ef11f
Initial move of port mapper code into sub pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-28 15:42:46 -08:00
8458f99a38
fix(CONTRIBUTING): Developer Certificate of Origin w/o Grant
...
In 7fb55f7725brandon.philips@coreos.com > (github: philips)
2014-01-28 13:50:03 -08:00
fc697e3fd7
Merge pull request #3794 from vieux/fix_commands_error
...
check for errors in call, not readBody
2014-01-28 12:57:02 -08:00
2723133a69
Merge pull request #3105 from philips/add-socket-activation
...
Add socket activation
2014-01-28 11:38:25 -08:00
556091ef8b
Merge pull request #3811 from jpoimboe/remove-ip_forward-warning
...
remove ip_forward warning
2014-01-28 11:37:13 -08:00
aeb2f479fa
docs: remove ip_forward enabling step
...
Now that docker sets /proc/sys/net/ipv4/ip_forward by default, remove
the step to enable it in the installation docs.
Docker-DCO-1.1-Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com > (github: jpoimboe)
2014-01-28 13:29:27 -06:00
ef6c0d5341
remove ip_forward warning
...
Now that docker sets /proc/sys/net/ipv4/ip_forward by default (unless
the user manually specifies "-ip-forward=false"), there's no need to
warn if its disabled.
Docker-DCO-1.1-Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com > (github: jpoimboe)
2014-01-28 13:27:56 -06:00
4ab59179e7
Merge pull request #3801 from tianon/ip-forward
...
Add --ip-forward flag to daemon (enabled by default)
2014-01-28 11:17:45 -08:00
db250f709a
network: add publicly mapped ports to FORWARD table
...
Allow publicly mapped ports to be made public beyond the host. This is
needed for distros like Fedora and RHEL which have a reject all rule at
the end of their FORWARD table.
Docker-DCO-1.1-Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com > (github: jpoimboe)
2014-01-28 13:11:49 -06:00
d4ea6308fd
Merge pull request #3759 from jpoimboe/links-iptables-cleanup
...
network: remove unnecessary links iptables rule for return traffic
2014-01-28 11:10:36 -08:00
13ee6d8eee
Merge pull request #3807 from pwaller/fix-unclear-error
...
Fix unclear error message when deleting container
2014-01-28 10:35:09 -08:00
09ed7e8878
Merge pull request #3805 from alexlarsson/execdriver-drop-getexitcode
...
exexdriver: Make Command.GetExitCode an internal call
2014-01-28 10:34:00 -08:00
9ad70528b7
exexdriver: Make Command.GetExitCode an internal call
...
This code only works for backends that directly spawn the child
via the Command. It will not work for the libvirt backend. So
we move this code into the individual backends that need it.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-01-28 19:20:35 +01:00
335bc39c9a
execdriver: Make GetPidsForContainer() a driver call
...
The current implementation is lxc specific.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-01-28 16:21:49 +01:00
70c1781e07
Fix unclear error message when deleting container
...
I was getting the following error:
```
$ bundles/0.7.6-dev/binary/docker-0.7.6-dev run -rm -v=/var/run:/foo base echo hi
hi
2014/01/28 14:24:46 Error: container_delete: No such id: run
```
This commit makes the true origin of the error clearer. Issue #3806 is
tracking the cause of the error.
Docker-DCO-1.1-Signed-off-by: Peter Waller <p@pwaller.net > (github: pwaller)
2014-01-28 14:28:13 +00:00
a1851a6d3e
btrfs: Add comment to Put()
...
Document why we don't need to do anything in Put().
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-01-28 09:56:51 +01:00
cabe624c82
Add --ip-forward flag to daemon (enabled by default) which automatically sets "net.ipv4.ip_forward" to 1
...
See also https://groups.google.com/d/topic/docker-dev/DCjF5Prx7HA/discussion
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-27 21:35:05 -07:00
4e5859e830
fix(api): , _ removed to simplify code in range
...
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com > (github: philips)
2014-01-27 17:18:09 -08:00
7839350dd5
chore(coreos/go-systemd): copy to github.com/dotcloud/docker/systemd/pkg/activation
...
Via https://github.com/dotcloud/docker/pull/3105#issuecomment-32807547
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com > (github: philips)
2014-01-27 17:18:09 -08:00
def0952606
chore(systemd): use activation.Listeners instead of Files
...
Use this Listeners() API that was exposed to save a few more lines of
boiler plate code.
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com > (github: philips)
2014-01-27 17:18:09 -08:00
f82d1291cc
vendor: bump github.com/coreos/go-systemd/activation
...
tests now work in the Docker tree with
`go test github.com/coreos/go-systemd/activation`
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com > (github: philips)
2014-01-27 17:18:09 -08:00
1603039a71
chore(*): go fmt
...
I noticed that travis was failing, go fmt to make it happy.
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com > (github: philips)
2014-01-27 17:18:09 -08:00
1f44921c51
fix(contrib/init/systemd): remove mount rprivate
...
Docker does this now via 157d99a727brandon.philips@coreos.com > (github: philips)
2014-01-27 17:18:09 -08:00
2fe7588af7
fix(cli.rst): add missing underscores
...
As suggested by @metalivedev
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com > (github: philips)
2014-01-27 17:18:09 -08:00
7f9d3268bf
Allow fd:// like unix:// and tcp://
...
Somthing like 20605eb310brandon.philips@coreos.com > (github: philips)
2014-01-27 17:18:09 -08:00
566fb31c88
Move listenfd to utility package
...
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com > (github: philips)
2014-01-27 17:18:09 -08:00
6acc99889d
fix(docs): add Systemd in front of socket activation
...
Suggested by SvenDowideit.
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com > (github: philips)
2014-01-27 17:18:09 -08:00
4a90f00ab7
docs: improve the socket activation cli docs
...
as suggested by SvenDowideit expand the docs to have more information on
socket activation.
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com > (github: philips)
2014-01-27 17:18:09 -08:00
cfeb1f0f65
fix(docs): fixup based on changes in master
...
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com > (github: philips)
2014-01-27 17:18:09 -08:00
87fb2c973d
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)
2014-01-27 17:17:07 -08:00
e996daeed0
vendor: add github.com/coreos/go-systemd/activation
...
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com > (github: philips)
2014-01-27 17:17:07 -08:00
ed12818f99
Merge pull request #3789 from pwaller/issue-3674
...
Fix for #3674 Can't `rm` containers when disk full
2014-01-27 17:00:16 -08:00
eaca205942
Merge pull request #3796 from tianon/dockerfile-btrfs
...
Update Dockerfile to be based on 13.10 instead of 12.04, add linux-libc-dev dep, remove s3cmd backports nonsense
2014-01-27 16:54:06 -08:00
94566b748e
Update Dockerfile to be based on 13.10 instead of 12.04 so that we can remove our s3cmd backports need, and so we can have the new linux-libc-dev dependency we need for compiling the btrfs driver without nasty APT hackery
...
In addition, we've now hard-coded LXC version 0.8 compiled from source so that we can have the most stable dev environment possible.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-27 17:18:33 -07:00
1ddd815191
Merge pull request #3798 from vieux/3777_fix
...
fix mflag import
2014-01-27 15:31:54 -08:00
abbae8f764
check for errors in call, not readBody
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-27 23:31:04 +00:00
c4e7b0e4d5
fix mflag import
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-27 23:29:56 +00:00
07c4eda46a
Fix 2720 -- Expanded documentation for docker run.
...
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net > (github: metalivedev)
2014-01-27 14:44:24 -08:00
c4c558d138
Add Peter Waller <p@pwaller.net> to AUTHORS
...
Docker-DCO-1.1-Signed-off-by: Peter Waller <p@pwaller.net > (github: pwaller)
2014-01-27 22:21:58 +00:00
77d4df1e0b
Merge pull request #3787 from pwaller/issue-3786
...
Fix for issue #3786 `docker rm` unmounts in the wrong order
2014-01-27 13:41:14 -08:00
99dd387fd7
Merge pull request #3784 from 1uptalent/3783_release_push_lock
...
FIX #3783 : Release the push lock after the image push is completed
2014-01-27 13:40:28 -08:00
f4b75e06bc
Merge pull request #3790 from crosbymichael/move-port-allocators
...
Move port allocators into network driver
2014-01-27 13:36:33 -08:00
6f3d8d3908
Fix for #3674 Can't rm containers when disk full
...
Rather than creating a new directory and moving it there before
deleting that new directory, just move the directory we intend to
delete.
In the old way, the Mkdirall could fail, which meant that you
couldn't delete containers when the disk was full.
Tested.
Docker-DCO-1.1-Signed-off-by: Peter Waller <p@pwaller.net > (github: pwaller)
2014-01-27 21:34:11 +00:00
91b11dd156
Merge pull request #3776 from fabiofalci/container_list_test
...
Improve test for container list `ps`
2014-01-27 13:32:23 -08:00
bbfc531b51
Merge pull request #3542 from SvenDowideit/curl-prepare-commit-msg
...
move the contributing hook into contrib, and use curl in the same way as the gofmt above
2014-01-27 12:09:03 -08:00
093531ddb7
Merge pull request #3781 from mattymo/patch-1
...
Clean up grammar on puppet.rst
2014-01-27 12:06:43 -08:00
adae0b248d
Merge pull request #3773 from mnaberez/supervisord-apache2-example
...
Use exec to replace bash with apache2 after environment is set up
2014-01-27 12:01:59 -08:00
ef37fdd1a8
Merge pull request #3770 from aaronfeng/fix-image-name-pos
...
move image name into correct position
2014-01-27 11:56:36 -08:00
f9e9637a9f
Merge pull request #3756 from crosbymichael/fix-register-nobridge
...
Refactor and fix register interface when bridge does not exist
2014-01-27 10:40:42 -08:00
32753c3d24
Fix for issue #3786
...
This is a fix for the case that one mount is inside another mount and
docker can't then delete the resulting container.
Docker-DCO-1.1-Signed-off-by: Peter Waller <p@pwaller.net > (github: pwaller)
2014-01-27 17:31:25 +00:00
77a34920b2
Release the push lock at the end
...
Docker-DCO-1.1-Signed-off-by: Abel Muiño <amuino@gmail.com > (github: amuino)
2014-01-27 16:22:59 +01:00
551e1a766c
Update puppet.rst
2014-01-27 18:21:48 +03:00
03d9984f17
Clean up grammar on puppet.rst
2014-01-27 15:13:17 +03:00
1ee1dc2340
Improve test for container list ps
...
Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com > (github: fabiofalci)
2014-01-26 23:14:50 +00:00
5e69b3837b
Fix issues from rebase on master
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-26 14:07:43 -08:00
da61b99b39
Simplify logic for registering ports
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-26 14:01:38 -08:00
ac2a4e6410
Refactor to support multiple ip addresses
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-26 14:01:38 -08:00
da30eb7c20
Remove std sort and use custom sort for performances
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-01-26 14:01:38 -08:00
303ed3c830
Add port allocator and move ipset into orderedintset
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-26 14:01:38 -08:00
b994c13159
Update hack/make.sh with slightly clearer output and a more precise "are we in the Docker container?" check
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-26 13:24:03 -07:00
2ba2a8ae40
Use exec to replace bash with apache2 after environment is set up
...
Docker-DCO-1.1-Signed-off-by: Mike Naberezny <mike@naberezny.com > (github: mnaberez)
2014-01-26 11:53:22 -08:00
ffdc2d2657
Merge pull request #3771 from srt32/patch-1
...
Update README.md typo
2014-01-26 09:07:00 -08:00
31e5958009
move image name into correct position
...
Docker-DCO-1.1-Signed-off-by: Aaron Feng <aaron.feng@gmail.com > (github: aaronfeng)
2014-01-26 08:11:30 -05:00
33ee78004f
Update README.md
...
Docker-DCO-1.1-Signed-off-by: Simon Taranto <simon.taranto@gmail.com > (github: srt32)
2014-01-26 00:08:55 -07:00
5c04f1bcc7
network: remove unnecessary links iptables rule for return traffic
...
Currently there are two iptables rules per port for each link: one to
allow the parent to connect to the child's port, and another one to
allow return traffic from the child back to the parent. The second rule
shouldn't be needed because the "ctstate RELATED,ESTABLISHED" rule can
already allow all established traffic.
So this patch does the following:
1. Move the RELATED,ESTABLISHED rule to be _before_ the potential
inter-container communication DROP rule so it will work for
inter-container traffic as well. Since we're inserting, everything
is reversed chronologically so it should be inserted _after_ we
insert the DROP. This also has a small performance benefit because
it will be processed earlier and it's generally one of the most
commonly used rules.
2. Get rid of the unnecessary return traffic rule per link.
3. Also move the other "Accept all non-intercontainer outgoing packets"
rule to earlier. This gives a small performance benefit since it's
also a commonly used rule, and it makes sense to logically group it
next to the ctstate rule.
Docker-DCO-1.1-Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com > (github: jpoimboe)
2014-01-24 21:20:34 -06:00
b1d26985d0
Update tests to have custom routes
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-01-24 17:18:48 -08:00
eedaf08eb8
Merge branch 'fix-register-nobridge' of https://github.com/crosbymichael/docker into crosbymichael-fix-register-nobridge
2014-01-24 17:02:19 -08:00
e6ae8f6d21
Merge pull request #3757 from vieux/auth_job
...
move auth to a job
2014-01-24 16:54:48 -08:00
1f8b1bb84e
move auth to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-24 16:51:02 -08:00
e2003fea3a
Merge pull request #3728 from vieux/container_job
...
Move containers to a job
2014-01-24 16:10:46 -08:00
5ea2986ce5
Move containers to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-24 16:07:42 -08:00
748a009cc4
Merge pull request #3727 from vieux/push_job
...
push job
2014-01-24 15:42:22 -08:00
e8ee18fa29
push job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-24 15:34:08 -08:00
4a708f9f5b
Merge pull request #3739 from vieux/events_jobs
...
move events to job
2014-01-24 15:32:25 -08:00
5cc6312bfc
move events to job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-24 15:28:17 -08:00
59df776469
Merge pull request #3621 from vieux/inspect_job
...
Inspect job
2014-01-24 15:22:20 -08:00
5fd8aa02ba
merge 2 jobs, no more buffer
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-24 15:13:30 -08:00
a7e9baaf89
update attach to use the new job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-24 15:11:38 -08:00
134435a79c
move inspect to 2 jobs
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-24 15:11:38 -08:00
22fb3e0f38
Merge pull request #3645 from vieux/rmi_job
...
Move rmi to a job
2014-01-24 15:10:02 -08:00
f41e0cf048
fix error handling
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-24 14:59:46 -08:00
177f658882
remove buffer
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-24 14:57:18 -08:00
564e6bc780
Move docker rmi to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-24 14:55:11 -08:00
4a96c329c0
Merge pull request #3725 from vieux/pull_import_job
...
Pull import job
2014-01-24 14:47:40 -08:00
35641f0ec7
remove useless flush method
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-24 14:46:31 -08:00
90e9a2d85a
fix flush
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-24 14:46:31 -08:00
9dcbdbc4b1
move pull and import to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-24 14:46:31 -08:00
9d44298c5e
Merge pull request #3741 from vieux/build_job
...
move build to a job
2014-01-24 11:34:32 -08:00
56ec121925
Merge pull request #3726 from vieux/attach_stderr
...
don't user os.Stderr in attach
2014-01-24 10:55:55 -08:00
f1fbf5f219
Merge pull request #3748 from metalivedev/fixarticles
...
Fix TOC for Articles
2014-01-24 10:01:54 -08:00
6cae33ca0f
Fix TOC for Articles
2014-01-23 18:55:26 -08:00
641005777a
Merge pull request #3747 from crosbymichael/move-networking
...
Move IP Allocator into sub package and out of the core
2014-01-23 16:43:21 -08:00
42e35ecff3
remove useless anonymous field mentions
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-23 16:20:51 -08:00
415379e45d
move build to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-23 16:08:05 -08:00
a71e7fe8ab
Merge pull request #3730 from SvenDowideit/JSON-RUN-format-docs
...
talk about the new exec form of RUN (Closes #3723 ) implemented by #3558
2014-01-23 15:54:00 -08:00
0dd856ee7f
Merge pull request #3724 from creack/extract-lxc-phase-2
...
Refactor process to command
2014-01-23 15:28:45 -08:00
f948820d03
Merge pull request #3743 from pmorie/typo
...
Fix typo in comment in container.go
2014-01-23 15:15:18 -08:00
2f57eb0410
Fix typo in container.go
...
Docker-DCO-1.1-Signed-off-by: Paul Morie <pmorie@gmail.com > (github: pmorie)
2014-01-23 18:10:33 -05:00
ec73c23231
Refactor and fix register interface when bridge does not exist
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-23 14:39:10 -08:00
1896934616
Merge pull request #3742 from vieux/update_todo
...
no more TODO
2014-01-23 12:57:00 -08:00
5d71ad8b19
no more TODO
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-23 12:55:58 -08:00
4e08bb5629
Merge pull request #3740 from tianon/fix-mflag-dyntest
...
Fix mflag test issue with "ResetForTesting"
2014-01-23 12:09:08 -08:00
f60eee4894
Fix mflag test issue with "ResetForTesting" (which only showed up under dyntest for some odd reason)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-23 13:03:17 -07:00
7687b3cec1
Merge pull request #3738 from vieux/update_todo
...
update REMOTE_TODO.md
2014-01-23 10:51:38 -08:00
4d4339c6de
update REMOTE_TODO.md
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-23 10:50:11 -08:00
fd2403b830
fix shebang in mkimage-yum.sh
...
Docker-DCO-1.1-Signed-off-by: Chris St. Pierre <chris.a.st.pierre@gmail.com > (github: stpierre)
2014-01-23 12:01:24 -05:00
ea5b3e193b
Finalize core changes with new package
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-23 05:22:32 -08:00
d419da7227
Added new mkimage-yum.sh script to create CentOS base images
...
mkimage-rinse.sh requires rinse, which is not readily available on
CentOS or Fedora. Plus, creating a base image is trivial with yum
alone.
Docker-DCO-1.1-Signed-off-by: Chris St. Pierre <chris.a.st.pierre@gmail.com > (github: stpierre)
2014-01-23 07:09:44 -05:00
9d11db0f8c
Update code for new test cases
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-23 02:22:13 -08:00
fccca3542b
Move tests from core into ipallocator
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-23 01:31:38 -08:00
648357ffdf
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-01-23 00:28:35 -08:00
210db8e846
Merge pull request #3720 from therealprologic/master
...
Add script for building CRUX base images
2014-01-22 21:28:51 -08:00
bfc1043f36
talk about the new exec form of RUN ( Closes #3723 ) implemented by #3558
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-01-23 14:00:16 +10:00
d247b7d426
Added script for building Base Docker CRUX images
...
Docker-DCO-1.1-Signed-off-by: James Mills <prologic@shortcircuit.net.au > (github: therealprologic)
2014-01-23 13:53:19 +10:00
79bb8212e0
Implement pos for set and add unit tests
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-22 19:34:47 -08:00
6bc05899aa
Finish implementation and begin working on tests
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-22 18:05:20 -08:00
78b3d89f87
Merge remote-tracking branch 'fork/stack_set' into move-networking
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-22 17:20:52 -08:00
3e3abdd770
Use int32 instead of string for ip set
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-01-22 17:20:19 -08:00
9c29376fcb
Merge remote-tracking branch 'fork/stack_set' into move-networking
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-22 17:13:13 -08:00
18df387bf8
Implement PullBack()
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-01-22 17:12:28 -08:00
b58c1a6438
Merge remote-tracking branch 'fork/stack_set' into move-networking
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-22 16:24:55 -08:00
e048c28159
Merge remote-tracking branch 'fork/stack_set' into move-networking
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-22 16:13:59 -08:00
43bcbf06a6
Implement Containers in set
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-01-22 16:13:28 -08:00
d32777f6b1
Implement get next ip
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-22 16:13:22 -08:00
63d18d875b
Implement basic stack for ips
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-01-22 16:00:53 -08:00
e7a9d23640
don't user os.Stderr in attach
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-22 15:54:22 -08:00
9e2e8a923c
WIP for ip allocator
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-22 15:52:39 -08:00
8723a8a89e
Populate command in ghost state to pass to RestoreCommand
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-22 14:05:01 -08:00
ba8ca59862
Compile driver interface changes
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-22 14:05:01 -08:00
75e0357d69
Populate Command self cointainer (toward Restore())
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-01-22 14:04:55 -08:00
e51af36a85
Add experimenta btrfs driver
...
This is an experimental btrfs driver. To use it you must have
/var/lib/docker mounted on a btrfs filesystem and explicitly
specify DOCKER_DRIVER=btrfs in the docker daemon environment.
It works by using subvolumes for the docker image/container layers.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-01-22 21:44:09 +01:00
700db10c85
Merge pull request #3716 from johngmyers/patch-1
...
Grammar fixes and wording improvements
2014-01-22 12:01:13 -08:00
9a2e673f4f
Merge pull request #3713 from SvenDowideit/document-bind-mount-file
...
bind mounts work for files - give an example, as its very very useful.
2014-01-22 11:54:41 -08:00
2a6e93a6fb
Merge pull request #3558 from tianon/buildfile-run-json
...
Add support for RUN [""] in Dockerfiles
2014-01-22 11:51:34 -08:00
f61a91f50a
Merge pull request #3073 from alexlarsson/refcount-driver-mounts
...
Refcount driver mounts
2014-01-22 11:42:17 -08:00
44a0bab304
Merge pull request #3712 from plietar/kill-signal
...
Add a -s option to the kill command to specify a signal.
2014-01-22 11:38:16 -08:00
639d2ecd4f
Merge pull request #3682 from alexlarsson/implement-tar
...
Implement tar in Go
2014-01-22 11:23:47 -08:00
4ccf423f42
Merge pull request #3695 from chazomaticus/3628-ignore-kernel-flavor
...
ignore non-numeric characters when parsing kernel version
2014-01-22 11:19:05 -08:00
dea3c2655d
Add comment about ignoring Sscanf error
...
Docker-DCO-1.1-Signed-off-by: Charles Lindsay <chaz@chazomatic.us > (github: chazomaticus)
2014-01-22 09:32:50 -08:00
7c55cbd4c9
move the contributing hook into hack, and use curl in the same way as the gofmt above
...
and remove the fmt-check one we don't document
tianon tells me they're called GitHub, not Github :)
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-01-22 21:31:42 +10:00
0f5ad430c4
change the documentation only - It looks like we have a number of cmdline params to completely update from the code version
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-01-22 21:29:05 +10:00
1c06a91964
Wording improvements
...
Docker-DCO-1.1-Signed-off-by: John Gardiner Myers <jgmyers@proofpoint.com > (github: johngmyers)
2014-01-21 22:40:33 -08:00
f3cb808e9d
Grammar and punctuation fixes
...
Docker-DCO-1.1-Signed-off-by: John Gardiner Myers <jgmyers@proofpoint.com > (github: johngmyers)
2014-01-21 22:40:06 -08:00
1f75a0bf43
Add a --signal option to the kill command to specify a signal.
...
Docker-DCO-1.1-Signed-off-by: Paul Lietar <paul@lietar.net > (github: plietar)
2014-01-22 06:10:52 +00:00
3cb5bc5ae5
Merge pull request #3708 from creack/fix_run_exit_code
...
Fix issue with exit code in non-tty mode.
2014-01-21 18:15:01 -08:00
fd38de2818
Fix issue with exit code in non-tty mode.
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-01-21 18:05:03 -08:00
4c1879f919
Merge branch 'add_missing_attributes' of https://github.com/rogaha/docker into rogaha-add_missing_attributes
...
Conflicts:
api.go
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-21 18:01:19 -08:00
572002a715
Merge pull request #3707 from bkcsoft/fix-bash-hashbangs
...
Update bash shebangs to use "/usr/bin/env bash" for increased portability
2014-01-21 17:30:52 -08:00
b1953baba2
This should make all bash-scripts run on pretty much any posix-system (with bash installed ofc...)
...
Docker-DCO-1.1-Signed-off-by: Kim BKC Carlbacker <kim.carlbacker@gmail.com > (github: bkcsoft)
2014-01-22 02:21:56 +01:00
cb33f739a1
Merge pull request #3705 from crosbymichael/fix-die-event
...
Fix die command when monitor returns
2014-01-21 17:13:29 -08:00
0b789ca844
Merge pull request #3706 from creack/fix_wait_stopped
...
Fix wait on stopped container (after docker restart) + add Unit test for that case
2014-01-21 17:03:35 -08:00
0376a69cb1
Fix wait on stopped container (after docker restart) + add Unit test for that case
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-01-21 16:49:24 -08:00
980000071d
Merge pull request #2655 from mpetazzoni/create-local-bind-dirs
...
Automatically create non-existent bind-mounted host directories
2014-01-21 16:27:20 -08:00
80f128a6ea
Fix die command when monitor returns
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-21 16:18:57 -08:00
47d1413d7a
Documentation about automatic bind-mount dir creation
...
Docker-DCO-1.1-Signed-off-by: Maxime Petazzoni <max@signalfuse.com > (github: mpetazzoni)
2014-01-21 16:05:30 -08:00
3e96f46b30
Automatically create non-existent bind-mounted directories on the host
...
Fixes #1279 .
Docker-DCO-1.1-Signed-off-by: Maxime Petazzoni <max@signalfuse.com > (github: mpetazzoni)
2014-01-21 16:05:29 -08:00
b417f79c00
Merge pull request #3704 from vieux/json_api_return_valid
...
Switch back to the valid json format
2014-01-21 15:35:06 -08:00
be6aeda1e4
Merge pull request #3640 from proppy/networkgetroutes-add-default
...
netlink: add default Route to NetworkGetRoutes
2014-01-21 15:20:16 -08:00
e3461bc8d6
switch back to the valid json format
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-21 15:06:23 -08:00
62c4563987
Merge pull request #3688 from shykes/docs-simplify-basic-usage
...
Simplify basic usage docs
2014-01-21 11:41:32 -08:00
e56562c35e
Merge pull request #3566 from tianon/fix-volume-symlinks
...
Fix symlink mounting issues
2014-01-21 11:37:05 -08:00
9164ba6516
Merge pull request #3686 from vieux/load_job
...
Load job
2014-01-21 11:29:15 -08:00
f2f44b91a8
move load to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-21 11:28:45 -08:00
ba4ae40445
Merge pull request #3690 from shykes/cleanup-maintainers
...
Cleanup maintainers
2014-01-21 11:18:23 -08:00
f98a596be9
Merge pull request #3698 from alexlarsson/fix-shared-root
...
Fix handling of shared roots
2014-01-21 11:09:36 -08:00
fb919137be
Merge pull request #3687 from shykes/docs-intro
...
docs: harmonize intro paragraph with website
2014-01-21 11:02:55 -08:00
31274ffccb
Merge pull request #3700 from jamtur01/fixedtoc
...
Fixed commandline/index warning in TOC
2014-01-21 10:52:13 -08:00
678d76fa9c
Merge pull request #3671 from tianon/completion-ignore-stderr
...
Update bash completion to ignore stderr output of docker binary
2014-01-21 10:40:23 -08:00
cce099aa34
Re-add kernel Flavor tests
...
Docker-DCO-1.1-Signed-off-by: Charles Lindsay <chaz@chazomatic.us > (github: chazomaticus)
2014-01-21 09:56:53 -08:00
b23e6e99b3
Merge pull request #3459 from Barthalion/master
...
Fix mkimage-arch.sh to generate cleaner Arch Linux images and do so with cleaner code
2014-01-21 07:11:57 -08:00
4137a0ea32
mkimage-arch: provide and use own pacman.conf
...
Docker-DCO-1.1-Signed-off-by: Bartłomiej Piotrowski <b@bpiotrowski.pl > (github: Barthalion)
2014-01-21 14:22:56 +01:00
fabf96b8ff
Fixed commandline/index warning in TOC
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-01-21 08:22:51 -05:00
787ff55283
mkimage-arch: use hash to check if command is available
...
Apart from having more predictable return codes on various operating
systems, it additionally caches the path to application.
Docker-DCO-1.1-Signed-off-by: Bartłomiej Piotrowski <b@bpiotrowski.pl > (github: Barthalion)
2014-01-21 14:22:47 +01:00
da4ba80733
mkimage-arch: don't generate ISO-8859-1 locale
...
Docker-DCO-1.1-Signed-off-by: Bartłomiej Piotrowski <b@bpiotrowski.pl > (github: Barthalion)
2014-01-21 14:22:39 +01:00
c6535d272c
mkimage-arch: unify usage of brackets around variables
...
Docker-DCO-1.1-Signed-off-by: Bartłomiej Piotrowski <b@bpiotrowski.pl > (github: Barthalion)
2014-01-21 14:22:33 +01:00
a4e6e9bd41
mkimage-arch: remove $DEV instead of renaming it
...
Docker-DCO-1.1-Signed-off-by: Bartłomiej Piotrowski <b@bpiotrowski.pl > (github: Barthalion)
2014-01-21 14:22:26 +01:00
c138c335a5
mkimage-arch: use mktemp to create ROOTFS directory
...
Docker-DCO-1.1-Signed-off-by: Bartłomiej Piotrowski <b@bpiotrowski.pl > (github: Barthalion)
2014-01-21 14:21:43 +01:00
f918fca3bf
archive: Always end directory filenames in tars with /
...
This matches what tar does, and without it the tarsum created
by the registry will not match the docker one.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-01-21 12:52:05 +01:00
5fe26ee426
aufs: Unmount inactive devices
...
This implements the new Put() operation such that
Get()/Put() maintains a refcount for each ID, mounting
only on first Get() and unmounting on the last Get().
This means we avoid littering the system with lots of mounts
and free resources related to them.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-01-21 11:26:11 +01:00
886f650d9b
devicemapper: Unmount inactive devices
...
This implements the new Put() operation such that
Get()/Put() maintains a refcount for each ID, mounting
only on first Get() and unmounting on the last Get().
This means we avoid littering the system with lots of mounts
and active devicemapper devices and free resources related
to them.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
asdfljk
2014-01-21 11:26:11 +01:00
191aa17d16
Remove container.EnsureMounted
...
This was deprecated already and all it did was call Mount().
The use of this was a bit confusing since we need to pair Mount/Unmount
calls which wasn't obvious with "EnsureMounted".
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-01-21 11:26:11 +01:00
bcaf6c2359
Add Put() to graphdriver API and use it
...
This makes all users of Put() have a corresponding call
to Get() which means we will be able to track whether
any particular ID is in use and if not unmount it.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-01-21 11:25:37 +01:00
bde2d3aef7
integration: Fix TestGetContainersExport
...
The tar changes made the name of the file in the tar archive
change from "./test" to "test", update the test to the new name.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-01-21 10:41:08 +01:00
08ab554195
Fix handling of shared roots
...
If rootIsShared() is detected we apply the shell stuff to early, before
the real command and arguments are added to the parameters. This
means they get passed on to unshare rather than docker-init, breaking
docker on e.g. fedora like:
goroutine 1 [running]:
runtime.panic(0x678340, 0x9b3fd7)
/usr/lib64/golang/src/pkg/runtime/panic.c:266 +0xb6
github.com/dotcloud/docker/execdriver/lxc.func·001(0xc21000a1b0, 0xc21001eab0, 0x7fff24715faf)
/home/alex/vcs/go/src/github.com/dotcloud/docker/execdriver/lxc/driver.go:41 +0x525
github.com/dotcloud/docker/sysinit.executeProgram(0xc21000a1b0, 0xc21000a1b0, 0xa)
/home/alex/vcs/go/src/github.com/dotcloud/docker/sysinit/sysinit.go:34 +0xca
github.com/dotcloud/docker/sysinit.SysInit()
/home/alex/vcs/go/src/github.com/dotcloud/docker/sysinit/sysinit.go:88 +0x791
main.main()
/home/alex/vcs/go/src/github.com/dotcloud/docker/dockerinit/dockerinit.go:14 +0x1a
The fix is to construct the full params array before escaping it.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-01-21 10:22:13 +01:00
fdf43f5de1
docs: harmonize intro paragraph with website
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-01-21 07:33:26 +00:00
ae2af201f3
Docs: fix capitalization of "Docker"
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-01-21 07:27:55 +00:00
b78ae3b652
Re-add Flavor to KernelVersionInfo
...
Docker-DCO-1.1-Signed-off-by: Charles Lindsay <chaz@chazomatic.us > (github: chazomaticus)
2014-01-20 21:26:23 -08:00
5b97e00438
Use Sscanf instead of regexp
...
Docker-DCO-1.1-Signed-off-by: Charles Lindsay <chaz@chazomatic.us > (github: chazomaticus)
2014-01-20 21:02:37 -08:00
d16691e3ad
- Ajusted server.go with gofmt
...
Docker-DCO-1.1-Signed-off-by: Roberto Hashioka <roberto.hashioka@docker.com > (github: rogaha)
2014-01-21 04:11:40 +00:00
2cfd696b9b
Added missing attributes to api search calls:
...
- Added an argument to the call() method in order to control the auth sharing
- Enabled it only for search. Pulls and pushes were enabled already.
- Grouped a few variable declarations
Docker-DCO-1.1-Signed-off-by: Roberto Hashioka <roberto.hashioka@docker.com > (github: rogaha)
2014-01-21 04:06:19 +00:00
14b2b2b7c2
Fix apparent typo
...
Docker-DCO-1.1-Signed-off-by: Charles Lindsay <chaz@chazomatic.us > (github: chazomaticus)
2014-01-20 19:49:40 -08:00
d2c9c1036b
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)
2014-01-20 19:49:39 -08:00
fc30346086
Add failing test for odd kernel version
...
Docker-DCO-1.1-Signed-off-by: Charles Lindsay <chaz@chazomatic.us > (github: chazomaticus)
2014-01-20 19:49:39 -08:00
a37ffa4041
Merge pull request #3662 from tianon/add-udev-to-deb
...
Add udev rules file to our generated deb package
2014-01-20 19:44:05 -08:00
c24d128bb5
Docs: move advanced topic "create your own base image" out of basic user guide
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-01-21 03:43:16 +00:00
589e1a9bdc
docs: "first steps with docker" is a better title than "learn basic commands"
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-01-21 03:43:16 +00:00
76eee50a67
docs: add standard 'check your docker install' paragraph to the 'hello world' examples.
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-01-21 03:43:16 +00:00
cf5504eed5
docs: move a sysadmin-focused topic out of the basic usage manual and into installation docs (setting up a user group for non-root access)
...
docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-01-21 03:43:16 +00:00
cf17816083
docs: simplify basic usage doc, step 1: check your docker install
...
docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-01-21 03:43:16 +00:00
1fe426641d
Remove myself as sole maintainer of api reference docs.
...
Please still ping me before changing APIs :)
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-01-20 18:49:13 -08:00
230554695a
Remove Ken from docs maintainers (he's busy on other things)
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-01-20 18:48:59 -08:00
90b52b7e06
Reordering to make FAQ last
2014-01-20 17:11:03 -08:00
acf43b4da7
Merge pull request #3618 from shykes/docs-cleanup-install
...
Docs cleanup install
2014-01-20 17:10:02 -08:00
b38d3154c8
Merge pull request #3600 from SvenDowideit/ghost-status-doc
...
Ghost status doc
2014-01-20 16:51:47 -08:00
497e7d651a
update todo
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-20 16:09:07 -08:00
12468f2bc8
Rename Process to Command
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-01-20 16:05:07 -08:00
ffe78e82c3
Merge pull request #3442 from DevTable/master
...
Fix support for registry auth with Dockerfile build.
2014-01-20 15:50:14 -08:00
6e6ff85362
Fix support for registry auth with Dockerfile build.
...
Docker-DCO-1.1-Signed-off-by: Jake Moshenko <jake@devtable.com > (github: jakedt)
2014-01-20 18:35:14 -05:00
37c1c7cf7a
Merge pull request #3685 from pnasrat/3679-cgroups-outside-lxc
...
Move Resources into exec driver
2014-01-20 15:35:06 -08:00
c2501942cf
Merge pull request #3684 from crosbymichael/push-multiple-tags
...
Push multiple tags for repository
2014-01-20 15:24:53 -08:00
45e8d1f4c0
docs: reuse official dependencies list from packager's guide for custom binary install docs
2014-01-20 23:17:40 +00:00
4e54dd245a
docs: remove out-of-date kernel requirements document.
...
Requirements differ from platform to platform depending on the plugins used, and so should be documented separately for each target platform
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-01-20 23:11:30 +00:00
dd786eefbb
docs: instead of a top-level 'upgrading docker' doc, add an 'upgrades' paragraph to each installation target
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-01-20 23:11:30 +00:00
29e6868cc3
docs: change topic of windows install docs to 'install docker on windows'
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-01-20 23:11:30 +00:00
c56e3b8569
docs: move 'vagrant' install docs to the more accurate 'mac' install docs
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-01-20 23:11:30 +00:00
d8a71635d4
docs: move security article to a new 'articles' section
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-01-20 23:11:30 +00:00
71c1646ba3
Don't expose cgroups via the execdriver API.
...
Use Resources to represent container limits rather than a cgroup specific field.
Docker-DCO-1.1-Signed-off-by: Paul Nasrat <pnasrat@gmail.com > (github: pnasrat)
2014-01-20 17:06:24 -05:00
fbd374f30b
Merge pull request #3681 from pnasrat/extract-cgroups-pkg
...
Extract cgroups into pkg sub dir
2014-01-20 14:00:44 -08:00
6dfbbaa4ff
Merge pull request #3650 from tianon/fix-doc-man-generation
...
Fix docs man page generation and add Dockerfile man page
2014-01-20 13:44:01 -08:00
a2aab7757e
Make sure new repositories can be pushed with multiple tags
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-20 13:39:35 -08:00
8a4824d1ad
hack: Remove GNU Tar requirement
...
We no longer call out to tar, so this is not needed.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-01-20 20:35:16 +01:00
6ed9b06e07
Fix Travis build errors by bumping our python module versions to be newer
...
See also https://bitbucket.org/birkenfeld/sphinx/issue/1281/sphinx-113-not-build-proper-manpages
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-20 12:30:18 -07:00
5ea48aa7f8
Implement TarFilter in go, rather than calling out to tar
...
This uses a plain filepath.Walk + addTarFile to create a tar file,
optionially compressing it with gzip.
Unfortunately go only has gzip compression support, not bzip2 or xz.
However, this is not a regression, as docker currently uses *no*
compression for TarFilter(). The only compression of tarfiles
currently happens in utils/tarsum.go, and that manually does gzip
compression.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-01-20 20:26:20 +01:00
bab8efbf05
Simplify addTarFile
...
We can use tar.FileInfoHeader to do much of the work.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-01-20 20:26:20 +01:00
5b77e51e0a
archive: Extract code from ExportChanges to addTarFile()
...
This is the code that takes a normal file and adds it to a TarWriter.
We extract it so that we can share it with Tar().
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-01-20 20:26:20 +01:00
4fb1db7f74
archive: Remove unused features
...
This simplifies that code that calls out to tar by removing support
for now unused features.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-01-20 20:26:20 +01:00
03a25c0800
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)
2014-01-20 11:23:09 -08:00
2553029959
Extract cgroups pkg.
...
Initial move before enhancing cgroups package.
Docker-DCO-1.1-Signed-off-by: Paul Nasrat <pnasrat@gmail.com > (github: pnasrat)
2014-01-20 14:15:44 -05:00
69be8adb68
Merge pull request #3665 from vgeta/3450-fix
...
Fixes Issue #3450
2014-01-20 11:10:54 -08:00
b563c0c02b
Merge pull request #3292 from alexlarsson/export-changes-manual
...
Don't shell out to tar for ExportChanges
2014-01-20 11:08:16 -08:00
0f0e582490
Merge pull request #3680 from pnasrat/extract-mount-pkg
...
Extract mount into pkg.
2014-01-20 11:04:16 -08:00
2e094db639
Extract mount into pkg.
...
Mount is self contained and generic, it should be in pkg, to allow other pkg modules to use it.
Docker-DCO-1.1-Signed-off-by: Paul Nasrat <pnasrat@gmail.com > (github: pnasrat)
2014-01-20 13:59:29 -05:00
3aa27eb055
Merge pull request #3295 from alexlarsson/implement-untar
...
Implement UnTar via archive/tar
2014-01-20 10:54:42 -08:00
a431f1703d
Merge pull request #3678 from creack/sysinfo_update
...
Add MAINTAINER and remove docker/utils dep from pkg/sysinfo
2014-01-20 10:39:37 -08:00
f87a67a3a8
Merge pull request #3649 from vieux/remove_buffers
...
refactor, remove useless buffers
2014-01-20 10:29:54 -08:00
274863f221
Update Travis to also compile the man page(s) now that they compile properly again
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-20 11:29:24 -07:00
1c152f443d
Add Dockerfile man page generation from our Dockerfile reference page
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-20 11:29:07 -07:00
10fc518fba
Fix docs manpage generation
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-20 11:29:07 -07:00
4fb507d756
Merge pull request #3656 from tianon/travis-test-docs
...
Update Travis to also test compiling the docs
2014-01-20 10:28:44 -08:00
fe02d58927
Update Travis to also test compiling the docs
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-20 11:24:38 -07:00
3bd36157a1
Merge pull request #3652 from tianon/fix-travis-on-non-master-prs
...
Fix Travis for PRs against non-master (like release, for example)
2014-01-20 10:21:50 -08:00
ff662446f7
Add MAINTAINER and remove docker/utils dep from pkg/sysinfo
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-01-20 10:20:29 -08:00
9152aab653
Update bash completion to ignore stderr output of docker binary
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-20 01:26:01 -07:00
cfd3d02737
Merge pull request #3669 from tianon/new-flags-completion
...
Update New Flags Completion
2014-01-20 00:12:40 -08:00
7379a22a8d
Fix symlink mounting issues by evaluating symlinks directly on the LHS of a bind-mount -v and by FollowSymlinkInScope on the RHS just before mounting
...
Tested successfully with variations around mounting /var/run and /var/run/docker.sock inside a "debian" container directly at /var/run/docker.sock where /var/run is a symlink to "/run" on both the host and in the container.
Fixes #3262
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-20 00:38:54 -07:00
fb981bdace
Switch docker run --username to docker run --user which is more accurate (while we can still do so without breaking anyone's scripts)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-20 00:28:55 -07:00
c6e43154f1
Resync bash completion to include all flags defined in the code, and to autocomplete properly on all parameters that are reasonably possible to do so on today
...
This also includes several new minor features that are interesting, so do explore a little. :)
Finally, this also fixes a few bugs where commands would complete parameters that they won't necessarily accept. We still have a few of these cases, but they're reduced to a minimum now.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-20 00:28:55 -07:00
e45b87031c
Fixes Issue# 3450
...
Docker-DCO-1.1-Signed-off-by: Gopikannan Venugopalsamy <gopikannan.venugopalsamy@gmail.com > (github: vgeta)
2014-01-19 17:48:54 -08:00
b8cca8138b
add a little info about ghosts
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-01-20 10:37:06 +10:00
595b8f2986
Add udev rules file to our generated deb package
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-19 17:27:43 -07:00
a60f0a0754
Merge pull request #3256 from alexlarsson/blkdiscard
...
Discard all data on devicemapper devices when deleting them
2014-01-18 10:12:10 -08:00
980e0bf52c
Fix Travis for PRs against non-master (like release, for example)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-18 10:41:37 -07:00
455495f7ca
refactor, remove useless buffers
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-17 18:54:02 -08:00
dc359e07d3
Merge pull request #3638 from tianon/update-mailmap-authors
...
Update .mailmap and AUTHORS - we're up to 316 unique contributors by my count!
2014-01-17 18:19:41 -08:00
fec97e72db
Merge pull request #3580 from crosbymichael/extract-lxc
...
Move LXC into a sub pkg and provide initial execution driver interface
2014-01-17 18:10:10 -08:00
d5112ffce6
Fix rebase for init error
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 17:42:58 -08:00
5c30c4379a
Add todos for driver changes
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 17:42:58 -08:00
97c8450705
Make sure drivers are registerd within sysinit
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 17:42:58 -08:00
cdfebc2a20
Change drvier name to append version
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 17:42:58 -08:00
70a5cb95b3
Move lxc template into lxc driver
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 17:42:58 -08:00
9e9f4b925b
Rename Capabilities in sysinfo and move it to its own subpackage
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: crosbymichael)
2014-01-17 17:42:58 -08:00
ca8dd73fbf
Small fixes to type names
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 17:42:22 -08:00
889b4b10ae
Cleanup + add Info to driver in order to have specific IsRunning()
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: crosbymichael)
2014-01-17 17:42:22 -08:00
f7684ea7f6
Move docker init into drivers functions
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: crosbymichael)
2014-01-17 17:42:22 -08:00
d3bae131d6
Make sure proc is umounted for chroot driver within init
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 17:42:22 -08:00
8c9f62d037
Improve wait for lxc and driver interface
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 17:42:22 -08:00
c2b602b2ac
Use utils.Go to get error from monitor
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 17:42:22 -08:00
e765c67b47
Add json tags and comments to exedriver types
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 17:42:22 -08:00
f3f2456b04
Simplify chroot wait, address code review issues
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 17:42:22 -08:00
8a38ead219
Move setup pty and standard pipes to funcs
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 17:42:22 -08:00
1e81387edc
Remove SysinitPath from process
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 17:42:22 -08:00
f846ecdc77
Make exec driver run a blocking command
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 17:42:22 -08:00
92e6db7beb
Improve chroot driver by mounting proc
...
Add -driver flag to dockerinit
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 17:42:22 -08:00
8e0741f5e4
Add chroot driver for testing
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 17:42:22 -08:00
1d8455e683
Move RootIsShared to lxc driver
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 17:42:22 -08:00
93ead2fe78
Update with lxc unconfined changes
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 17:42:22 -08:00
66782730b8
Fix network disabled for container
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 17:42:22 -08:00
77936ba1a1
Fix race in set running
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 17:42:22 -08:00
381d593d04
Fix race in cleanup
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 17:42:22 -08:00
ad9710685c
Fix race in TestRun
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 17:42:22 -08:00
8b60273f76
Update with container specific waitLock
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 17:42:22 -08:00
8e87835968
Rework monitor and waitlock inside of driver
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 17:42:22 -08:00
5a3d9bd432
WIP complete integration test run
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 17:42:21 -08:00
1c1cf54b0a
Fix tty set issue for ioctl error
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 17:42:21 -08:00
5573c744e4
Embed exec.Cmd on Process
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 17:42:21 -08:00
25a2697717
Keep state in core on container
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 17:42:21 -08:00
f2680e5a5b
Integrate process changes in container.go
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 17:42:21 -08:00
203b69c8c9
Implement lxc driver
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 17:42:21 -08:00
1ceb049118
Initial driver changes proposal
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 17:42:21 -08:00
a823d7967f
Merge pull request #3647 from vieux/refactor_registers
...
refactor registers
2014-01-17 17:39:54 -08:00
1776046618
Merge pull request #3322 from vieux/new_flags
...
new --flags
2014-01-17 17:35:18 -08:00
e71dbf4ee5
update commands.go
...
update docker.go
move to pkg
update docs
update name and copyright
change --sinceId to --since-id, update completion and docs
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor@docker.com > (github: vieux)
2014-01-17 17:33:15 -08:00
3ff5f2374c
refactor registers
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-17 16:57:43 -08:00
77d9fd2628
netlink: make darwin happy
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
2014-01-17 16:55:42 -08:00
dadd54dba3
netlink: move Route type to common arch file
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
2014-01-17 14:04:11 -08:00
ebaa92b208
Merge pull request #3620 from jamtur01/refman
...
Added Reference Manual
2014-01-17 13:42:22 -08:00
89ff488b55
Added Reference Manual
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
2014-01-17 15:29:32 -05:00
941d4ffa3e
Merge pull request #3641 from gfrey/fix_compression
...
detect compressed archives in API /build call
2014-01-17 12:02:54 -08:00
2f066aef49
Merge pull request #3632 from crosbymichael/stream-cp
...
Stream the cp operation on the client
2014-01-17 11:29:51 -08:00
a886fbfa4a
network: exclude default routes from checkRouteOverlaps
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
2014-01-17 11:09:53 -08:00
26726dc9ff
netlink: add default Route to NetworkGetRoutes
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
2014-01-17 11:09:50 -08:00
95df957f73
Replace creating buffer
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 11:02:44 -08:00
fdd8d4b7d9
Stream the cp operation on the client
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-17 10:51:29 -08:00
b4e5bfbf6f
Merge pull request #3637 from crosbymichael/no-panic-on-exec
...
Return error and not panic when cannot exec in dockerinit
2014-01-17 10:42:46 -08:00
6188d7ef66
Merge pull request #3635 from vieux/top_job
...
move Top to a job
2014-01-17 10:19:28 -08:00
4f53722dee
detect compressed archives in API /build call
...
AFAIK in some previous version it was possible to give a compressed docker file
to the API's build command and that was handled properly (aka compression was
detected and archive uncompressed accordingly). Fails with at least 0.7.5.
Fixed this using the DecompressStream method from the archive package.
Docker-DCO-1.1-Signed-off-by: Gereon Frey <me@gereonfrey.de > (github: gfrey)
2014-01-17 12:21:26 +01:00
ba52130873
Fix cross compile
...
stat.Rdev and time.* is 32bit on OSX, which breaks cross builds with eg:
cannot use stat.Rdev (type int32) as type uint64 in function argument
We fix this with an extra conversion to uint64.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-01-17 11:01:28 +01:00
2f6fb41dd1
Update .mailmap and AUTHORS - we're up to 316 unique contributors by my count!
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-16 20:13:51 -07:00
11ef2f0db4
Return error and not panic when cannot exec in dockerinit
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-16 18:31:21 -08:00
d6b810c32e
Merge pull request #3624 from tianon/vendor-maintainers
...
Symlink vendor/MAINTAINERS over to hack/MAINTAINERS
2014-01-16 17:58:28 -08:00
59fe36623b
Merge pull request #3599 from tianon/fix-install-sed
...
Fix release.sh sed of install.sh so we preserve tests against 'https://get.docker.io/ '
2014-01-16 16:54:39 -08:00
93ce4d2c0b
Merge pull request #3625 from tianon/cleanup-vendor-sh
...
Clean and simplify vendor.sh while making it easier to maintain as well
2014-01-16 16:42:52 -08:00
8cbabf2c3e
clean up test log
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-16 16:07:42 -08:00
812798a7d6
move top job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-16 16:07:42 -08:00
3155ef5cbc
Merge pull request #3616 from vieux/job_changes
...
move changes to a job
2014-01-16 15:52:57 -08:00
2cdbc719c5
Merge pull request #3583 from metalivedev/3497-copyright
...
Update docs/NOTICE copyrights to 2014
2014-01-16 12:18:34 -08:00
40b40cffb1
Clean and simplify vendor.sh while making it easier to maintain as well
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-15 22:20:51 -07:00
98111a4a94
Symlink vendor/MAINTAINERS over to hack/MAINTAINERS (since it depends explicitly on hack/vendor.sh)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-15 22:12:32 -07:00
90ec5de430
move changes to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-15 17:13:45 -08:00
20f36f088c
Merge pull request #3615 from vieux/search_job
...
move search to a job
2014-01-15 17:13:07 -08:00
1669b802cc
move search to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-15 17:12:48 -08:00
0b7d4c855d
Merge pull request #3512 from vieux/attach_job
...
move attach to a job
2014-01-15 17:12:14 -08:00
e1d8543c78
move attach to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-15 17:11:44 -08:00
c4b0eedc92
Merge pull request #3617 from dotcloud/fix_insert_display
...
fix docker insert display
2014-01-15 16:14:59 -08:00
2edcebc027
fix docker insert display
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-15 15:41:57 -08:00
44b8d8addf
Merge pull request #3559 from vieux/insert_job
...
move insert to a job
2014-01-15 15:18:02 -08:00
a33bc3018b
use the same 'Used' method as before
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-15 14:52:58 -08:00
0fb8a55753
move insert to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-15 14:52:58 -08:00
52ec95f363
Merge pull request #3560 from vieux/copy_job
...
move copy to a job
2014-01-15 14:48:51 -08:00
e2fa3f56df
move copy to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-15 14:48:31 -08:00
f213e2dd6c
Merge pull request #3613 from vieux/deprecated_viz_job
...
move viz to a job
2014-01-15 14:47:56 -08:00
a98e40fa73
update TODO
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-15 14:47:35 -08:00
7fbc315aa9
move viz to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-15 13:52:35 -08:00
cdea7d3b5f
Merge pull request #3598 from tianon/fix-vieux-docs-errors-again
...
Fix odd issues with "make docs", add "make docs-shell", and canonicalize...
2014-01-15 13:42:28 -08:00
0113c087b2
Merge pull request #3593 from dotcloud/fix_doc
...
fix doc, load and get
2014-01-15 13:33:00 -08:00
78138344a4
Merge pull request #3606 from jpallen/1319-fix-race-condition-in-truncindex
...
Add RWMutex lock into TruncIndex to fix race condition when inserting values
2014-01-15 11:41:51 -08:00
7e00ba03ec
fix doc, load and get
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-15 11:12:05 -08:00
ad5d675553
Merge pull request #3582 from vieux/history_job
...
move history to a job
2014-01-15 11:06:54 -08:00
7898dca8b3
fix tests & small code improvment
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-15 11:06:00 -08:00
5a91781ef9
Merge pull request #3608 from crosbymichael/merge_release_v0.7.6
...
Merge release v0.7.6 to master
2014-01-15 10:41:43 -08:00
3ef777ecbe
Merge branch 'release' into merge_release_v0.7.6
...
Conflicts:
VERSION
hack/make/ubuntu
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-15 09:54:06 -08:00
4934c35aa1
Merge pull request #3597 from crosbymichael/bump_v0.7.6
...
Bump to version v0.7.6
2014-01-15 09:40:43 -08:00
37fcbfa1f4
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)
2014-01-15 17:30:00 +00:00
dbf249e239
Merge pull request #3508 from tutumcloud/seccomp
...
Add capabilities needed by new sysinit to mkseccomp.pl sample list
2014-01-14 18:55:53 -08:00
221454f315
Fix release.sh sed of install.sh so we preserve tests against ' https://get.docker.io/ '
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-14 19:29:02 -07:00
eaa9c85511
Fix odd issues with "make docs", add "make docs-shell", and canonicalize our docs Dockerfile a bit more
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-14 19:23:30 -07:00
bc3b2ec062
Bump to version v0.7.6
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-14 17:53:20 -08:00
d103b6f6df
Add more specific lvm2 version to PACKAGERS document
...
I personally tested this using our container, and this was the lowest version that compiles and runs properly.
Docker-DCO-1.0-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Docker-DCO-1.1-Signed-off-by: Tianon Gravi <admwiggin@gmail.com > (github: crosbymichael)
2014-01-14 17:29:25 -08:00
07b50a90a8
Inline the test.docker.io fingerprint in the install.sh script as well
...
As long as we're doing it, we ought to do it for all the "official" Docker properties at least
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Docker-DCO-1.1-Signed-off-by: Tianon Gravi <admwiggin@gmail.com > (github: crosbymichael)
2014-01-14 17:27:51 -08:00
75293b12b3
Add ca-certificates to our package Recommends
...
It's only in "Recommends" because it's only required for all but the esoteric configurations (since you can't "docker pull" from the index without it, but that's about it).
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Docker-DCO-1.1-Signed-off-by: Tianon Gravi <admwiggin@gmail.com > (github: crosbymichael)
2014-01-14 17:27:34 -08:00
734b4566df
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)
Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com > (github: crosbymichael)
2014-01-14 17:27:12 -08:00
8d19b2caa0
Add remount for bind mounts in ro
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-14 17:26:34 -08:00
42fed841d3
Fix "foo: no such file or directory" test failure, and normalize creation of custom error to always depend on if os.IsNotExist(err) so we don't hide other errors that might crop up in these tests
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Docker-DCO-1.1-Signed-off-by: Tianon Gravi <admwiggin@gmail.com > (github: crosbymichael)
2014-01-14 17:25:35 -08:00
ad69836247
Stop ADD from following symlinks outside the context when passed as the first argument
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Docker-DCO-1.1-Signed-off-by: Tianon Gravi <admwiggin@gmail.com > (github: crosbymichael)
2014-01-14 17:25:26 -08:00
152c956719
Merge pull request #3594 from crosbymichael/add-bind-remount
...
Add remount for bind mounts in ro
2014-01-14 16:57:55 -08:00
f231539e99
Add remount for bind mounts in ro
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-14 15:20:21 -08:00
bfc256f6c9
Merge pull request #3581 from tianon/deb-xz-utils
...
Add xz-utils to our deb-recommends since it's necessary for some images
2014-01-14 12:07:10 -08:00
12d00d19bb
Merge pull request #3592 from tianon/fix-travis-vendor
...
Fix Travis to not check gofmt on vendor/*
2014-01-14 11:52:08 -08:00
feb3f98418
Merge pull request #3567 from tianon/dockerfile-add-symlink
...
Stop ADD from following symlinks outside the context when passed as the first argument
2014-01-14 11:48:54 -08:00
be44bf8170
Merge pull request #3585 from tianon/remove-uid-ns-reference
...
Remove reference to nonexistent CONFIG_UID_NS
2014-01-14 11:37:00 -08:00
da78dd0eb8
Merge pull request #3586 from flavio/add_openSUSE_installation_docs
...
Added document explaining openSUSE installation
2014-01-14 11:36:15 -08:00
bea6dd3888
move history to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-14 10:52:42 -08:00
7a6255efbc
Fix "foo: no such file or directory" test failure, and normalize creation of custom error to always depend on if os.IsNotExist(err) so we don't hide other errors that might crop up in these tests
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-14 11:42:03 -07:00
32565a4451
added capabilities needed by new sysinit
...
Docker-DCO-1.1-Signed-off-by: Fernando Mayo <fernando@tutum.co > (github: fermayo)
2014-01-14 19:27:31 +01:00
f700aa1570
Fix Travis to not check gofmt on vendor/*
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-14 11:07:18 -07:00
bdcd1cfba5
Merge pull request #3591 from tianon/fix-vendor
...
Un-gofmt ./vendor
2014-01-14 10:06:11 -08:00
a49efa975e
Merge pull request #3534 from philips/reformat-DCO
...
CONTRIBUTING.md: wrap DCO to 78 chars per line
2014-01-14 10:00:14 -08:00
e8ffc2eee0
Un-gofmt ./vendor
...
We can't be modifying this except to update from upstream.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-14 10:54:19 -07:00
b68ddcec21
Merge pull request #3570 from fabiofalci/3569-validate-docker-version
...
Fetch docker version over https
2014-01-14 09:36:18 -08:00
7d702ef501
Merge pull request #3587 from tianon/fix-gentoo-typo
...
Fix docs typo: "Gento" -> "Gentoo"
2014-01-14 09:22:58 -08:00
3a1ce011a0
Added document explaining openSUSE installation
...
Added a new documentation page explaining how to install Docker on
openSUSE.
Docker-DCO-1.1-Signed-off-by: Flavio Castelli <fcastelli@suse.com > (github: flavio)
2014-01-14 16:26:18 +01:00
5a3fa3c901
Add a few small tweaks to mkimage-debootstrap, especially to help with lucid
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-14 04:20:27 -07:00
c7dcd19b28
Fix docs typo: "Gento" -> "Gentoo"
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-14 04:18:51 -07:00
a4868e233c
Implement UnTar via archive/tar
...
This replaces the shelling out to tar with a reimplementation of untar
based on the archive/tar code and the pre-existing code from ApplyLayer
to create real files from tar headers.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-01-14 11:21:29 +01:00
710d5a48fb
archive: Extract createTarFile() from ApplyLayer
...
This way we can reuse it for Untar()
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-01-14 11:21:07 +01:00
658f57fdfa
Remove reference to nonexistent CONFIG_UID_NS
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-13 23:32:21 -07:00
fe6c9e8fd7
Merge pull request #3584 from tianon/fix-docs-dockerfile
...
Fix docs Dockerfile to install correctly again
2014-01-13 17:42:20 -08:00
4087a643ea
Fix docs Dockerfile to install correctly again
...
Previously we've been getting:
```
Step 6 : RUN pip install Sphinx==1.1.3
---> Running in 397eab32f57a
Wheel installs require setuptools >= 0.8 for dist-info support.
pip's wheel support requires setuptools >= 0.8 for dist-info support.
Storing debug log for failure in /.pip/pip.log
2014/01/13 18:01:34 The command [/bin/sh -c pip install Sphinx==1.1.3] returned a non-zero code: 1
make: *** [docs] Error 1
```
This fixes that by telling pip not to use sudo to install (since we're already root).
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-13 18:22:23 -07:00
a92699ab6c
Fixes 3497
...
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net > (github: @metalivedev)
2014-01-13 17:12:53 -08:00
9792df2080
Merge pull request #3575 from shykes/engine-get-images
...
move `docker images` to a job
2014-01-13 16:25:23 -08:00
16ca6a1c12
move legacy stuff outside the job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-13 16:20:05 -08:00
aca1270104
add legacy compat
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-13 15:50:20 -08:00
3a610f754f
Add compat 1.8
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-13 15:50:20 -08:00
17a806c8a0
Port 'docker images' to the engine API
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-01-13 15:49:33 -08:00
1004c2d3d8
Add xz-utils to our deb-recommends since it's necessary for some images
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-13 16:25:23 -07:00
89bed4337d
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)
2014-01-13 20:37:29 +00:00
6652416f4c
Merge pull request #3544 from SvenDowideit/build-image-cache
...
add info and example of image cache in use when building
2014-01-13 11:10:29 -08:00
93e120e7d6
Discard all data on devicemapper devices when deleting them
...
This works around the fact that deleting a device in a thin pool
doesn't discard the free space. Unfortunately even this is not perfect,
as it seems discards are respected only for blocks that has never been
shared in the thin device code. However, this has been fixed in the
upstream kernel device-mapper tree:
http://git.kernel.org/cgit/linux/kernel/git/device-mapper/linux-dm.git/commit/?h=for-next&id=0ab1c92ff748b745c1ed7cde31bb37ad2c5f901a
When this hits the kernel I belive this will fully return space
for removed images/containers to the host FS. For now it only
helps partially (which is better than nothing).
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-01-13 13:41:04 +01:00
d54ce8087a
Don't shell out to tar for ExportChanges
...
This changes ExportChanges to use the go tar support so we can
directly create tar layer files. This has several advantages:
* We don't have to create the whiteout files on disk to get them
added to the layer
* We can later guarantee specific features (such as xattrs) being
supported by the tar implementation.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
2014-01-13 13:36:11 +01:00
f30ca8935d
add info and example of image cache in use when building
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Docker-DCO-1.0-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
2014-01-13 22:17:47 +10:00
07f62f199f
Merge pull request #3554 from tianon/ubuntu-dep
...
Add ca-certificates to our package Recommends
2014-01-11 15:07:50 -08:00
7273b33e86
Merge pull request #3551 from tianon/test-docker-io-gpg-fingerprint
...
Inline the test.docker.io fingerprint in the install.sh script as well
2014-01-11 15:07:06 -08:00
ba90fcfc08
Merge pull request #3539 from jeandalido/patch-1
...
Update docker_remote_api_v1.8.rst
2014-01-11 13:29:56 -08:00
fb63cfa9a5
Stop ADD from following symlinks outside the context when passed as the first argument
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-11 05:46:11 -07:00
f65706aaeb
Merge pull request #3500 from tianon/lvm2-version
...
Add more specific lvm2 version to PACKAGERS document
2014-01-11 03:39:01 -08:00
fd78128870
Add support for RUN [""] in Dockerfiles for greater specificity in what is actually executed
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-11 04:00:52 -07:00
cb314b9752
Merge pull request #3555 from jordansissel/patch-1
...
Update Ubuntu packaging script to use 'fpm -s empty' instead of 'mkdir empty && fpm -s dir -C empty'
2014-01-10 22:46:30 -08:00
a02450d048
Use '-s empty' instead of '-s dir'
...
This *should* have the same effect as the previous strategy: Instead of
'mkdir empty; fpm -s dir -C empty ...' we can simply do 'fpm -s empty'
Docker-DCO-1.1-Signed-off-by: Jordan Sissel <jls@semicomplete.com > (github: jordansissel)
2014-01-10 22:36:58 -08:00
b61570b521
Merge pull request #3490 from vieux/image_export_job
...
Move image_export to a job
2014-01-10 15:58:47 -08:00
5264914e57
Move image_export to a job
...
Docker-DCO-1.0-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-10 15:54:44 -08:00
6dde20c0c5
Merge pull request #3180 from vieux/job_container_delete
...
Move container_delete to job
2014-01-10 15:53:38 -08:00
ad162b75a0
Merge pull request #3476 from vieux/restart_job
...
Move restart to a job
2014-01-10 15:52:42 -08:00
15689b56c8
Move restart to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-10 15:51:48 -08:00
aa3339cf39
move container_delete to job
...
handle error
remove useless errStr
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor@docker.com > (github: vieux)
2014-01-10 15:34:10 -08:00
459e0aa2c1
Merge pull request #3543 from EvanKrall/gzip_debs
...
Use gzip compression in Ubuntu packages to make it possible to install on Lucid
2014-01-10 15:29:22 -08:00
e5189b5dd2
Add ca-certificates to our package Recommends
...
It's only in "Recommends" because it's only required for all but the esoteric configurations (since you can't "docker pull" from the index without it, but that's about it).
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-10 13:06:53 -07:00
c2a59dfe48
Use gzip compression in Ubuntu packages to make it at least possible to install on Lucid.
...
Docker-DCO-1.1-Signed-off-by: Evan Krall <krall@yelp.com > (github: EvanKrall)
2014-01-10 11:45:00 -08:00
051e7a0bef
Inline the test.docker.io fingerprint in the install.sh script as well
...
As long as we're doing it, we ought to do it for all the "official" Docker properties at least
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-10 10:20:31 -07:00
2fd4c39c86
Update docker_remote_api_v1.7.rst and non-versionned
...
Docker-DCO-1.1-Signed-off-by: Jean-Baptiste Dalido <jbdalido@gmail.com > (github: jeandalido)
2014-01-10 11:35:25 +01:00
d69cf2986e
Update docker_remote_api_v1.8.rst
...
Docker-DCO-1.1-Signed-off-by: Jean-Baptiste Dalido <jbdalido@gmail.com > (github: jeandalido)
2014-01-10 11:27:21 +01:00
7985125602
Merge pull request #3537 from crosbymichael/merge_release_v0.7.5
...
Merge release v0.7.5
2014-01-09 11:39:35 -08:00
c3c89abfd6
Change version to v0.7.5
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-09 11:36:30 -08:00
1fcbd36cb2
Merge branch 'release' into merge_release_v0.7.5
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-09 11:36:14 -08:00
845b816686
Merge pull request #3532 from crosbymichael/bump_v0.7.5
...
Bump to v0.7.5
2014-01-09 11:33:57 -08:00
fc14e81bf9
Merge pull request #3533 from crosbymichael/run-rm-remove-volumes
...
Remove volumes on docker run -rm
2014-01-09 10:47:28 -08:00
c348c04fdf
Bump to version v0.7.5
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-09 10:34:50 -08:00
5ca0fedffc
Merge pull request #3535 from plietar/3457-git-build
...
Don't compress the archive made from git's output.
2014-01-09 10:32:28 -08:00
562a235763
Don't compress the archive made from git's output.
...
Commit 894d4a23fbpaul@lietar.net > (github: plietar)
2014-01-09 18:23:19 +00:00
e4af8b2ddc
CONTRIBUTING.md: wrap DCO to 78 chars per line
...
The DCO is a bit hard to read on Github right now because there is lots
of horizontal scrolling. Reformat it to 78 chars per line like the rest
of the file.
Example: http://imgur.com/LtJEIsl
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com > (github: philips)
2014-01-09 10:08:52 -08:00
14acf6883d
Remove volumes on docker run -rm
...
If we don't care about the container then we don't care about any
volumes created with the run of that container
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-09 09:58:40 -08:00
eb131250aa
Merge pull request #3530 from creack/update_dco_doc
...
Update DCO git hook example
2014-01-09 09:23:35 -08:00
9ec29fddf8
Merge pull request #3528 from tianon/update-travis-dco
...
Update Travis to check for new 1.1 DCO version
2014-01-09 09:23:23 -08:00
d015d31b1c
Merge pull request #3527 from keeb/add-dco
...
Amend DCO
2014-01-09 09:23:11 -08:00
f6292ab8d0
Merge pull request #3522 from bantic/fix-misspelled-names
...
Fix misspelled Hawkings -> Hawking, Archimede -> Archimedes, Euclide -> Euclid
2014-01-09 09:12:05 -08:00
c3f2597546
Update DCO git hook example
2014-01-09 09:02:56 -08:00
a4f3cd62a3
Update Travis to check for new 1.1 DCO version
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-09 09:52:17 -07:00
11d61ec77f
Bump DCO version
2014-01-09 08:47:03 -08:00
40c90796e9
Fix layout
2014-01-09 08:35:47 -08:00
7fb55f7725
Removed the 5th clause
...
Removed clause which states contributions should be relicensed
2014-01-09 08:35:06 -08:00
7a7c3d87d8
Fix misspelled Hawkings -> Hawking, Archimede -> Archimedes, Euclide -> Euclid
...
Docker-DCO-1.0-Signed-off-by: Cory Forsyth <cory.forsyth@gmail.com > (github: bantic)
2014-01-09 10:02:55 -05:00
42df36b6fc
Merge pull request #3515 from crosbymichael/no-host-name-without-networking
...
Do not add hostname when networking is disabled
2014-01-08 17:22:24 -08:00
0354c3a95c
Do not add hostname when networking is disabled
...
Docker-DCO-1.0-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-08 16:57:56 -08:00
189c40597f
Merge pull request #3511 from bantic/fix-misspelled-feynman
...
Fix misspelling of Richard Feynman's last name
2014-01-08 16:29:59 -08:00
98193a397e
Fix misspelling of Richard Feynman's last name
...
Docker-DCO-1.0-Signed-off-by: Cory Forsyth <cory.forsyth@gmail.com > (github: bantic)
2014-01-08 19:02:15 -05:00
c45cd9174e
Merge pull request #3460 from tsaavik/patch-1
...
Fixed error in group add example
2014-01-08 15:45:23 -08:00
ee65633620
Merge pull request #3446 from tianon/update-checklist
...
Update release checklist with more information, more commands, and more ...
2014-01-08 15:37:49 -08:00
3be2ea021d
Merge pull request #3417 from Sjord/use-most-recent-cache-image
...
Fix issue #3375 - Return most recent image from the cache
2014-01-08 15:30:36 -08:00
1d0d093d0b
Merge pull request #3464 from vieux/fix_error_wait
...
fix error on docker wait
2014-01-08 15:06:54 -08:00
38a49951b3
Merge pull request #3493 from SvenDowideit/commit-signoff-location
...
give more specific advice on setting up signing
2014-01-08 15:04:00 -08:00
772765c404
Merge pull request #3510 from creack/hotfix-add_caching
...
Hotfix add caching
2014-01-08 15:00:18 -08:00
71e89fdc75
Merge pull request #3514 from vieux/update_REMOTE_TODO
...
update REMOTE_TODO.md
2014-01-08 14:51:35 -08:00
5530cc29b2
update REMOTE_TODO.md
...
Docker-DCO-1.0-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
2014-01-08 14:50:52 -08:00
82aed48bbc
Merge pull request #3494 from tianon/makefile-use-branch-tag
...
Update Makefile to use "docker:GIT_BRANCH" as the generated image name
2014-01-08 14:47:41 -08:00
0fd9c98de3
Make sure the remote ADD are cached properly
...
Docker-DCO-1.0-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-01-08 14:22:49 -08:00
762a0cc472
Cleanup utils.Download
...
Docker-DCO-1.0-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-01-08 14:22:49 -08:00
e24e9c09f8
Make sure file are cached correctly during build
...
Docker-DCO-1.0-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-01-08 14:22:49 -08:00
93ff70a3e7
Potential fix for ADD .
...
Docker-DCO-1.0-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-01-08 14:22:24 -08:00
c6350bcc24
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)
2014-01-08 14:21:13 -08:00
9a6333466b
Merge pull request #3503 from gertvv/patch-1
...
Hello World: fix detach behavior
2014-01-08 11:44:26 -08:00
187eed7da5
Merge pull request #3501 from proppy/patch-1
...
google-compute-engine: fix typos
2014-01-08 11:40:30 -08:00
368e308971
Merge pull request #3499 from tianon/typos
...
Fix a few miscellaneous typos (Unkown -> Unknown, Recieve -> Receive)
2014-01-08 10:37:00 -08:00
149156a272
Merge pull request #3402 from manuel-woelker/3345-add-content-type-header-to-version-remote-api
...
Fix for #3345 : Add Content-Type Header "application/json" to GET /version response in remote API
2014-01-08 10:15:22 -08:00
8298a200ce
Add the customary bold
2014-01-08 18:45:06 +01:00
c4535c833d
gofmt
...
Docker-DCO-1.0-Signed-off-by: Danny Yates <danny@codeaholics.org > (github: codeaholics)
2014-01-08 10:37:22 +00:00
145501bee3
Fix indentation to match rest of file (tabs, not spaces)
...
Docker-DCO-1.0-Signed-off-by: Danny Yates <danny@codeaholics.org > (github: codeaholics)
2014-01-08 10:14:30 +00:00
df4ea946a6
Further simplification
...
Docker-DCO-1.0-Signed-off-by: Danny Yates <danny@codeaholics.org > (github: codeaholics)
2014-01-08 10:14:25 +00:00
6b48761ce9
Remove unneeded DependencyGraph
...
Docker-DCO-1.0-Signed-off-by: Danny Yates <danny@codeaholics.org > (github: codeaholics)
2014-01-08 10:14:14 +00:00
5aa304f969
Fix registry pushing/tagging
...
* docker push host:port/namespace/repo wouldn't push multiple tags for
the same image
* getImageList was unnecessarily complex returning a nested array of
ImgData when a correctly ordered list of images was sufficient
* removed various bits of redundancy
Docker-DCO-1.0-Signed-off-by: Danny Yates <danny@codeaholics.org > (github: codeaholics)
2014-01-08 10:13:14 +00:00
c9cebf3a73
Hello World: fix detach behavior
...
The hello world example relies on being able to exit the container attachment using Control-C without stopping it. According to this thread (and my own experience), this doesn't work anymore:
https://groups.google.com/forum/#!msg/docker-user/nWXAnyLP9-M/kbv-FZpF4rUJ
Added -sig-proxy=false to the attach command.
2014-01-08 10:58:55 +01:00
53a01aebd6
Fix for #3345 : Add Content-Type Header "application/json" to GET /version and /info responses in remote API
...
Docker-DCO-1.0-Signed-off-by: Manuel Woelker <github@manuel.woelker.org > (github: manuel-woelker)
2014-01-08 09:17:20 +01:00
46c8b11f24
Fix issue #3375 - Return most recent image from the cache
...
ImageGetCached searches for an image from the cache. Instead of returning the
first image it finds, it should return the most recently created image. When a
build with --no-cache then adds a new image with the same parameters, it is
used instead of the old, existing image.
Docker-DCO-1.0-Signed-off-by: Sjoerd Langkemper <sjoerd@byte.nl > (github: Sjord)
2014-01-08 09:15:45 +01:00
10b794b332
Revert "Make sure the cache lookup returns always the same result"
...
This reverts commit 1d4b7d8fa1sjoerd@byte.nl > (github: Sjord)
2014-01-08 09:14:31 +01:00
a3ee36b747
google-compute-engine: fix typos
2014-01-08 00:11:06 -08:00
7626e9fd64
Add more specific lvm2 version to PACKAGERS document
...
I personally tested this using our container, and this was the lowest version that compiles and runs properly.
Docker-DCO-1.0-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-08 00:27:50 -07:00
e525ad3f9b
Fix a few miscellaneous typos (Unkown -> Unknown, Recieve -> Receive)
...
Docker-DCO-1.0-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-07 22:15:53 -07:00
322a42b8a2
Merge pull request #3496 from creack/disable_build_compression
...
Disable compression for build. More space usage but much faster upload
2014-01-07 18:57:18 -08:00
90ea81433f
Merge pull request #3498 from crosbymichael/merge_release_v0.7.4
...
Merge release v0.7.4
2014-01-07 18:44:03 -08:00
d7f26c93d9
Change version to v0.7.4-dev
...
Docker-DCO-1.0-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-07 18:41:06 -08:00
d4e61b48eb
Merge branch 'release' into merege_release_v0.7.4
...
Docker-DCO-1.0-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-07 18:40:54 -08:00
1a6fc02348
Merge pull request #3495 from crosbymichael/bump_v0.7.4
...
Bump v0.7.4
2014-01-07 18:35:44 -08:00
010d74ec2f
Bump to v0.7.4
...
Docker-DCO-1.0-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
2014-01-07 18:06:20 -08:00
1137ecf7d1
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)
2014-01-07 17:46:04 -08:00
a25a80b2d3
Merge pull request #3361 from zimbatm/gpg-key-secure-best
...
Makes sure the GPG fingerprint is inlined in the doc everywhere.
2014-01-07 17:43:04 -08:00
a95712899e
Update Makefile to use "docker:GIT_BRANCH" as the generated image name for increased versatility
...
... and other minor Makefile improvements :)
Docker-DCO-1.0-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-07 18:38:07 -07:00
b57051a724
Update release checklist with more information, more commands, and more correct flow (test, upload to test.docker.io, test, upload to get.docker.io, THEN tag&merge)
...
Docker-DCO-1.0-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-07 18:28:07 -07:00
bb76985d39
Merge pull request #3474 from creack/fix_add_cache_issue
...
Fix ADD caching issue with . prefixed path
2014-01-07 17:24:18 -08:00
28ec47c441
Merge pull request #3492 from unclejack/3449-fix_docker_build_on_devicemapper
...
#3449 - fix `docker build` on devicemapper
2014-01-07 17:12:31 -08:00
94c803e9f0
Fixes key installation for other target urls in hack/install.sh
...
Docker-DCO-1.0-Signed-off-by: Jonas Pfenniger <zimbatm@zimbatm.com > (github: zimbatm)
2014-01-08 01:08:14 +00:00
13ebc68636
Makes sure the GPG key fingerprint is inlined in the doc everywhere.
...
Instead of `curl $url | apt-get add -` use the ubuntu keyserver and a full
fingerprint to retreive the key. This makes the distribution of the GPG key
more secure an less likely to change even if 3rd party gains access to the
packages repository.
Docker-DCO-1.0-Signed-off-by: Jonas Pfenniger <zimbatm@zimbatm.com > (github: zimbatm)
2014-01-08 01:07:04 +00:00
d003cfea25
Revert "Add -S option to tar for efficient sparse file handling"
...
This reverts commit 733bf5d3dd#3449 .
Docker-DCO-1.0-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
2014-01-08 02:58:39 +02:00
f3103e5c91
Fix issue with file caching + prevent wrong cache hit
...
Docker-DCO-1.0-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-01-07 16:53:55 -08:00
0eb5f233d6
give more specific advice on setting up signing
...
Docker-DCO-1.0-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
2014-01-08 10:19:44 +10:00
ef7e000a13
Make vfs error more explicit
...
Docker-DCO-1.0-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
2014-01-07 16:02:41 -08:00
811341423b
Fix ADD caching issue with . prefixed path
...
Docker-DCO-1.0-Signed-off-by: Guillaume J. Charmes <charmes.guillaume@gmail.com > (github: creack)
2014-01-07 16:02:20 -08:00
b3addb5fb8
Merge pull request #3430 from lsm5/fedora-official-image
...
install instructions use unprefixed fedora image
2014-01-07 15:12:37 -08:00
00ee6d1925
Merge pull request #3483 from lukaspustina/patch-1
...
Missing redirect in line 85
2014-01-07 15:11:02 -08:00
6f8a79c23c
Merge pull request #3462 from tsaavik/patch-2
...
Simplified and streamlined Amazon Quickstart
2014-01-07 15:09:35 -08:00
cf8063d152
Merge pull request #3461 from jbeda/patch-1
...
Update instructions for mtu flag for Docker on GCE
2014-01-07 15:03:19 -08:00
3e10fe1a15
Merge pull request #3488 from jamtur01/1310
...
Fixed #3481 - Added Ubuntu Saucy to installation
2014-01-07 14:56:03 -08:00
45ecdf9c8e
Merge pull request #3487 from crosbymichael/improve-images-speed
...
Only get rootfs when we need to calculate the image size
2014-01-07 14:47:31 -08:00
b942f24ba8
Merge pull request #3491 from tianon/travis-numeric-commit
...
Fix Travis handling of a fully-numeric commit hash being YAML-converted ...
2014-01-07 14:35:06 -08:00
3779291e9b
Fix Travis handling of a fully-numeric commit hash being YAML-converted to a number instead of a string
...
Docker-DCO-1.0-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-07 15:27:51 -07:00
fa14a1b983
Only get rootfs when we need to calculate the image size
...
Docker-DCO-1.0-Signed-off-by: Michael Crosby <crosby.michael@gmail.com > (github: crosbymichael)
2014-01-07 13:56:26 -08:00
f9e14cc838
Merge pull request #3489 from tianon/travis-fixes
...
Fix Travis PR testing to not overwrite the "master" that Travis creates with our "upstream master"
2014-01-07 12:53:19 -08:00
f2ea539467
Update REMOTE_TODO.md
2014-01-07 12:51:17 -08:00
7c4e5fbd46
Fix Travis PR testing to not overwrite the "master" that Travis creates with our "upstream master", and to also ignore commits with no content (like a Merge commit - there's no need to sign off on literally nothing)
...
Docker-DCO-1.0-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-07 13:45:40 -07:00
97ef8a067c
Fixed #3481 - Added Ubuntu Saucy to installation
...
Docker-DCO-1.0-Signed-off-by: James Turnbull <james@lovedthanlost.net > jamtur01
2014-01-07 11:46:07 -08:00
4b9e475a3d
Merge pull request #2091 from keeb/add-dco
...
Add Developer Certificate of Origin Text
2014-01-07 10:42:53 -08:00
1d0aeae339
Merge pull request #3431 from shin-/ping_standalone_check
...
Check standalone header when pinging a registry server.
2014-01-07 10:33:07 -08:00
859856b3e4
Merge pull request #3475 from tianon/travis
...
Add Travis CI configuration to validate DCO and gofmt
2014-01-07 10:19:43 -08:00
b8b18a2b42
Merge pull request #3435 from roylee17/3149-fix_port_mapping_of_tcp_plus_udp
...
Fix #3149 : port mapping of TCP + UDP
2014-01-07 10:08:13 -08:00
561d1db074
Add Travis CI configuration to validate DCO and gofmt
...
After each push, Travis CI will trigger, and check two things:
- make sure that each commit in the push has the Docker certificate of origin
- make sure that all .go files changed by this sequence of commits are correctly formatted in the most recent commit
Note: there is one edge case; if you do a git force push, we cannot figure out the actual commits in the force push, and we will just run the checks as if upstream master were the base. Pull requests will always be tested correctly, though.
Docker-DCO-1.0-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
2014-01-07 08:25:54 -07:00
1f9abfe841
Merge pull request #3480 from tianon/gofmt
...
Run 'gofmt -s -w'
2014-01-07 06:41:23 -08:00
2b93f18223
Missing pipe in line 85
2014-01-07 15:20:38 +01:00
8f3b8f3835
Run 'gofmt -s -w'
2014-01-06 22:14:35 -07:00
fca83b4cfb
Merge pull request #3477 from creack/fix_tar_leaks
...
Make CopyFileWithTar use a pipe instead of a buffer. Save more than 1Gb of ram for a 500Mb file.
2014-01-06 18:04:44 -08:00
444a087ac2
Make CopyFileWithTar use a pipe instead of a buffer. Save more than 1Gb of ram for a 500Mb file.
2014-01-06 17:44:22 -08:00
e1c861cf33
Update REMOTE_TODO.md
2014-01-06 17:37:30 -08:00
6fe3da9924
Remove the @github handle as it generates emails.
2014-01-06 17:21:14 -08:00
f43f3fa218
Merge pull request #3473 from dhrp/docs-version-warning-fix
...
[docs] Fix for wrong version warning on master instead of latest.
2014-01-06 16:26:04 -08:00
1e551c7cc5
[docs] Fix for wrong version warning on master instead of latest.
2014-01-06 16:18:00 -08:00
2c395ce8fb
Merge pull request #3328 from shykes/pkg-iptables
...
Move utility package 'iptables' to pkg/iptables
2014-01-06 15:54:07 -08:00
7799ae27ca
Move utility package 'iptables' to pkg/iptables
2014-01-06 15:41:24 -08:00
bb754fd34d
Merge pull request #3388 from tianon/more-build-tests
...
Add more TestBuild Dockerfiles, especially for 'echo shebang' testing
2014-01-06 15:14:30 -08:00
a0298c0bd0
Merge pull request #3420 from RoelVanNyen/getfullname
...
Cleanup: runtime.getFullName is deprecated by getFullName
2014-01-06 13:59:04 -08:00
a86a82cb7e
Merge pull request #3384 from tianon/fix-load-help
...
Fix "docker load" help by removing "SOURCE" prompt and mentioning STDIN
2014-01-06 13:30:16 -08:00
36ab1836f9
Fix dotCloud to Docker, Inc
2014-01-06 12:26:53 -08:00
5e8912e0e8
Fixed registry unit tests
2014-01-06 21:04:44 +01:00
4e414f6205
Merge pull request #3377 from cpuguy83/3333-fix_-H_default
...
Make blank -H option default to the same as no -H was sent
2014-01-06 11:30:27 -08:00
4f31141e13
Merge pull request #3310 from pnasrat/cgroups-subpackage
...
Extract cgroups utilities to own submodule.
2014-01-06 11:27:29 -08:00
82531f7168
fix error on docker wait
2014-01-06 11:11:04 -08:00
ee6823d797
Merge pull request #3297 from jaseg/master
...
Return meaningful error for meaningless Dockerfiles
2014-01-06 10:58:24 -08:00
1363dfdd1d
Merge pull request #3426 from bcbcarl/3425-upgrade_vbox_guest_additions
...
Upgrade VBox Guest Additions (Fix #3425 )
2014-01-06 10:39:26 -08:00
b308e33106
Tweak formatting for GCE instructions
2014-01-06 10:35:51 -08:00
e5b09523dc
Merge pull request #3367 from cpuguy83/3362-unify_cmd_entrypoint_handling
...
Use same error handling while unmarshalling args for CMD and ENTRYPOINT
2014-01-06 10:29:37 -08:00
d44abae873
Merge pull request #3441 from RoelVanNyen/container_start
...
Just pass the container in RegisterLinks(), no need to lookup by name
2014-01-06 10:19:01 -08:00
323c4b5211
Use same error handling while unmarshalling args for CMD and ENTRYPOINT
2014-01-06 13:15:14 -05:00
5b4a0cac4e
Merge pull request #3335 from vieux/remote_todo
...
add REMOTE_TODO
2014-01-06 10:12:08 -08:00
73294b6d56
Merge pull request #3455 from crigor/fix-pull-message
...
Fix login message to say pull instead of push.
2014-01-06 10:02:32 -08:00
d6ca05f7cb
Simplified and streamlined Amazon Quickstart
...
The amazon quickstart images are EBS backed and include cloudinit. I've personally tested these documentation changes as a new user to Docker.
2014-01-06 09:53:58 -08:00
dfc2dc4d35
Merge pull request #3445 from dotcloud/merge_release_v0.7.3
...
Merge release v0.7.3
2014-01-06 09:51:41 -08:00
fc559d9992
Fixed error in group add example
...
There is no ${USERNAME} in bash, only ${USER}
2014-01-06 09:29:56 -08:00
ea762c1a51
Update instructions for mtu flag for Docker on GCE
2014-01-06 09:29:33 -08:00
599009191a
Fix login message to say pull instead of push.
2014-01-05 17:07:16 +08:00
af50b2f17c
Merge pull request #3454 from sudosurootdev/master
...
Fix spelling error in hack/make.sh comment
2014-01-04 20:24:48 -08:00
2a1181f404
Spelling error.
2014-01-04 23:15:15 -05:00
f7afbf34fe
Merge pull request #3448 from tmahesh/patch-1
...
Changelog date typo fix: 2013-01-02 -> 2014-01-02
2014-01-04 08:21:48 -08:00
3069bf9460
Changelog date typo fix: 2013-01-02 -> 2014-01-02
2014-01-04 11:24:48 +05:30
32b9a429c5
Change version to 0.7.3-dev
2014-01-03 17:02:59 -07:00
76910d16cc
Merge pull request #3439 from dotcloud/bump_v0.7.3
...
Bump v0.7.3
2014-01-03 16:01:56 -08:00
42c7dc448f
Just pass the container in RegisterLinks(), no need to lookup by name again
2014-01-03 15:49:39 +01:00
8502ad4ba7
Bump version to v0.7.3
2014-01-02 21:19:19 -07:00
58ec7855bc
substantial spelling fix
2014-01-02 16:46:50 -08:00
949fde88df
Merge pull request #3437 from jamtur01/faqhere
...
Fixed duplicate here references in FAQ
2014-01-02 16:44:38 -08:00
5a9f45cb7a
Fixed duplicate here references in FAQ
2014-01-02 19:40:19 -05:00
8f4a54734f
Merge pull request #3428 from jamtur01/port1.8
...
Added some 1.7 API updates that were missing from 1.8
2014-01-02 16:34:56 -08:00
9359d79c4f
Merge pull request #3389 from SvenDowideit/3366-simplify-volumes-documentation
...
simplify the volumes documentation and mention more details
2014-01-02 16:29:09 -08:00
69db6ea867
Added some 1.7 API updates that were missing from 1.8
2014-01-02 19:27:59 -05:00
3b89187d03
Merge pull request #3409 from Chris00/patch-1
...
Mention lxc-checkconfig
2014-01-02 16:20:30 -08:00
82a47b0e82
Keep original transcript in Thatcher's voice
...
and clarify that this is an update to the example.
2014-01-02 16:17:52 -08:00
e0f07bc186
Merge pull request #3399 from rgstephens/patch-1
...
Update for Ubuntu 13.10
2014-01-02 16:14:47 -08:00
194eb246ef
Merge pull request #3353 from creack/improve_add_cache
...
Improve add cache
2014-01-02 16:07:33 -08:00
f560b87a86
Fix #3149 : port mapping of TCP + UDP
...
Signed-off-by: Tzu-Jung Lee <roylee17@gmail.com >
2014-01-02 16:01:04 -08:00
c561212b83
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.
2014-01-02 17:54:57 -05:00
81e596e272
Merge pull request #3287 from vieux/fix_progressbar_display_push
...
fix progressbar in docker push
2014-01-02 13:38:11 -08:00
acfdfa81be
Merge pull request #3427 from tianon/stub-deb-init-config
...
Add stubbed and commented "/etc/default/docker" to our deb package
2014-01-02 09:44:36 -08:00
589515c717
Check standalone header when pinging a registry server. Standalone has to be true to use basic auth (in addition to previous requirements)
2014-01-02 17:51:42 +01:00
523f726716
install instructions use unprefixed fedora image
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com >
2014-01-02 11:29:24 -05:00
7fd6dcc831
Add stubbed and commented "/etc/default/docker" to our deb package
...
This is to especially fix FPM 1.0+ complaining that we told it we have an /etc/default/docker "config file", but didn't actually include one.
2014-01-01 22:34:22 -07:00
848f290012
Upgrade VBox Guest Additions ( Fix #3425 )
2014-01-02 12:56:29 +08:00
add97f7eb0
Merge pull request #3419 from newzealandpaul/master
...
Mac OS X command in docs for pip fixed
2014-01-01 20:27:38 -08:00
9dd7ae4074
Cleanup: runtime.getFullName is deprecated by getFullName
2014-01-02 00:06:50 +01:00
5f55784224
Merge pull request #3374 from tianon/fpm-license-vendor
...
Replace FPM --vendor with --license, and give it the proper value of "Apache-2.0"
2014-01-01 14:42:47 -08:00
f3816ee024
Mac OSX command for pip was incorrect
2014-01-02 09:52:07 +13:00
0b3e153588
Implement suggestions
2014-01-01 12:28:22 +01:00
2226989410
Mention lxc-checkconfig
...
This is important because the list below is not complete when one build one's own kernel. Plus it is more robust in the face of changes.
2014-01-01 00:59:47 +01:00
c23b15b9d8
Merge pull request #3398 from thomasleveil/bash_completion_names
...
support for container names in bash completion
2013-12-31 08:28:21 -08:00
055b32e3f4
support for container names in bash completion
2013-12-31 11:34:23 +00:00
907d9ce13c
Merge pull request #3355 from creack/fix_build_exit
...
Exit with code 1 in case of error for `docker build`
2013-12-30 22:14:01 -08:00
74d45789dd
Merge pull request #3379 from tianon/organize-contrib-syntax
...
Reorganize the syntax highlighting files in contrib under a common directory
2013-12-30 21:57:19 -08:00
40522c0380
Merge pull request #3392 from tianon/fix-install-failure
...
Fix install failure when busybox can't be downloaded
2013-12-30 20:04:30 -08:00
d5bb0ff80a
Merge pull request #3401 from odonnellryan/patch-1
...
Swap "grep -q" with "grep > /dev/null" so that "go help" doesn't balk when the pipe closes unexpectedly (since "grep -q" closes the pipe the second it finds a match)
2013-12-30 18:44:23 -08:00
ad80da3389
Fixes Issue #3400
...
See Issue #3400
2013-12-30 20:58:25 -05:00
1f80c2a652
Update for Ubuntu 13.10
...
With two additional commands, this procedure will work for Ubuntu 13.10 using the image stackbrew/ubuntu:13.10.
1) change /etc/pam.d/sshd, pam_loginuid line 'required' to 'optional'
2) echo LANG=\"en_US.UTF-8\" > /etc/default/locale
2013-12-30 17:50:58 -08:00
1bc3f6b7b5
Merge pull request #3303 from crosbymichael/add-host-flag
...
Add DOCKER_HOST env var for client
2013-12-30 15:54:37 -08:00
643621133f
Merge pull request #3395 from jamtur01/basicsfixes
...
Minor fixes to the basic command documentation
2013-12-30 15:41:59 -08:00
fd240413ff
simplify the volumes documentation and mention more details
2013-12-31 09:09:57 +10:00
392b1e99b2
Merge pull request #3344 from tianon/dockerfile-cleanup
...
Many various Dockerfile cleanups
2013-12-30 11:26:13 -08:00
0dfebf2d93
Minor fixes to the basic command documentation
2013-12-30 13:57:11 -05:00
40aaebe56a
Merge pull request #3394 from jamtur01/clifixes
...
Numerous small fixes to the CLI documentation
2013-12-30 10:56:47 -08:00
a1dba16fe8
Numerous small fixes to the CLI documentation
2013-12-30 13:48:12 -05:00
e31f1f1eba
Merge pull request #3371 from Grunny/volumes-typo-fix
...
Fix typo in working with volumes doc page
2013-12-30 10:35:09 -08:00
7e720d0a77
Merge pull request #3312 from DeX77/master
...
Installation for FrugalWare
2013-12-30 10:34:39 -08:00
237868e9c3
Merge pull request #3380 from SvenDowideit/add-no-auth-note
...
add a simple note to suggest to the user to use RUN curl/wget/tool if the URL they need is behind auth
2013-12-30 10:00:51 -08:00
fc197188d7
Fix install failure when busybox can't be downloaded
...
Whether or not the "busybox" image downloads and runs properly at the end of the build, we don't want to have the script return a failing exit code, especially since at that point, Docker is successfully installed, and we're just tooting our own horn for good measure.
2013-12-30 08:38:43 -07:00
d59080d119
Merge pull request #3386 from bwiklund/headerfix
...
Fixed header image on docs.docker.io site
2013-12-30 06:48:02 -08:00
c6dcee329d
Add more TestBuild Dockerfiles, especially for making sure manual RUN echo '#!...' continues to work correctly
2013-12-30 00:10:48 -07:00
484a75f354
Update Dockerfile to use stackbrew/ubuntu (until it graduates), update Dockerfile MAINTAINER line, coalesce all apt-get installs into one invocation (including s3cmd by bringing in backports)
2013-12-29 23:27:01 -07:00
434cf6c8ca
fixed header size on narrow desktop window
2013-12-29 19:22:52 -08:00
83d631b6a4
Fix "docker load" help by removing "SOURCE" prompt and mentioning STDIN
...
Fixes #3383
2013-12-29 13:25:57 -07:00
8b82b0dfe7
Make blank -H option default to the same as no -H was sent
2013-12-29 14:36:46 -05:00
e93b7b4647
add a simple note to suggest to the user to use RUN curl/wget/tool if the URL they need is behind auth
2013-12-29 21:27:59 +10:00
06a818616b
Reorganize the syntax highlighting files in contrib under a common directory to match "contrib/init" and "contrib/completion"
...
This is split off from #2970 .
2013-12-29 01:46:00 -07:00
f50b8b08b5
Add DOCKER_HOST env var for client
...
This env var will set the -H flag on the docker
client.
2013-12-28 16:42:18 -08:00
cda146547e
Replace FPM --vendor with --license, and give it the proper value of "Apache-2.0"
...
Fixes #3372
2013-12-28 06:35:00 -07:00
a17fd7b294
Fix typo in working with volumes doc page
2013-12-28 20:22:46 +10:00
22162687df
Merge pull request #3358 from asbjornenge/master
...
Apply automatically to files named 'Dockerfile'
2013-12-27 08:22:52 -08:00
d256f3049b
* s/docker/Docker/
2013-12-27 11:55:57 +01:00
a1a4a99d7e
Apply automatically to files named 'Dockerfile'
2013-12-27 10:05:25 +01:00
4986958e7e
Exit with code 1 in case of error for docker build
2013-12-26 17:49:41 -08:00
cd735496da
Hash the sums for directory (ureadable when there is too many
2013-12-26 16:42:05 -08:00
894d4a23fb
Change BuildFile in order to use TarSum instead of custom checksum
2013-12-26 16:16:26 -08:00
fc9f4d8bad
Log files name along with their checksum in TarSum + add a Method to retrieve the checksum map
2013-12-26 16:01:36 -08:00
1d4b7d8fa1
Make sure the cache lookup returns always the same result
2013-12-26 15:43:27 -08:00
360078d761
Remove old debug from tarsum
2013-12-26 15:39:06 -08:00
808f2d39bd
Merge pull request #3343 from bwiklund/comment-edits
...
small batch of edits/corrections to comments
2013-12-26 10:22:33 -08:00
d1ca12e81b
Merge pull request #3347 from smarterclayton/patch-1
...
Fix typo in devmapper error message
2013-12-26 10:19:55 -08:00
a042c9fb1b
Merge pull request #3348 from manuel-woelker/document-name-param-in-remote-api
...
Document "name" query parameter for "POST /containers/create" in Remote API v1.8
2013-12-26 10:19:42 -08:00
721bb410f6
Document "name" query parameter for "POST /containers/create" in Remote API v1.8
2013-12-26 06:43:26 +01:00
029625981d
Fix typo in devmapper error message
2013-12-25 15:49:58 -05:00
0fccf0f686
small batch of edits/corrections to comments
2013-12-24 16:40:14 -08:00
efaf2cac5c
Merge pull request #2809 from graydon/880-cache-ADD-commands-in-dockerfiles
...
Issue #880 - cache ADD commands in dockerfiles
2013-12-24 16:22:51 -08:00
cb1fe939a8
Merge pull request #3337 from tianon/release-darwin
...
Release tgz and binaries for cross-compiled platforms
2013-12-24 14:44:41 -08:00
c654aea4f2
Merge pull request #3340 from jamtur01/apiport
...
Fixed #3039 - Added clarification on port options in API
2013-12-24 14:34:13 -08:00
d2d8a4a6c5
Fixed #3039 - Added clarify on port options in API
2013-12-24 13:01:59 -05:00
4100e9b7df
Update cross and tgz to play nicely together (creating a tgz for each supported OS/ARCH), and update release.sh to upload binaries and tgz files for all the supported OS/ARCH combos
2013-12-23 23:55:06 -07:00
5875953d9b
Merge pull request #3112 from shawnl/master
...
hack/PACKAGERS.md: libdevmapper
2013-12-23 19:24:36 -08:00
3264c1c5eb
add REMOTE_TODO
2013-12-23 19:01:10 -08:00
f4ce106e02
Merge pull request #3318 from sugi/mkimage-deb-fix-cache-glob
...
Fix glob expansion on mkimage-debootstrap
2013-12-23 17:20:41 -08:00
7ec1236cee
Merge pull request #3324 from roylee17/enhance-docker-top-err-msg
...
docker-top: improve error message for non-running containers
2013-12-23 17:15:37 -08:00
2b4bb67ce0
Merge pull request #3327 from shykes/pkg-graphdb
...
Move utility package 'graphdb' to pkg/graphdb
2013-12-23 16:33:11 -08:00
6155f07561
Merge pull request #3331 from shykes/pkg-names
...
Move utility package 'namesgenerator' to pkg/namesgenerator
2013-12-23 16:15:26 -08:00
e6e35e5984
Merge pull request #3330 from shykes/pkg-term
...
Move utility package 'term' to pkg/term
2013-12-23 16:11:42 -08:00
0d207abf8e
Merge pull request #3329 from shykes/pkg-netlink
...
Move utility package 'netlink' to pkg/netlink
2013-12-23 16:08:07 -08:00
a009d4ae8d
Move utility package 'namesgenerator' to pkg/namesgenerator
2013-12-23 23:45:18 +00:00
b75f385abd
Merge pull request #3304 from vieux/prevent_orphan_deletion
...
Prevent orphan in docker rmi
2013-12-23 15:44:46 -08:00
7ce7516c12
Move utility package 'term' to pkg/term
2013-12-23 23:42:37 +00:00
f6b91262a7
Move utility package 'netlink' to pkg/netlink
2013-12-23 23:39:39 +00:00
d16d748132
Move utility package 'graphdb' to pkg/graphdb
2013-12-23 23:33:06 +00:00
3fc9de3d03
Merge pull request #3325 from shykes/pkg-systemd
...
Move utility package 'systemd' to pkg/systemd
2013-12-23 15:26:25 -08:00
652c2c2a80
Add README to pkg
2013-12-23 23:12:19 +00:00
8e7db0432e
Move utility package 'systemd' to pkg/systemd
2013-12-23 23:07:01 +00:00
e1a15b25dc
Merge pull request #3309 from apocas/master
...
Wrong HTTP method in events endpoint. (documentation)
2013-12-23 14:58:49 -08:00
b1a3a55802
docker-top: improve error message for non-running containers
...
Signed-off-by: Tzu-Jung Lee <roylee17@gmail.com >
2013-12-23 14:50:24 -08:00
614bc5c1e1
http method typo in documentation for events endpoint (all api versions)
2013-12-23 21:21:01 +00:00
3fe4d5477a
Merge pull request #3298 from creack/add_arch_user_agent
...
Add arch/os info to user agent (Registry)
2013-12-23 12:08:26 -08:00
cda24e345c
Merge pull request #3302 from briandorsey/master
...
Added a note about a networking work-around.
2013-12-23 11:25:20 -08:00
88037b2877
Merge pull request #3320 from jamtur01/privapi
...
API documentation update for Privileged
2013-12-23 11:22:47 -08:00
6cdd1aa350
Merge pull request #3321 from jamtur01/apiclean
...
Minor style cleanups to the API spec docs
2013-12-23 11:20:56 -08:00
ea8a3438f7
Minor style cleanups to the API spec docs
2013-12-23 11:45:51 -05:00
954158ce52
Merge pull request #2986 from SvenDowideit/still-need-privileged
...
still need -privileged to run a build / test
2013-12-23 07:58:17 -08:00
bf17383e35
API documentation update for Privileged
...
The 1.7 API docs show the ability to pass Privileged
when creating a container. This is not supported as.
Privileged is now part of hostConfig and can only be
passed when starting a container.
This fixes the documentation issue.
2013-12-23 09:08:28 -05:00
83d81758b0
use the Makefile - it makes life so much simpler
2013-12-23 23:46:52 +10:00
e3b878ce98
Fix glob expansion for no-cache setting.
...
On previous version, glob pattern will be expanded to actual file
names when writing setting to etc/apt/apt.conf.d/no-cache.
This patch fixes to quote to work cache clean command properly.
2013-12-23 17:27:22 +09:00
1e5f9334e0
Merge pull request #3308 from crigor/patch-1
...
Change an to a
2013-12-21 15:12:50 -08:00
3edbf416bf
+ added missing link in index.rst
...
* some gramatic and spelling fixes
Thx jamtur :)
2013-12-22 00:00:20 +01:00
c2364b978d
Merge pull request #3272 from SvenDowideit/more-complete-run-cmd-example
...
A more complete example of docker run.
2013-12-21 14:52:41 -08:00
158e3d60ec
Installation for FrugalWare
2013-12-21 23:38:13 +01:00
e4e579b40d
Wrong HTTP method in events endpoint.
2013-12-21 16:41:41 +00:00
071528e103
Change an to a
2013-12-21 16:23:13 +08:00
a2fcd3d8f0
Merge pull request #3306 from roylee17/3224-fix-udp-cleanup
...
network: fix a typo in udp cleanup path
2013-12-21 00:03:07 -08:00
7d2e851d8e
network: fix a typo in udp cleanup path
...
Fix #3224 - Port already in use error when running a container
Signed-off-by: Tzu-Jung Lee <roylee17@gmail.com >
2013-12-20 17:54:54 -08:00
85f9b778f5
fix progressbar in docker push
2013-12-20 16:55:41 -08:00
369cde4ad7
discard test output
2013-12-20 16:50:31 -08:00
3ffc52bcf5
Merge branch 'test-container-orphaning' of https://github.com/gabrtv/docker into prevent_orphan_deletion
2013-12-20 16:27:33 -08:00
8dcca2125a
prevent orphan
2013-12-20 16:26:02 -08:00
cdd14b1a31
Update MTU work-around to use the new -mtu flag
2013-12-20 16:19:35 -08:00
37ed178611
Added a note about a networking work around.
...
An additional flag to limit the networking MTU is required in three Compute Engine zones for reliable networking from inside the docker container. Added a warning to that effect to the QuickStart guide.
2013-12-20 16:06:28 -08:00
c995c9bb91
add TestContainerOrphaning integration test
2013-12-20 16:52:34 -07:00
aa619de748
Merge pull request #3289 from crosbymichael/add-mtu-option
...
Allow mtu to be configured at daemon start
2013-12-20 13:21:56 -08:00
6fde28c293
Merge pull request #3300 from crosbymichael/fix-mountinfo-parsing
...
Only parse upto the mountpoint in mountinfo
2013-12-20 13:21:20 -08:00
f4358fc647
Merge pull request #3291 from dineshs-altiscale/3282-sparse-files
...
Add -S option to tar for efficient sparse file handling
2013-12-20 11:10:31 -08:00
57e19b1475
Merge pull request #3294 from discordianfish/3293-better-error-dockerfile-empty
...
Return error if Dockerfile is empty
2013-12-20 10:45:56 -08:00
8051b6c1a1
Only parse upto the mountpoint in mountinfo
2013-12-20 13:34:05 -05:00
566ff54d0d
Allow mtu to be configured at daemon start
2013-12-20 12:12:03 -05:00
f9359f59a8
Add dynamic os/arch detection to Images
2013-12-20 08:20:08 -08:00
e4561438f1
Add arch/os info to user agent (Registry)
2013-12-20 08:19:25 -08:00
b8cd2bc94d
Return meaningful error for meaningless Dockerfiles
2013-12-20 16:19:21 +01:00
f7ba1c34bb
Return error if Dockerfile is empty
2013-12-20 14:13:52 +01:00
df87919165
make a more complete example of docker run, showing the use of most of the options ( Closes #1500 )
2013-12-20 20:06:07 +10:00
733bf5d3dd
Add -S option to tar for efficient sparse file handling
...
Fixes issue #3282
2013-12-19 21:41:22 -08:00
efde305c05
Merge pull request #3286 from pandrew/3279-documentation-docker-inspect
...
Update docs to include images for docker inspect
2013-12-19 14:50:55 -08:00
636dfc82b0
Merge pull request #3064 from tianon/custom-dockerinit-path
...
Allow custom dockerinit path
2013-12-19 14:31:41 -08:00
93abcc3a3b
Merge pull request #3273 from crosbymichael/set-mtu-in-dockerinit
...
Move MTU setting outside of lxc and set with netlink
2013-12-19 14:25:27 -08:00
c3ec696284
Merge pull request #3244 from codeaholics/remove-apt-errors-during-build
...
Tidy up some of the error messages from apt during build
2013-12-19 13:28:56 -08:00
fdd81b423b
Merge pull request #3288 from tianon/makefile-maintainer
...
Add Tianon as Makefile maintainer
2013-12-19 13:26:52 -08:00
cd89fe5c4f
Add Tianon as Makefile maintainer
2013-12-19 13:42:35 -07:00
1636ed9826
Merge pull request #3283 from jpoimboe/update-vendor.sh
...
add gosqlite to vendor.sh
2013-12-19 12:37:25 -08:00
8072d3a4e0
Update docs to include images for docker inspect
2013-12-19 20:55:19 +01:00
d215724ad6
add gosqlite to vendor.sh
...
Add gosqlite and its latest revision to vendor.sh so that the vendor
directory can be reliably recreated.
2013-12-19 13:51:46 -06:00
0e6f0c4e02
Move MTU setting outside of lxc and set with netlink
2013-12-19 11:51:44 -08:00
629cc2fce4
Merge pull request #3284 from jamtur01/faqmore
...
Added some more items to the FAQ
2013-12-19 11:32:53 -08:00
8c52140059
Added some more items to the FAQ
2013-12-19 14:27:47 -05:00
f21bd80e90
Merge pull request #3271 from crosbymichael/mount-outside
...
Perform docker specific mounts outside of lxc
2013-12-19 11:13:31 -08:00
4bdd4599f0
Merge pull request #3243 from alexlarsson/compressed-tar
...
Handle compressed tars in ApplyLayer
2013-12-19 11:02:32 -08:00
ed93dab9a8
Merge pull request #3276 from tianon/cross-compile
...
Add new "cross" bundle to cross-compile the Docker client
2013-12-19 10:41:12 -08:00
62a81370ff
Add new "cross" bundle to cross-compile the Docker client for other platforms (currently just 32-bit and 64-bit OS X)
2013-12-19 11:33:49 -07:00
e74c65c3db
Merge pull request #3274 from tianon/tianon-dockerfile
...
Make Tianon the official root "Dockerfile" maintainer
2013-12-19 10:31:00 -08:00
248eadd341
Merge pull request #3277 from jpoimboe/fix-root-symlink
...
Move root symlink check to engine.New
2013-12-19 10:24:23 -08:00
e829d5b6d2
Merge pull request #3275 from crosbymichael/sqlite-import
...
Move sqlite conn to graph db for cross compile support
2013-12-19 10:18:30 -08:00
35d8ac94f3
Merge pull request #3270 from vreon/tree-box-drawing-characters
...
Use box-drawing characters in `docker images -tree`
2013-12-19 10:00:33 -08:00
94821a3353
Move root symlink check to engine.New
...
Since commit c91c365
2013-12-19 00:39:12 -06:00
d14c162fd6
Use box-drawing characters in docker images -tree
...
This makes the output of `docker images -tree` look a little prettier.
Previously it displayed a combination of box-drawing characters and pipe
characters, so the lines didn't quite connect...
Before:
└─aceb1e132fe5 Size: 487 MB (virtual 1.728 GB)
|─c5480c55e00a Size: 44.89 MB (virtual 1.773 GB)
| └─96c21b5e3c80 Size: 17.25 kB (virtual 1.773 GB)
| └─58f3f2293512 Size: 8.191 MB (virtual 1.782 GB)
After:
└─aceb1e132fe5 Size: 487 MB (virtual 1.728 GB)
├─c5480c55e00a Size: 44.89 MB (virtual 1.773 GB)
│ └─96c21b5e3c80 Size: 17.25 kB (virtual 1.773 GB)
│ └─58f3f2293512 Size: 8.191 MB (virtual 1.782 GB)
2013-12-18 22:30:21 -08:00
14d1c5a2c3
Make Tianon the official root "Dockerfile" maintainer, since it's so hard-locked to hack changes most of the time
2013-12-18 22:29:48 -07:00
329d154209
Move sqlite conn to graph db for cross compile support
2013-12-18 21:14:16 -08:00
7bc96aec7b
Improve interface by moving to subpkg
...
Enable builds on OSX
2013-12-18 16:42:49 -08:00
a6fdc5d208
Fix unmount issues
2013-12-18 15:24:08 -08:00
681b40c801
Merge pull request #3268 from vieux/prevent_panic_volume
...
prevent a panic with docker run -v /
2013-12-18 14:06:44 -08:00
536da93380
prevent a panic with docker run -v /
2013-12-18 13:57:49 -08:00
45d7dcfea2
Handle external mounts outside of lxc
2013-12-18 13:46:02 -08:00
210fa0871c
Merge pull request #3267 from vieux/debug_daemon_start
...
add some debug to runtime.restore()
2013-12-18 13:45:22 -08:00
f768c6adb7
Merge pull request #3263 from tianon/abspath-root
...
Canonicalize our root path before we try using it
2013-12-18 11:41:47 -08:00
fde909ffb8
add some debug to runtime.restore()
2013-12-18 10:57:21 -08:00
553b4dae45
Merge pull request #3264 from creack/fix_osx_compilation
...
Fix osx compilation
2013-12-18 10:50:14 -08:00
929662a4d5
Merge pull request #3266 from tianon/fix-integration-test-building
...
Add -a to our BUILDFLAGS directly, which fixes some fun test compilation issues
2013-12-18 10:37:55 -08:00
fbac812540
Add -a to our BUILDFLAGS directly, which fixes some fun test compilation issues
...
Also, now that we use "-a", we no longer get any benefit from "go test -i", and it actually causes problems sometimes, so let's nuke it.
2013-12-18 11:32:25 -07:00
e481c82fa9
Fix OSX compilation for aufs
2013-12-18 10:18:49 -08:00
73a1ef7c22
Fix OSX build for sysinit
2013-12-18 10:16:48 -08:00
c91c365f88
Canonicalize our root path before we try using it, because we make assumptions about it not containing symlinks
...
Fixes #3242
2013-12-18 11:15:09 -07:00
b8a4f570fb
archive: Re-add XZ compression support
...
This shells out to the xz binary to support .tar.xz layers, as
there is no compression/xz support in go.
2013-12-18 10:50:22 +01:00
70c7220a99
Merge pull request #3128 from codeaholics/1530-improve-error-message
...
Improve error message when refusing to remove image due to multiple repo tags
2013-12-17 20:49:25 -08:00
0f45e3c6e0
Merge pull request #3205 from cddr/Vagrantfile-typos
...
Fix typos in Vagrantfile
2013-12-17 20:41:53 -08:00
be0beb897a
Merge pull request #3238 from tianon/go-build-a
...
Readd go build -a
2013-12-17 20:40:36 -08:00
8fa4c4b062
Merge pull request #3253 from titanous/update-container-name-validation
...
Update container name validation
2013-12-17 20:34:53 -08:00
c06ab5f9c2
Add container name validation test
2013-12-17 20:19:23 -05:00
3ec39ad01a
DRY up valid container name pattern usage
2013-12-17 20:17:50 -05:00
1940015824
Add '.' to valid container name pattern
2013-12-17 20:17:06 -05:00
1acefac97e
Merge pull request #3234 from creack/default_unix_path
...
Default unix path
2013-12-17 16:24:01 -08:00
f630fbc7cf
Merge pull request #3228 from maztaim/patch-1
...
Update binaries.rst
2013-12-17 13:10:08 -08:00
e61f327ec9
Merge pull request #3250 from vincentwoo/patch-1
...
Update docker_remote_api.rst to reflect that the latest remote API version is 1.8
2013-12-17 13:09:37 -08:00
c4444ce48f
Update docker_remote_api.rst to reflect that the latest remote API version is 1.8
2013-12-17 11:48:21 -08:00
7ba0f1f421
Merge pull request #3236 from dhrp/doc-master-warning
...
Added warning when browsing master. & no longer hides alternative versions
2013-12-17 11:17:17 -08:00
30454bb85c
Merge pull request #3249 from tianon/fix-sphinx-warning
...
Fix minor sphinx warning
2013-12-17 11:03:44 -08:00
2deb0c3365
Merge pull request #3248 from lsm5/docker-fedora-conflict
...
Docker fedora conflict
2013-12-17 11:01:37 -08:00
efc0610c0e
Removed unnessary span element from version floater and
...
Replaced social footer by the one from www.docker.io
2013-12-17 10:39:22 -08:00
391676b598
Merge pull request #3221 from jamtur01/introlink
...
Updated Introduction link
2013-12-17 10:36:00 -08:00
5204feeaa9
Merge pull request #3237 from tianon/hack-fix-cover-detection
...
Fix "go tool cover" detection to only add -cover and -coverprofile if we...
2013-12-17 10:09:40 -08:00
81d112cb7f
Fix minor sphinx warning
2013-12-17 10:38:55 -07:00
25be0b1e98
Fedora first letter capitalize and misc. rewording
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com >
2013-12-17 11:32:40 -06:00
c56b045270
Merge pull request #3239 from tianon/old-go-not-supported
...
Purge more hack references to Go 1.1.2
2013-12-17 09:08:42 -08:00
d9a1cc7e2b
Merge pull request #3168 from discordianfish/2464-replace-lxc-ps
...
Reimplement lxc-ps
2013-12-17 09:06:52 -08:00
30b4a0f76a
docker and docker-io conflict update for epel
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com >
2013-12-17 10:56:31 -06:00
7d95145b76
update fedora doc: docker and docker-io conflict
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com >
2013-12-17 10:33:52 -06:00
379a7fab07
Update docs
2013-12-17 07:55:36 -08:00
36e060299f
Tidy up some of the error messages from apt during build
2013-12-17 13:50:37 +00:00
a96a26c62f
Handle compressed tars in ApplyLayer
...
When pulling from a registry we get a compressed tar archive, so
we need to wrap the stream in the right kind of compress reader.
Unfortunately go doesn't have an Xz decompression method, but I
don't think any docker layers use that atm anyway.
2013-12-17 14:19:48 +01:00
c3705e83e7
Improve error message when refusing to remove image due to multiple repo tags
2013-12-17 12:34:25 +00:00
5e9b4a23e6
Purge more hack references to Go 1.1.2 (since it requires backported archive/tar patches now, and Go 1.2 is _widely_ packaged successfully)
2013-12-16 23:57:54 -07:00
a1c5e276f4
Add "-a" back to our "go build"
2013-12-16 23:50:03 -07:00
eddda577a4
Fix "go tool cover" detection to only add -cover and -coverprofile if we both have cover support in Go, and if we have the cover tool downloaded
2013-12-16 22:54:06 -07:00
2ed1001c57
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.
2013-12-16 22:29:08 -07:00
f02d766f9a
Add dockerinit SHA1 and path to "docker info" when debug mode is enabled
2013-12-16 22:29:05 -07:00
2035af44aa
Always copy dockerinit locally, regardless of whether our docker binary is static, because even it might get deleted or moved/renamed
2013-12-16 22:29:00 -07:00
746ae155fb
Added warning when browsing master. & no longer hides alternative versions.
2013-12-16 18:36:35 -08:00
a26801c73f
Add CHANGELOG.md entry for ADD caching.
2013-12-16 17:38:16 -08:00
670b326c1b
Add self to AUTHORS.
2013-12-16 17:36:51 -08:00
15a6854119
Add testcases for ADD caching, closes #880 .
2013-12-16 17:36:51 -08:00
3f9416b58d
Record added-tree sha256 in buildfile.CmdAdd, probe and use cache.
2013-12-16 17:36:51 -08:00
7afd7a82bd
Factor cache-probing logic out of buildfile.commit() and CmdRun().
2013-12-16 17:36:50 -08:00
124da338fd
Merge pull request #3207 from alexlarsson/fix-applylayer
...
Re-enable TestApplyLayer and make it work
2013-12-16 16:55:48 -08:00
69a31c3386
Improve TestParseHost
2013-12-16 16:35:56 -08:00
20605eb310
Allow to use -H unix:// like -H tcp://
2013-12-16 16:30:23 -08:00
945a1f06f9
Merge pull request #3232 from dhrp/Full-width-documentation
...
Full width documentation
2013-12-16 15:56:39 -08:00
64136071c6
Change version to 0.7.2-dev
2013-12-16 15:43:46 -08:00
28b162eeb4
Merge pull request #3233 from crosbymichael/bump_0.7.2
...
Bump to 0.7.2
2013-12-16 15:06:42 -08:00
e960152a1e
Bump to v0.7.2
2013-12-16 14:50:07 -08:00
fe956ad449
Improvement upon @SvenDowideit suggestion to make the docs use full-width
...
Moved the style comments source to into the .less file
2013-12-16 14:37:56 -08:00
47375ddf54
Merge pull request #3230 from crosbymichael/allow-untag
...
Allow untag operations with no container validation
2013-12-16 14:34:56 -08:00
f0d6a91a1b
Merge pull request #3217 from SvenDowideit/deal-with-changing-paths-for-lxc-start
...
lxc-start-unconfined softlink can go bad
2013-12-16 13:38:03 -08:00
62213ee314
Allow untag operations with no container validation
2013-12-16 13:29:43 -08:00
fa48f17493
Merge branch 'use-complete-width-of-browser-for-docs' of github.com:SvenDowideit/docker into SvenDowideit-use-complete-width-of-browser-for-docs
2013-12-16 13:08:00 -08:00
41d972baf1
Merge pull request #3219 from unclejack/vagrant_fix_version_check
...
install vbox guest additions if the latest aren't already installed
2013-12-16 12:49:32 -08:00
b3ad330782
Merge pull request #3099 from vieux/fix_pull_build
...
added authConfig to docker build
2013-12-16 10:53:10 -08:00
6721525068
Update binaries.rst
...
Along with the kernel requirement, you need a working copy of lxc. When trying to start using "/docker -d", received error 'initapi: exec: "lxc-start": executable file not found in $PATH'
2013-12-16 12:04:29 -05:00
5cfcb05486
Fix and re-enable TestGetContainersTop
2013-12-16 16:01:55 +01:00
78c22c24b3
ApplyLayer: Fix TestLookupImage
...
The TestLookupImage test seems to use a layer that contains
/etc/postgres/postgres.conf, but not e.g. /etc/postgres.
To handle this we ensure that the parent directory always
exists, and if not we create it.
2013-12-16 14:35:43 +01:00
4faba4fae7
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.
2013-12-16 13:30:35 +01:00
e1efd4cb8c
please, don't use 30% of the screen for whitespace, and thus compress the examples so they are ~80 chars wide - the output of 'docker ps' and 'docker images' becomes needlessly unreadable
2013-12-16 13:24:35 +10:00
606cacdca0
Merge pull request #3222 from gurjeet/zfs_driver_owner
...
Update readme to mark ZFS driver as Alpha quality.
2013-12-15 07:09:00 -08:00
d526038503
Update readme to mark ZFS driver as Alpha quality.
2013-12-15 09:17:16 -05:00
58daccab26
Updated Introduction link
...
Previously the introduction link pointed to www.docker.io. That
did not seem to make a lot of sense to me so instead I pointed it
at:
http://www.docker.io/learn_more/
2013-12-15 03:13:41 -05:00
12fb508262
install vbox guest additions if not latest
2013-12-14 16:00:52 +02:00
0a3eedd4c9
when sharing a /var/lib/docker dir with more than one distribution, an existing lxc-start-unconfined softlink may point to a non-existant path, following that link (as Stat does) will cause the daemon to fail to start
2013-12-14 15:29:08 +10:00
a6928e70ac
Merge pull request #3197 from ajhager/3138-names
...
Validate container names on creation. Fixes #3138
2013-12-13 17:28:36 -08:00
20197385b2
Merge pull request #3173 from vieux/docker_info_job
...
Move info to job
2013-12-13 17:27:59 -08:00
85b9338205
add GetenvInt64 ans SetenvInt64
2013-12-13 16:29:22 -08:00
51e2c1794b
move docker info to the job api
2013-12-13 16:15:15 -08:00
20899cdb34
Merge pull request #3183 from vieux/job_commit
...
Move commit to job
2013-12-13 16:11:58 -08:00
f5ab2516d8
Merge pull request #2897 from crosbymichael/aufs-42
...
Increase max image depth to 127
2013-12-13 16:03:57 -08:00
d5f5ecb658
improve GetenvJson
2013-12-13 16:02:19 -08:00
4b5ceb0f24
use args
2013-12-13 14:29:27 -08:00
906b481148
Merge pull request #3213 from metalivedev/1695-dockerlogs
...
Add more information about Docker logging
2013-12-13 14:29:14 -08:00
930ec9f52c
move commit to job
2013-12-13 14:19:56 -08:00
aaa1c48d24
Merge pull request #3175 from vieux/engine-job-stop
...
Move stop to job
2013-12-13 14:15:58 -08:00
d7123a597f
Merge pull request #3214 from dotcloud/shykes_maintainer
...
Temporarily remove @shykes from engine/MAINTAINERS
2013-12-13 14:03:08 -08:00
9a9ecda7c8
Merge pull request #3208 from WarheadsSE/bridgeip
...
Add -bip flag: allow specification of dynamic bridge IP via CIDR
2013-12-13 13:56:35 -08:00
071338172c
Merge pull request #3187 from vieux/resize_job
...
Move resize to job
2013-12-13 13:55:23 -08:00
4975c1b549
Temporarily remve @shykes from engine/MAINTAINERS
2013-12-13 13:51:20 -08:00
73e8a39ff2
move resize to job
2013-12-13 13:15:39 -08:00
847cf5b599
Merge branch 'master' of https://github.com/dotcloud/docker
2013-12-13 13:15:22 -08:00
bf91636558
Merge pull request #3210 from rsampaio/fix_bridge_creation_3141
...
Bridge creation when ipv6 is not enabled
2013-12-13 12:03:55 -08:00
1e85aabf71
Fix #1695 by adding more about logging.
2013-12-13 11:42:58 -08:00
4fe0a9b6a0
Merge pull request #3211 from tianon/hack-make-cover
...
Add new cover bundlescript for giving a nice report across all the coverprofiles
2013-12-13 11:17:03 -08:00
f63cdf0260
Validate container names on creation. Fixes #3138
...
Move valid container name regex to the top of the file
Added hyphen as a valid rune in container names.
Remove group in valid container name regex.
2013-12-13 14:14:05 -05:00
9fb1ba97b1
Merge branch 'master' of https://github.com/dotcloud/docker
2013-12-13 11:06:20 -08:00
59dc2876a7
Add new cover bundlescript for giving a nice report across all the coverprofiles generated by the test scripts
2013-12-13 11:59:54 -07:00
23ab0af2ff
Merge pull request #3132 from tianon/hack-separate-integration
...
Separate Integration Tests
2013-12-13 10:55:49 -08:00
b8a16b3459
Merge pull request #3194 from tianon/tianon-hack-maintainer
...
Make Tianon the hack maintainer
2013-12-13 10:55:07 -08:00
a530b8d981
fix #3141 Bridge creation when ipv6 is not enabled
2013-12-13 16:39:49 -02:00
89beb55c32
Merge branch 'master' of https://github.com/dotcloud/docker
2013-12-13 10:38:26 -08:00
f9328ad9cc
Merge pull request #3201 from jpoimboe/libvirt-prereq-network
...
Set hostname and IP address from dockerinit
2013-12-13 10:38:17 -08:00
20759c3ef7
Merge branch 'libvirt-prereq-network' of https://github.com/jpoimboe/docker
2013-12-13 10:34:09 -08:00
5d81776714
Merge pull request #3202 from jpoimboe/libvirt-prereq-env
...
dockerinit: propagate "container" env variable from lxc
2013-12-13 10:32:17 -08:00
0ef1ff91cb
Merge pull request #3151 from tianon/more-debootstrap-tweaks
...
Update mkimage-debootstrap with even more tweaks for keeping images tiny...
2013-12-13 09:28:11 -08:00
a68d7f3d70
Add -bip flag: allow specification of dynamic bridge IP via CIDR
...
e.g.:
```
docker -d -bip "10.10.0.1/16"
```
If set and valid, use provided in place of trial and error from pre-defined array in network.go.
Mutually exclusive of -b option.
2013-12-13 10:47:19 -05:00
a8af12f80a
Re-enable TestApplyLayer
...
With the previous two changes we now pass this test.
2013-12-13 15:50:25 +01:00
10cd902f90
Fix change detection when applying tar layers
...
The default gnu tar format has no sub-second precision mtime support,
and the golang tar writer currently doesn't support that either.
This means if we export the changes from a container we will not
get zeron in the sub-second precision field when the change is applied.
This means we can't compare that to the original without getting a
spurious change. So, we detect this case by treating a case where the
seconds match and either of the two nanoseconds are zero as equal.
2013-12-13 15:46:41 +01:00
818c249bae
archive: Implement ApplyLayer directly
...
Rather than calling out to tar we use the golang tar parser
to directly extract the tar files. This has two major advantages:
1) We're able to replace an existing directory with a file in the
new layer. This currently breaks with the external tar, since
it refuses to recursively remove the destination directory in
this case, and there are no options to make it do that.
2) We avoid extracting the whiteout files just to later remove them.
2013-12-13 15:43:50 +01:00
5a89c6f6df
Merge pull request #3192 from unclejack/update_virtualbox_guest_additions
...
vagrant: update & verify virtualbox guest tools
2013-12-12 21:22:29 -08:00
2e6dbe87ad
Fix typos in Vagrantfile
2013-12-13 00:09:05 -05:00
e877294321
dockerinit: propagate "container" env variable from lxc
...
Lxc (and libvirt) already set the "container" env variable
appropriately[1], so just use that.
[1] http://www.freedesktop.org/wiki/Software/systemd/ContainerInterface/
2013-12-12 20:08:58 -06:00
ecc51cd465
dockerinit: set IP address
...
Set the IP address in dockerinit instead of lxc utils, to prepare for
using libvirt-lxc.
2013-12-12 19:57:11 -06:00
f7c7f7978c
dockerinit: set hostname
...
Set the hostname in dockerinit instead of with lxc utils. libvirt-lxc
doesn't have a way to do this, so do it in a common place.
2013-12-12 19:56:05 -06:00
8224e13bd2
Merge pull request #3185 from vieux/job_tag
...
Move tag to job
2013-12-12 17:02:39 -08:00
912bf8ff92
Merge pull request #3015 from jpoimboe/dockerinit-libvirt-prereqs
...
dockerinit: drop capabilities
2013-12-12 15:49:21 -08:00
e43ff2f6f2
move tag to job
2013-12-12 11:52:11 -08:00
b8f1c73705
dockerinit: drop capabilities
...
Drop capabilities in dockerinit instead of with lxc utils, since
libvirt-lxc doesn't support it.
This will also be needed for machine container mode, since dockerinit
needs CAP_SYS_ADMIN to setup /dev/console correctly.
2013-12-12 13:47:24 -06:00
1572989201
dockerinit: refactor error handling
2013-12-12 13:47:24 -06:00
bd02d6e662
dockerinit: put args in a struct
2013-12-12 13:47:23 -06:00
2d1f61ef0e
Merge pull request #3190 from zain/master
...
Small typo fixes
2013-12-12 11:25:11 -08:00
54df95f26c
Merge pull request #3189 from aknikitin/patch-1
...
Minor spelling fix
2013-12-12 11:24:45 -08:00
5b33ae5971
Merge pull request #3145 from vieux/fix_docker_images
...
multiple fixed in docker images
2013-12-12 11:17:19 -08:00
0db1c60542
Make Tianon the hack maintainer
2013-12-12 11:25:30 -07:00
f216448c82
vagrant: update & verify virtualbox guest tools
2013-12-12 13:03:33 +02:00
f26a9d456c
Small typo fixes
2013-12-12 01:23:16 -08:00
bf5b949ffc
Minor spelling fix
2013-12-12 01:09:24 -05:00
621523a041
Merge pull request #3184 from creack/fix-volumes-on-host
...
Fix volumes on host
2013-12-11 18:06:25 -08:00
8fd9633a6b
Improve FollowLink to handle recursive link and be more strick
2013-12-11 17:19:02 -08:00
1124261158
Merge pull request #3144 from codeaholics/643-stale-nfs-handle
...
Prevent deletion of image if ANY container is depending on it; not just running containers
2013-12-11 17:18:54 -08:00
b722f809e7
Merge pull request #3181 from lsm5/rhel-docs-typos
...
Rhel docs typos
2013-12-11 16:37:24 -08:00
f396c42cad
Fix volumes on the host by following symlinks in a scope
2013-12-11 16:31:02 -08:00
8874f2aef9
keeping rhel page sorta in sync with fedora
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com >
2013-12-11 18:26:17 -06:00
e8ec3dba7b
remove step numbers, keep consistent with fedora
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com >
2013-12-11 18:21:52 -06:00
4eda2a54de
Merge pull request #3177 from tianon/fix-turnbull-github
...
Fix James's github handle in docs/MAINTAINERS
2013-12-11 16:00:06 -08:00
d3292078dc
Merge pull request #3176 from lsm5/rhel-docs
...
Rhel docs
2013-12-11 15:58:42 -08:00
6ba456ff87
move t from arg to env
2013-12-11 15:36:50 -08:00
44984602c7
more typo corrections
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com >
2013-12-11 16:36:14 -06:00
d534e1c3a1
some typo corrections
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com >
2013-12-11 16:20:54 -06:00
d56d8ab96e
Merge pull request #3174 from richo/features/https_install_script
...
Use https to get the install script
2013-12-11 14:09:22 -08:00
6cf8ec606e
Merge pull request #3161 from SvenDowideit/make-replace-docker-binary-note-more-obvious
...
associate swapping the built docker binary with building the binary, rather than a note in building the docs
2013-12-11 14:04:34 -08:00
db3019d50b
rhel page keywords update
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com >
2013-12-11 16:00:46 -06:00
42c38bf34d
rhel description update
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com >
2013-12-11 15:59:35 -06:00
11b3fbb3bd
Merge pull request #3167 from qbrossard/patch-1
...
Corrected typo (resdis -> redis)
2013-12-11 13:57:59 -08:00
036f41fde3
Merge pull request #3165 from SvenDowideit/cmd-rmi-example
...
add example for docker rmi, and explain the need to remove all references (tags) to and image before its garbage collected :)
2013-12-11 13:57:13 -08:00
6e9c1590c6
Merge pull request #3162 from SvenDowideit/docker-commit-example-change-CMD
...
add a direct example for changing the cmd that is run
2013-12-11 13:52:12 -08:00
39cc8a32b1
Fix James's github handle in docs/MAINTAINERS
2013-12-11 14:13:55 -07:00
31961ccd94
rhel page only for rhel
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com >
2013-12-11 14:36:12 -06:00
eec48f93a3
rhel docs update
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com >
2013-12-11 14:34:51 -06:00
dbe1915fee
Engine: new command 'stop' gracefully stops a container.
2013-12-11 11:52:59 -08:00
bef8de9319
Engine: integer job status, improved stream API
...
* Jobs return an integer status instead of a string
* Status convention mimics unix process execution: 0=success, 1=generic error, 127="no such command"
* Stdout and Stderr support multiple thread-safe data receivers and ring buffer filtering
2013-12-11 11:52:59 -08:00
81fc368a6d
Use https to get the install script
2013-12-11 11:27:36 -08:00
bd292759f0
Merge pull request #3153 from vieux/improve_docker_push_display
...
Update docker push to use new display
2013-12-11 11:11:53 -08:00
5fd3c8204d
Merge pull request #2735 from shykes/engine-job-kill
...
New engine command: 'kill'
2013-12-11 10:35:57 -08:00
af21908493
Corrected typo (resdis -> redis)
2013-12-11 13:15:27 +01:00
7edd1f6bad
add example for docker rmi, and explain the need to remove all references (tags) to and image before its garbage collected :)
2013-12-11 15:54:34 +10:00
d878632b25
add a direct example for changing the cmd that is run
2013-12-11 12:07:07 +10:00
be13735001
associate swapping the built docker binary with building the binary, rather than a note in building the docs
2013-12-11 11:12:11 +10:00
fb9ddc5de5
Merge pull request #3159 from SvenDowideit/make-docs-consistency
...
Makefile: make docs is more consistent
2013-12-10 16:51:35 -08:00
27646c4459
make docs is more consistent
2013-12-11 10:14:56 +10:00
b98d51dddb
revert 'firstErr'
2013-12-10 15:37:03 -08:00
0025e9bd71
Merge pull request #3113 from shykes/engine-export
...
Move 'docker export' to the engine API
2013-12-10 13:28:24 -08:00
4c6e528f13
Merge pull request #3152 from daniel-garcia/3129_dont-open-bindmounted-files
...
don't open bind mounted files/dirs to get Stat, use os.Lstat
2013-12-10 11:05:39 -08:00
95f061b408
update docker push to use [====> ]
2013-12-10 10:57:16 -08:00
761184df52
don't open bind mounted files/dirs to get Stat, use os.Lstat
2013-12-10 12:49:53 -06:00
78b85220be
Update mkimage-debootstrap with even more tweaks for keeping images tiny by more aggressively removing cache files and by not downloading apt-cache Translations files
2013-12-10 10:59:32 -07:00
8814c11b14
Merge pull request #3103 from metalivedev/1229-titleactions
...
Update "Use" titles to be action-oriented
2013-12-09 18:57:48 -08:00
09d2c2351c
Merge pull request #3119 from shykes/engine-version
...
Port 'docker version' to the engine API
2013-12-09 17:35:44 -08:00
c618a906a4
fix size in -tree
2013-12-09 17:27:05 -08:00
9c1e9a5157
Fix #1229 . Update titles, fix some wrapping.
...
Make the Ambassador container explicit.
Apply Sven's suggestions.
2013-12-09 17:23:56 -08:00
0b0b0ca0f9
Merge pull request #3146 from jamtur01/linkedits
...
Some minor cleanup of the Links use document
2013-12-09 17:09:59 -08:00
ac1093b83a
fix docker images -tree <invalid_image> and docker images -viz <image_name>
2013-12-09 16:58:17 -08:00
c9cedb4c04
Some minor cleanup of the Links use document
2013-12-09 16:47:19 -08:00
a74be95b23
Merge pull request #2843 from shykes/engine-job-wait
...
New engine job:wait
2013-12-09 16:36:23 -08:00
8291f00a0e
refactor and fix tests
2013-12-09 16:25:19 -08:00
b7bc80cba9
Merge pull request #3109 from artagnon/arch-install
...
Update Arch installation doc
2013-12-09 15:52:54 -08:00
864729b96f
Merge pull request #3104 from jamtur01/uses
...
Added section on Trusted Builds
2013-12-09 15:51:52 -08:00
a67571668e
Merge pull request #3143 from idupree/patch-1
...
Make it extra clear that the `docker` group is root-equivalent.
2013-12-09 15:48:05 -08:00
776bb43c9e
Prevent deletion of image if ANY container is depending on it; not just running containers
2013-12-09 20:46:21 +00:00
75bd5bea70
Merge pull request #3114 from shykes/hack-stats
...
Hack: stats.sh prints useful project stats for maintainers
2013-12-09 10:36:17 -08:00
e2ee5c71fc
Make it extra clear that the docker group is root-equivalent.
2013-12-09 12:25:20 -05:00
f0879a1e14
Add separate "test-integration" bundlescript (and corresponding dyntest-integration bundlescript)
2013-12-08 18:43:24 -07:00
ca405786f4
Unify dyntest/test and dynbinary/binary hack bundlescripts further by cross-invocation and keeping all the logic in one place, taking advantage of LDFLAGS_STATIC that is the only bit that gets replaced for dyntest/dynbinary
2013-12-08 18:40:05 -07:00
cdc07f7d5c
Merge pull request #3126 from unclejack/remove_vendored_tar
...
Remove vendored dotcloud/tar
2013-12-08 16:51:52 -08:00
f379f667a2
hack/PACKAGERS.md: libdevmapper
2013-12-08 14:39:06 -08:00
45cea94a82
Unify hack/make/*test further by invoking hack/make/test directly from dyntest
2013-12-08 15:34:08 -07:00
8ec96c9605
remove vendored dotcloud/tar
...
The tar dependency has been removed. It's
time to remove the vendored tar as well.
2013-12-09 00:02:13 +02:00
c094807a1b
Added section on Trusted Builds
2013-12-08 15:54:12 -05:00
bac3a8e6f5
Add much better pruning of non-tested directories, including pruning the integration tests directory (doing more with "find" and nothing with "grep")
2013-12-08 13:50:48 -07:00
dcfc4ada4d
Clean output and simplify hack/make/*test by adding go_test_dir function in make.sh
2013-12-08 13:49:57 -07:00
416b16e1e2
Simplify and resync hack/make/test and hack/make/dyntest output handling
2013-12-08 12:57:11 -07:00
f832b76bdf
archlinux installation doc: correct some details
...
1. The AUR package is called docker-git, not lxc-docker-git.
2. According to the official community package, docker depends on
sqlite.
3. 02ef8ecartagnon@gmail.com >
2013-12-08 15:36:02 +05:30
d502f0cfac
Merge pull request #3118 from shykes/engine-structured-output
...
Engine: jobs can send structured output as json on stdout
2013-12-07 23:46:50 -08:00
16fad96007
Merge pull request #3117 from shykes/engine-refactor-env
...
Engine: break out Env utilities into their own type - Env
2013-12-07 23:45:00 -08:00
de35b346d1
Port 'docker version' to the engine API
2013-12-08 07:41:53 +00:00
869a11bc93
Cleanup version introspection
...
* Unify version checking code into version.go
* Make 'version' available as a job in the engine
* Use simplified version checking code when setting user agent for registry client.
2013-12-08 07:35:24 +00:00
f806818154
Engine: convenience http transport for simple remote job execution
2013-12-08 07:33:23 +00:00
a7a171b6c2
Engine: Output.AddEnv decodes structured data from the standard output of a job
2013-12-08 06:16:10 +00:00
a80c059bae
Engine: break out Env utilities into their own type - Env
2013-12-08 06:06:05 +00:00
edace08327
Hack: stats.sh prints useful project stats for maintainers
2013-12-08 01:47:03 +00:00
9656cdf0c2
Engine: 'export' returns a raw archive of a container's filesystem
2013-12-08 01:33:37 +00:00
50f3a696bd
Engine: don't log job stdout to engine stdout (it might be non-text output, for example tar data for 'export'
2013-12-08 01:33:05 +00:00
f4676f0ffa
Merge pull request #3101 from creack/merge_release
...
Merge release
2013-12-06 18:09:38 -08:00
3c1f3be032
Update version
2013-12-06 17:31:09 -08:00
aeba4e6482
Merge remote-tracking branch 'origin/release' into merge_release
2013-12-06 17:30:52 -08:00
3569d080af
New engine command: 'wait'
2013-12-06 23:05:21 +00:00
427bdb60e7
Engine: port 'kill' to the new integer status.
2013-12-06 23:02:27 +00:00
9b1930c5a0
gofmt
2013-12-06 23:02:27 +00:00
2546a2c645
Hack: use new 'kill' command in integration tests
2013-12-06 23:02:27 +00:00
fdb3de7b11
Engine: new command 'kill' sends a signal to a running container
2013-12-06 23:02:27 +00:00
88df052197
Merge pull request #3098 from creack/bump_v0.7.1
...
Bump v0.7.1
2013-12-06 14:42:14 -08:00
04ffa53ba8
Merge pull request #3077 from jlhawn/3076-handle-inactive-user-login
...
Adjusted handling of inactive user login
2013-12-06 14:40:35 -08:00
07f7643bbc
Merge pull request #3030 from jamtur01/versions
...
Fixed #2136 - Added styles
2013-12-06 14:27:53 -08:00
228091c79e
added authConfig to docker build
2013-12-06 14:27:10 -08:00
6fa1463614
Merge pull request #3094 from tang0th/patch-1
...
Update archlinux.rst as packages have changed
2013-12-06 14:18:31 -08:00
f28445254f
disable progressbar in non-terminal
2013-12-06 14:15:40 -08:00
0969be5ddb
update doc
2013-12-06 14:15:40 -08:00
95c0ade04b
fix jsonmessage in build
2013-12-06 14:15:40 -08:00
e01732f857
Revert "Add cgroup-bin dependency to our Ubuntu package"
...
This reverts commit c81bb20f5b
2013-12-06 14:15:40 -08:00
9b644ff246
Merge pull request #3096 from dotcloud/fix_fix_jsonmessage
...
fix jsonmessage in build
2013-12-06 14:10:24 -08:00
2c646b2d46
disable progressbar in non-terminal
2013-12-06 14:09:27 -08:00
becb13dc26
update doc
2013-12-06 14:09:27 -08:00
05f416d869
fix jsonmessage in build
2013-12-06 14:09:27 -08:00
7fd64e0196
Merge pull request #3088 from SvenDowideit/start-cmdline-examples-with-dollar-for-easier-testing
...
change the policy wrt $ sudo docker to simplify auto-testing
2013-12-06 13:37:02 -08:00
13da09d22b
change the policy wrt $ sudo docker to simplify auto-testing
2013-12-07 07:23:53 +10:00
6720bfb243
Adjusted handling of inactive user login
...
The return status for inactive users was being checked
too early in the process, so I moved it from just after
the handling of POST /v1/users/ to after getting the
response from GET /v1/users/
2013-12-06 11:57:05 -08:00
d75fc6e529
Merge pull request #3071 from lsm5/fedora-docs-update
...
use mattdm/fedora in fedora doc and other cosmetic changes
2013-12-06 11:25:10 -08:00
4a148919c3
Merge pull request #3052 from shawnl/patch-1
...
nftables dependancies in kernel
2013-12-06 11:02:49 -08:00
c7d75588f4
Merge pull request #3079 from crosbymichael/give-engine-noop-tests
...
Enable engine to take Stderr and Stdout for mocking in tests
2013-12-06 10:43:39 -08:00
dfade9e2d8
Merge pull request #3095 from jpoimboe/missing-defines
...
devmapper: add missing defines
2013-12-06 10:31:42 -08:00
b655406faa
Merge pull request #3085 from tianon/fix-cgroup-dep
...
Revert "Add cgroup-bin dependency to our Ubuntu package"
2013-12-06 09:15:41 -08:00
a015f38f4a
devmapper: add missing defines
...
Add some missing defines which are needed for compiling on older systems
like RHEL 6.
2013-12-06 10:13:47 -06:00
02ef8ec3ca
Update archlinux.rst as packages have changed
...
The docker package has been added into the Arch Linux community repo, this means that the package names and installation instructions have slightly changed.
2013-12-06 15:47:24 +00:00
25d3db048e
Enable engine to take Stderr and Stdout for mocking in tests
2013-12-06 01:18:18 -08:00
a69bb25820
specific kernel config
2013-12-05 23:54:23 -08:00
5f5949f6a6
Merge pull request #3086 from metalivedev/3045-addmirrors
...
Add debian mirrors. Fixes #3045 .
2013-12-05 18:16:28 -08:00
58b75f8f29
Add debian mirrors. Fixes #3045 .
2013-12-05 18:08:56 -08:00
aea7418d8a
Revert "Add cgroup-bin dependency to our Ubuntu package"
...
This reverts commit c81bb20f5b
2013-12-05 19:03:47 -07:00
f9147effac
Merge pull request #3069 from proppy/patch-1
...
docs/installation/google: add enabling Google Compute Engine step
2013-12-05 17:40:42 -08:00
0e2b0f284c
Merge pull request #3001 from dotcloud/api_json
...
add docs for the new json format
2013-12-05 17:35:51 -08:00
80dfa23da8
Merge pull request #3051 from pariviere/2490-docs-network
...
Network documentation page
2013-12-05 17:29:54 -08:00
bc9b239d74
Merge pull request #3081 from creack/bump_0.7.1
...
Bump to 0.7.1
2013-12-05 17:19:06 -08:00
4bea68dfa6
Clean up quoting, wraps, and build error on code-block.
2013-12-05 17:16:31 -08:00
ea0ed9a915
Merge branch 'docker-run-prose-2149' of github.com:SvenDowideit/docker into 3036-test
2013-12-05 17:03:26 -08:00
e39d35deda
Bump to 0.7.1
2013-12-05 16:49:39 -08:00
4acd579226
Merge pull request #3078 from crosbymichael/remove-name-if-not-exist
...
If container does not exist try to remove the name and continue
2013-12-05 16:41:43 -08:00
c764fb0c29
Merge pull request #3006 from tianon/ubuntu-cgroup-bin
...
Add cgroup-bin dependency to our Ubuntu package
2013-12-05 16:41:01 -08:00
de090116dd
Merge branch 'master' into release
...
Conflicts:
commands.go
2013-12-05 16:40:24 -08:00
7a87023587
Merge pull request #2955 from crosbymichael/search-name-first
...
Search for repo first before image id
2013-12-05 16:16:55 -08:00
584164177e
Merge pull request #2358 from tianon/mkimage-rinse
...
Remove mkimage-centos.sh in favor of a new rinse-based script...
2013-12-05 16:07:59 -08:00
35e80868ad
Merge pull request #3004 from tianon/shebang-bash
...
Update bundlescript shebangs to be bash, reflecting how they're actually invoked
2013-12-05 16:04:09 -08:00
2acea6090f
Merge pull request #2983 from tianon/udev
...
Add udev rules files for hiding the docker loopback devices from udisks
2013-12-05 16:01:04 -08:00
81b25fde79
Merge pull request #3065 from SvenDowideit/use-makefile-in-devenv-documentation
...
use the Makefile in the dev environment documentation - its way less typing, and fewer typing mistakes
2013-12-05 15:27:36 -08:00
0189a99471
Merge pull request #3062 from SvenDowideit/cli-examples-dollar-sudo-docker
...
Some examples didnt use $ sudo docker, so this makes it a little more consistent
2013-12-05 15:25:09 -08:00
7bf3a07371
If container does not exist try to remove the name and continue
2013-12-05 15:22:21 -08:00
9320f4e2d1
Merge pull request #3061 from shykes/sven-doc-maintainers
...
Add Sven Dowideit to docs maintainers
2013-12-05 15:17:34 -08:00
d1a4f83e5e
Merge pull request #3075 from dotcloud/pull_layers
...
Wait on pull from another client
2013-12-05 14:47:39 -08:00
fb810b54ff
wait on pull from another client
2013-12-05 14:41:56 -08:00
eac95671f5
refs #2490 : add a network page to docs
2013-12-05 23:40:33 +01:00
06379d8bd9
Merge pull request #2992 from jpoimboe/bridge-create-ioctl
...
Create the bridge device with ioctl
2013-12-05 14:40:03 -08:00
a96bf74397
include Red Hat Enterprise, should have part of #3011
...
oops, forgot the index!
2013-12-05 14:34:10 -08:00
cc0466bb68
Merge pull request #3011 from goldmann/rhel_instructions
...
Instructions on how to install Docker on Red Hat Enterprise Linux / CentOS
2013-12-05 14:30:31 -08:00
0a7e0f0819
Merge pull request #3034 from rogaha/fix_doc_registry_index_spec
...
- Updated the doc according to the current implementation status
2013-12-05 14:24:13 -08:00
ef157cee30
Merge pull request #3074 from crosbymichael/dm-history-calc
...
Save layersize on pull
2013-12-05 14:13:03 -08:00
7ab4f37d60
separate block for yum update docker
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com >
2013-12-05 16:11:33 -06:00
5d022f0445
add unofficial header back, yum update docker
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com >
2013-12-05 16:08:08 -06:00
697707e4af
Save layersize on pull
...
Do not display size and virtual size on the cli.
Only display virtual size on the cli
2013-12-05 14:03:23 -08:00
e3c3f3c324
Merge pull request #3010 from SvenDowideit/origin/docker-ps-linked-container-alias-example
...
add an example of docker ps, and also of link aliases
2013-12-05 14:00:53 -08:00
797bac2344
Merge pull request #3057 from crosbymichael/test-cpu-share
...
Move test cpu shares out of test start
2013-12-05 13:58:01 -08:00
7a94cdf8ed
create the bridge device with ioctl
...
On RHEL 6, creation of a bridge device with netlink fails. Use the more
backward-compatible ioctl instead. This fixes networking on RHEL 6.
2013-12-05 15:32:15 -06:00
61fbf3d8e2
yum upgrade on fedora not required before install
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com >
2013-12-05 14:21:03 -06:00
f49eb29497
use mattdm/fedora in fedora doc and other cosmetic changes
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com >
2013-12-05 14:03:17 -06:00
1525f71b5a
Merge pull request #3016 from pnasrat/3014-clarify-maintainer-process
...
Add a proposal step for potential MAINTAINERS.
2013-12-05 11:28:30 -08:00
4188cd6bcd
Merge pull request #3024 from jamtur01/ubunturepo
...
Added note about Ubuntu curl installation
2013-12-05 11:27:46 -08:00
e304e8936b
Merge pull request #3038 from SvenDowideit/2485-ambassador-pattern-doc
...
initial stab at writing a use/ambassador-pattern howto
2013-12-05 11:01:27 -08:00
03f8a3bbae
Fixed #2136 - Added styles
...
Added styling for versionadded, versionchanged, and
deprecated.
2013-12-05 13:46:15 -05:00
066b961a0c
Merge pull request #3060 from dotcloud/sd_notify
...
sd_notify ready status when accepting API requests
2013-12-05 10:33:29 -08:00
f95f2789f2
add docs for the new json format
2013-12-05 10:12:22 -08:00
a8e99d9235
Merge pull request #2917 from codeaholics/2698-only-tag-top-layer
...
Only tag the top-most layer when pushing to a registry
2013-12-05 10:02:57 -08:00
5a17c208cd
docs/installation/google: add enabling Google Compute Engine step
2013-12-05 09:43:08 -08:00
e9bf971e69
use the Makefile in the dev environment documentation - its way less typing, and fewer typing mistakes
2013-12-05 21:48:35 +10:00
909da5d524
- Added link to the source code repo on github
2013-12-04 21:08:44 -08:00
04c32495f6
add a little prose to tell the user that run creates a container, and then starts it
2013-12-05 14:20:16 +10:00
af020e2d67
I was reading the doc, and noticed that some examples didnt use $ sudo docker, so this makes it a little more consistent
2013-12-05 14:14:08 +10:00
94d46a8d3a
Merge pull request #2991 from fortybillion/patch-1
...
API documentation: added format of Volumes and Binds parameters to "create" and "start"
2013-12-04 18:32:19 -08:00
ec9f2f1d0f
Merge branch '2971-cleanconflicts'
2013-12-04 18:26:45 -08:00
0bfa22124e
Merge branch 'pgdoc' of github.com:jamtur01/docker into 2971-cleanconflicts
...
Conflicts:
docs/sources/examples/postgresql_service.rst
2013-12-04 18:25:58 -08:00
79031c4f8c
Merge pull request #2907 from goldmann/iptables-fix
...
Make sure the firewall rules are created even if the bridge interface is already created
2013-12-04 18:04:57 -08:00
5f55c1aee1
Merge pull request #2966 from andrewsmedina/govet2
...
fixed some `go vet` issues.
2013-12-04 17:57:10 -08:00
b4e21ad1da
Add Sven Dowideit to docs maintainers
2013-12-04 17:50:33 -08:00
97088ebef7
sd_notify ready status when accepting API requests
2013-12-04 17:50:20 -08:00
c35cebaa06
Merge pull request #3031 from jamtur01/docsmaintain
...
Add James Turnbull to docs maintainers
2013-12-04 17:48:45 -08:00
41b5e87873
Merge pull request #2993 from jpoimboe/rhel6-version-check
...
remove kernel version warning on rhel 6.5
2013-12-04 17:46:20 -08:00
9dfc7bc36f
Merge pull request #2834 from fj/topic/clarify-aws-instructions
...
Fix installing-on-AWS workflow description
2013-12-04 17:25:35 -08:00
afbea3f13f
Merge pull request #3058 from dotcloud/add_stderr_hijack
...
fix docker run -a stderr
2013-12-04 17:16:56 -08:00
5dab47a475
Merge pull request #2886 from jamtur01/fedora_community
...
Updated Fedora docs
2013-12-04 17:12:00 -08:00
3ba279a370
fix docker run -a stderr
2013-12-04 17:08:14 -08:00
944c1f10ea
Merge pull request #2967 from crosbymichael/return-host-config
...
Add hostconfig to container inspect
2013-12-04 16:50:42 -08:00
0d1506adb3
Move test cpu shares out of test start
...
Fixes #2107
2013-12-04 16:31:09 -08:00
3a8222dfa5
Merge pull request #3032 from tianon/makefile-tweaks
...
Tweak Makefile for consistency and Ctrl+C-ability
2013-12-04 16:04:47 -08:00
00030ced4b
Tweak Makefile for consistency and Ctrl+C-ability (also, -rm to keep it clean)
2013-12-04 16:56:01 -07:00
f95621fd05
Merge pull request #3033 from proppy/add-compute-docs
...
Add Google Cloud Platform installation docs
2013-12-04 15:05:07 -08:00
4328926acc
Merge pull request #3020 from crosbymichael/remove-init-layer
...
Ensure that the init layer is removed with the container
2013-12-04 14:46:48 -08:00
8f382aaecd
Merged with master
2013-12-04 12:40:54 -08:00
3df5d120de
docs/installation: add google compute engine quickstart
2013-12-04 12:25:22 -08:00
1b5517b68f
Merge pull request #3046 from dotcloud/fix_offline_image_transfert_jsonmessage
...
Fix offline image transfer jsonmessage
2013-12-04 12:05:28 -08:00
4bc100b494
fix jsonmessage
2013-12-04 11:57:18 -08:00
be282b57d5
fix offline image transfert
2013-12-04 11:55:42 -08:00
12180948be
remove unused parameter in Download
2013-12-04 11:54:11 -08:00
6cf2c14c00
Merge pull request #2796 from EmilHernvall/master
...
Support for same port on multiple interfaces
2013-12-04 11:15:51 -08:00
dc9f8bf072
Merge pull request #2790 from proppy/fix-tar
...
utils: remove dotcloud/tar dep
2013-12-04 11:06:13 -08:00
0862756beb
Merge pull request #3018 from pnasrat/3017-debug-expvar
...
Expose expvar endpoint during debugging.
2013-12-04 10:53:35 -08:00
de60bee3d4
Merge pull request #2946 from dhrp/doc-postgres-typo
...
Fixed some grammar and one other line in postgres example
2013-12-04 10:51:02 -08:00
51b9fe7301
Merge pull request #3000 from creack/improve_make_sh_test
...
Improve make sh test
2013-12-04 10:41:55 -08:00
61aad8fc10
Merge pull request #3029 from pnasrat/container-refactoring
...
Container refactoring
2013-12-04 10:35:42 -08:00
6ddea783ef
initial stab at writing a use/ambassador-pattern howto (Issue #2485 )
2013-12-04 16:47:45 +10:00
58c33360b0
- Updated the doc with the current implementation status
2013-12-03 16:39:23 -08:00
40fe9f581b
Extract volume bind, creation and external methods.
...
Make Start() slightly more readable.
2013-12-03 18:58:31 -05:00
258d707548
Merge pull request #2339 from shin-/private_reg_auth
...
Private registry auth
2013-12-03 15:29:38 -08:00
99e4f56353
Merge pull request #2930 from creack/docker-osx
...
Docker client on OSX
2013-12-03 15:27:21 -08:00
0132547a38
Added myself to docs MAINTAINERS
2013-12-03 17:51:34 -05:00
84f78d9cad
Extract helper method for volume linking.
...
Makes this more readable.
2013-12-03 17:35:54 -05:00
f8176de191
Merge pull request #2999 from dotcloud/improve_progress_bars
...
Handle small screens
2013-12-03 14:24:40 -08:00
f50fe14e13
Handle small screens
2013-12-03 14:21:33 -08:00
45567f2209
Updated Fedora docs
...
* Added Fedora installation instructions
2013-12-03 16:55:55 -05:00
2fd76fc0b8
Merge pull request #3009 from silas/stream-logs
...
Add stream flag to logs command
2013-12-03 13:43:35 -08:00
b699aee91f
Rename logs -stream to logs -f
2013-12-03 20:35:22 +00:00
64439505c7
Added note about Ubuntu curl installation
2013-12-03 14:37:01 -05:00
664174c7aa
Add docs for hostconfig in inspect
2013-12-03 11:09:10 -08:00
7428e6a5f0
Merge pull request #3022 from pnasrat/3021-makefile-testflags
...
Support TESTFLAGS
2013-12-03 10:55:22 -08:00
d21563ced3
Support TESTFLAGS
2013-12-03 14:49:10 -05:00
6a55169e2e
Expose expvar endpoint during debugging.
...
Fixes #3017
2013-12-03 13:04:18 -05:00
5976c26c1e
Ensure that the init layer is removed with the container
2013-12-03 09:44:48 -08:00
b59dea6767
Add a proposal step for potential MAINTAINERS.
...
Fixes #3014
2013-12-03 11:04:53 -05:00
9be5db8704
Handle 401 response in auth.Login() for authed private registries
2013-12-03 16:32:13 +01:00
3f92163989
Don't return req as result of setTokenAuth
2013-12-03 16:32:13 +01:00
3b5010e90b
missed one call to setTokenAuth
2013-12-03 16:32:13 +01:00
ec4863ae55
Factorized auth token setting
2013-12-03 16:32:13 +01:00
a02bc8a5db
gofmt
2013-12-03 16:32:13 +01:00
045989e3d8
Use basic auth for private registries when over HTTPS.
...
RequestFactory is no longer a singleton (can be different for different instances of Registry)
Registry now has an indexEndpoint member
Registry methods that needed the indexEndpoint parameter no longer do so
Registry methods will only use token auth where applicable if basic auth is not enabled.
2013-12-03 16:32:13 +01:00
bbf9135adc
Added HTTPAuthDecorator
2013-12-03 16:24:47 +01:00
1cb1e08644
Support for same port on multiple interfaces
...
This commit improves upon the PortMapper and PortAllocator classes by changing
their internal data structures for port allocations to use a string rather than
a single integer. This string holds the network interface address as well as the
port number. This solves a previous problem where a port would be incorrectly
reported as being in use because it had been allocated for a different interface.
I've also added a basic test case for the PortMapper class, and extended the
existing test case for PortAllocator. In the case of PortMapper, this is done
by handing it a stub function for creating proxies rather than an actual
implementation.
2013-12-03 15:14:54 +01:00
682cf48d1d
Instructions on how to install Docker on Red Hat Enterprise Linux / CentOS.
2013-12-03 11:25:53 +01:00
48e1766527
add an example of docker ps, and also of link aliases
2013-12-03 17:57:51 +10:00
3ddbb36a84
Only stream logs when container is running
2013-12-03 07:17:07 +00:00
62263967b9
Add stream flag to logs command
2013-12-03 06:18:01 +00:00
3ed0ff85f5
Merge pull request #2821 from jpellerin/2820-fix-daemon-dns
...
Fixes #2820
2013-12-02 18:19:31 -08:00
c4c90e9cec
Add hostconfig to container inspect
2013-12-02 18:06:04 -08:00
650d4cc644
Merge pull request #3005 from gurjeet/zfs_driver_owner
...
Typo fix
2013-12-02 15:06:05 -08:00
d9b742419c
Typo fix
2013-12-02 18:03:54 -05:00
c81bb20f5b
Add cgroup-bin dependency to our Ubuntu package
...
Since cgroup-bin is only "recommended" by the lxc package on Ubuntu, but is necessary for having the proper cgroups mounted for Docker to function, this makes some sense for us to add separately.
Fixes #2990
2013-12-02 16:02:54 -07:00
6c70d23e0d
Fixes broken RST links; clarifies AWS instructions
2013-12-02 17:55:42 -05:00
c9432cf51a
Reformats source text to proper widths
2013-12-02 17:55:42 -05:00
829b118dd8
Add some color in order to emphasis the test FAILURE
2013-12-02 14:54:01 -08:00
3ac76cfeff
Update bundlescript shebangs to be bash, reflecting how they're actually invoked
2013-12-02 15:48:39 -07:00
5a9cf7e754
Add unit test for ValidateIp4Address
2013-12-02 17:33:33 -05:00
e4aba11e80
add env variable to disable kernel version warning
...
Allow the user to set DOCKER_NOWARN_KERNEL_VERSION=1 to disable the
warning for RHEL 6.5 and other distributions that don't exhibit the
panics described in https://github.com/dotcloud/docker/issues/407 .
2013-12-02 15:56:51 -06:00
9d62dc1a08
Remove mkimage-centos.sh in favor of a new rinse-based script, since febootstrap is fragile and picky
2013-12-02 14:54:04 -07:00
0017c68f4a
Remove trailing whitespace
2013-12-02 13:52:27 -08:00
3cd9b2aadf
Fixes #2820
2013-12-02 16:22:39 -05:00
8afb0abbee
Merge pull request #2998 from creack/fix_json_display
...
Fix json display
2013-12-02 12:58:58 -08:00
98ed1dc433
Fix unit test with new buildfile prototype
2013-12-02 12:51:37 -08:00
7aec93c370
Merge pull request #2959 from crosbymichael/fix-auth-split
...
Split auth on first colon
2013-12-02 12:21:04 -08:00
62f0e5aef9
Merge pull request #2965 from crosbymichael/no-private-port
...
Only return published ports for docker port
2013-12-02 12:18:47 -08:00
59a85798fa
Merge pull request #2982 from tianon/dockerfile-best-practice
...
Update Dockerfile with all-caps INSTRUCTIONS
2013-12-02 12:14:04 -08:00
67c03552f6
Merge pull request #2957 from creack/handle_sigquit
...
Catch SIGQUIT for cleanup
2013-12-02 12:13:07 -08:00
4fdc117ad2
Merge pull request #2921 from dustin/inspect-format
...
Add -format to 'docker inspect'
2013-12-02 12:08:15 -08:00
5cd09dc115
small reformatting jsonmessage
2013-12-02 11:49:11 -08:00
6ea3b9651b
Fix displayJson behavior (dont add newline)
2013-12-02 11:47:13 -08:00
de4429f70d
Do not format at each write but use a Writer instead (build)
2013-12-02 11:43:41 -08:00
8cc524996a
Merge pull request #2924 from tianon/strict-fhs-compatibility
...
Add proper dockerinit path support for distros that use FHS 2.3
2013-12-02 11:35:36 -08:00
d9fbdd7b3f
Merge pull request #2995 from gurjeet/zfs_driver_owner
...
Add contrb/zfs/ and add self as maintainer of ZFS storage driver.
2013-12-02 11:10:16 -08:00
4ad3dfb05f
CLI docs and examples of format
2013-12-02 11:07:41 -08:00
1d503be466
Use inspect format to get IP address for psql example
2013-12-02 11:07:41 -08:00
9837ad8e9b
Add -format to 'docker inspect'
...
This makes it a lot easier to script with docker instances as one can
ask for details about running instances more easily without having to
have additional JSON processing tools installed.
dotcloud/docker#734
2013-12-02 11:07:41 -08:00
70b586702c
Add contrb/zfs/ and add self as maintainer of ZFS storage driver.
2013-12-02 14:03:16 -05:00
4b35c1b6a6
Merge pull request #2728 from SvenDowideit/docker-import-doc
...
re-word the help for docker import to make it clear that this will be an empty image containing only the files in the tar file
2013-12-02 10:59:15 -08:00
fe571dd293
Merge pull request #2829 from dotcloud/refactor_opts
...
Refactor opts
2013-12-02 10:41:30 -08:00
e1414a4c39
Merge pull request #2945 from dotcloud/refactor_stream
...
Refactor stream
2013-12-02 10:31:09 -08:00
d4ebba703c
Merge pull request #2994 from discordianfish/1150-build-return-exit-code
...
Bump api version and update docs
2013-12-02 10:30:46 -08:00
e4cb83c50e
Bump api version and update docs
2013-12-02 19:27:28 +01:00
d7dd19d22e
Merge pull request #2981 from tianon/less-verbose-testing
...
Remove "-v" from "go test" (since it's easy to add back manually via TESTFLAGS)
2013-12-02 10:14:25 -08:00
5f2313aad3
Merge pull request #2984 from SvenDowideit/2319-build-check-for-dockerfile
...
check on the client side that there is a Dockerfile
2013-12-02 09:35:31 -08:00
d6cdbca6c1
Merge pull request #2775 from daniel-garcia/2671-bindmount_files
...
fixes #2671 , add support for bind mounting individual files in to contai...
2013-12-02 09:30:08 -08:00
751250015b
Merge pull request #2206 from discordianfish/1150-build-return-exit-code
...
Make docker build return exit code of build step
2013-12-02 09:01:11 -08:00
b04c6466cd
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.
2013-12-02 17:52:37 +01:00
b9ad0c9f74
Added format of Volumes and Binds parameters to create and start
...
* Added sample Volumes parameter to container create API.
* Added PortBindings and PublishAllPorts parameter to container start API
* Added note to container start about Binds needed to be declared as Volumes during container create.
2013-12-02 16:52:12 +00:00
dbb47f63ab
Add udev rules files for hiding the docker loopback devices from udisks
...
This prevents them from showing up on the desktop in a window manager, for example.
2013-12-02 09:11:06 -07:00
c4548506c5
Merge pull request #2693 from fkautz/makefile
...
Adding a makefile
2013-12-01 23:25:24 -08:00
26cf8b9aff
check on the client side that there is a Dockerfile, so we don't upload a huge stack of files, only to realise we can't do anything
2013-12-02 15:55:08 +10:00
7f1a91121c
Update Dockerfile with all-caps INSTRUCTIONS (as explained in docs as being "convention": http://docs.docker.io/en/latest/use/builder/#format )
2013-12-01 21:31:28 -07:00
c30e2dc28c
Remove "-v" from "go test" (since it's easy to add back via TESTFLAGS)
2013-12-01 21:20:35 -07:00
d9cdd45d2e
Merge pull request #2978 from tianon/go1.2
...
Update to Go 1.2 officially, now that it is released
2013-12-01 16:46:38 -08:00
5c5f670901
Update to Go 1.2 officially, now that it is released
2013-12-01 15:11:10 -07:00
fea432bdf5
fixed Looback typo.
2013-11-30 16:28:52 -02:00
39aac21db4
Updated and simplified the PG example
2013-11-30 10:58:52 -05:00
56ab9cb0d5
Minor fixes based on discussions on #2693
...
* Volume exports ./bundles instead of root directory
* Documents build using docker-docs instead of docker:docs
* Bundles directory is created before running build or docs
2013-11-30 00:09:41 -08:00
d8ee08ba7b
Merge pull request #2925 from tianon/update-systemd-service
...
Update systemd service file with suggestions from @seblu
2013-11-29 21:25:08 -08:00
e8437e8fcf
using errors.New instead fmt.Error.
2013-11-30 01:02:09 -02:00
4e030c78d2
Merge branch 'master' into handle_sigquit
...
Conflicts:
server.go
2013-11-29 18:51:32 -08:00
62b1faf28c
Merge pull request #2926 from crosbymichael/attach-wait
...
Return process exit code for attach
2013-11-29 18:49:24 -08:00
2dac7b5209
Merge pull request #2781 from shykes/engine-status-int
...
Engine: integer status, better streaming, lots of tests
2013-11-29 17:57:28 -08:00
1890301e67
Merge pull request #2964 from andrewsmedina/gofmt2
...
go fmt.
2013-11-29 17:19:28 -08:00
a6c9a332d0
fixed some go vet issues.
2013-11-29 22:53:20 -02:00
65db62619c
Only return published ports for docker port
2013-11-29 16:45:20 -08:00
35d54c6655
Fix a bug in Output.Write, and improve testing coverage of error cases.
2013-11-30 00:25:46 +00:00
3553a803e3
Engine: better testing of streams and of basic engine primitives. Coverage=81.2%
2013-11-30 00:25:46 +00:00
a4f8a2494b
Engine: integer job status, improved stream API
...
* Jobs return an integer status instead of a string
* Status convention mimics unix process execution: 0=success, 1=generic error, 127="no such command"
* Stdout and Stderr support multiple thread-safe data receivers and ring buffer filtering
2013-11-30 00:25:46 +00:00
fe72f15e4a
go fmt.
...
result of `gofmt -w -s .` without vendors.
2013-11-29 22:20:59 -02:00
a37b155384
Split auth on first colon
2013-11-29 15:14:36 -08:00
82cecb34b5
Merge pull request #2954 from creack/fix_tests
...
Fix tests
2013-11-29 15:08:11 -08:00
e1278e9ec2
Merge pull request #2952 from codeaholics/2126-registry-close-wait
...
Closing HTTP connection after Registry ping
2013-11-29 14:21:52 -08:00
db7c55ba7f
Catch SIGQUIT for cleanup
2013-11-29 14:13:00 -08:00
0d3f4017cf
Merge pull request #2929 from pnasrat/2928-fix-signal-handling
...
Remove incorrect SIGKILL handler.
2013-11-29 14:10:46 -08:00
ab35aef6b5
Add unit test to check bind / server side
2013-11-29 13:43:37 -08:00
bb284ce59d
Merge branch 'master' into fix_tests
2013-11-29 13:17:36 -08:00
34353e782e
Reduce the timeout for restart/stop
2013-11-29 11:08:01 -08:00
ca98434a45
Search for repo first before image id
2013-11-29 11:06:35 -08:00
86c00be180
Fix behavior of tty tests
2013-11-29 10:17:25 -08:00
2ec1146679
Remove an unit test from integrations test
2013-11-29 10:17:04 -08:00
2e6a958612
Fix TestAttachDetachTruncatedID (behavior + tty issue)
2013-11-29 10:03:36 -08:00
697be6aaa0
Create helper function for tests
2013-11-29 10:02:22 -08:00
c13821ad0b
Make sure the termcaps are restored after hijack
2013-11-29 09:55:15 -08:00
aa68656cd3
Fix term.RestoreTerminal behavior
2013-11-29 09:52:44 -08:00
63d6cbe3e4
Actually test the detach (was not the case before)
2013-11-29 09:11:20 -08:00
67e9e0e11b
Make the PTY in raw mode before assert test (TestAttachDetach)
2013-11-29 08:29:56 -08:00
fbebe20bc6
Add a GetPtyMaster() method to container to retrieve the pty from an other package.
...
We could also have put ptyMaster public, but then we need to ignore it in json
otherwise the Marshalling fails. I think it is cleaner that way.
2013-11-29 07:40:44 -08:00
e535f544c7
Make sure the container is running before testing against it (TestAttachDetach)
2013-11-29 07:39:51 -08:00
fe727e2a87
Closing connection after ping
2013-11-29 12:07:20 +00:00
f72e604872
Merge branch 'master' into docker-osx
2013-11-28 21:16:32 -08:00
926f7b579e
Merge pull request #2692 from SvenDowideit/add-specific-feedback-for-bad-ADD
...
Add specific feedback for ADD outside context
2013-11-28 17:55:11 -08:00
ff5747728c
Merge pull request #2357 from ulyssecarion/master
...
Document setting up Vagrant-docker with the remote API
2013-11-28 17:54:05 -08:00
6c56993639
Merge pull request #2901 from dkumor/patch-1
...
Deleted references to AUFS in Arch docs
2013-11-28 17:39:26 -08:00
ba5268d382
re-word the help for docker import to make it clear that this will be an empty image containing only the files in the tar file
2013-11-29 11:22:17 +10:00
8291d509c2
Fixed some grammar and one other line about needing the postgresql-client for connecting to the service.
2013-11-28 17:19:26 -08:00
139644895e
Merge pull request #2894 from brunoqc/patch-1
...
Update postgresql's version in example
2013-11-28 17:16:25 -08:00
cca9e51f5d
Merge pull request #2941 from codeaholics/2940-invalid-registry-calls
...
Stop invalid calls to Registry
2013-11-28 17:00:22 -08:00
668d22be54
Merge pull request #2808 from tianon/run-all-tests
...
Update test scripts to always run ALL tests, even when some fail
2013-11-28 16:58:31 -08:00
77c94175bd
Make CopyEscapable consistent with Copy and return nil in case of success instead of io.EOF
2013-11-28 16:57:51 -08:00
f94ea7769f
Merge pull request #2923 from creack/refactor_cgo_in_go
...
Refactor attach loop device in pure Go
2013-11-28 16:52:38 -08:00
39bec226c0
Merge pull request #2844 from tianon/fix-mount-spaces
...
Add space-escaping to path parts of lxc.mount.entry lines in generated lxc.conf, allowing for spaces in mount point names
2013-11-28 16:48:36 -08:00
677e2ad92e
Merge pull request #2881 from yrashk/patch-1
...
Fix command line help for docker save
2013-11-28 16:42:40 -08:00
d3cc558d14
add test
2013-11-28 16:28:31 -08:00
ad43d88af5
Make race condition more obvious by performing more asserts
2013-11-28 16:12:45 -08:00
1fe1b216ad
Return process exit code for attach
...
Fixes #2240
2013-11-28 15:25:50 -08:00
3faf450f11
Merge pull request #2818 from pnasrat/docker-pprof
...
Wire in pprof handlers.
2013-11-28 14:43:13 -08:00
b36dd3f9cc
fix display on test
2013-11-28 14:40:17 -08:00
a0525d90ab
Merge pull request #2937 from jwarwick/hello_world_doc
...
Remove explanation of removed argument
2013-11-28 14:35:17 -08:00
ebc36b879d
add progressbar and time
2013-11-28 14:33:18 -08:00
14425c1690
Merge pull request #2922 from ath0mas/patch-1
...
Restore 'save' paragraph
2013-11-28 14:15:43 -08:00
aae23255a0
Merge pull request #2888 from tianon/changelog-fix
...
Fix CHANGELOG: we ended up not merging the btrfs driver for last night's release
2013-11-28 12:24:56 -08:00
2bbc90e92f
Make volumes opts more strict
2013-11-28 12:24:04 -08:00
0c758e9312
Merge branch 'master' into refactor_opts
...
Conflicts:
commands.go
2013-11-28 12:23:45 -08:00
597e0e69b4
split in 3 files
2013-11-28 12:16:57 -08:00
261bd0d187
Improve devmapper unit tests with syscall/ioctl
2013-11-28 11:53:09 -08:00
3d0486979e
Merge pull request #2892 from creack/add_cli_test-1
...
Add ParseRun unit tests
2013-11-28 11:39:48 -08:00
377817db1b
Merge pull request #2913 from pnasrat/2852-deleteimage-performance
...
Performance of deleteImageAndChildren.
2013-11-28 11:20:43 -08:00
a990b3aeb9
Correct comments
2013-11-28 11:02:53 -08:00
9f46779d42
Wire in pprof handlers.
...
Based on http://stackoverflow.com/questions/19591065/profiling-go-web-application-built-with-gorillas-mux-with-net-http-pprof
2013-11-28 13:46:58 -05:00
533067bba4
Rename file for consistency
2013-11-28 10:37:03 -08:00
438607ecc3
Add proper dockerinit path support for distros that use FHS 2.3
2013-11-28 11:11:30 -07:00
d47507791e
Stop invalid calls to Registry
...
This code was resulting in a call for
/v1/images/<namespace>/<repository>/ancestry which the Registry
doesn't understand. Furthermore, it was masking the original
error.
2013-11-28 16:43:28 +00:00
bdfe8ed403
Remove incorrect SIGKILL handler.
...
As per POSIX signal handling SIGKILL does not work.
Fixes #2928
2013-11-28 10:42:06 -05:00
f1e44e0b0c
Remove explanation of removed argument
2013-11-28 09:55:15 -05:00
c226ab6d9e
Document setting up Vagrant-docker with the remote API
2013-11-27 20:05:54 -08:00
74ea136a49
Move reflink to os dependent file. OSX docker client fully functionnal.
2013-11-27 19:23:48 -08:00
24c03b2d93
Make devicemapper linux-only
2013-11-27 19:12:51 -08:00
a58fef9f13
Merge branch 'master' into refactor_cgo_in_go
2013-11-27 18:55:11 -08:00
597ca192e7
Merge pull request #2927 from andrewsmedina/stat_macos
...
Move syscall.Stats logic to os specific file.
2013-11-27 18:32:18 -08:00
8b2a7e35c3
Move syscall.Stats logic to os specific file.
...
related to #2909 .
2013-11-28 00:22:47 -02:00
8a5d927a53
Check if the target loopback is a block device
2013-11-27 18:21:17 -08:00
1214b8897b
Extract ioctl from wrapper
2013-11-27 17:47:20 -08:00
eb528b959e
Move attach loop device to its own file
2013-11-27 17:12:57 -08:00
75e9cff98c
Update systemd service file with suggestions from @seblu
2013-11-27 16:55:37 -07:00
74c8f7af75
Refactor attach loop device in pure Go
2013-11-27 15:39:30 -08:00
2c27da8818
Restore 'save' paragraph
2013-11-28 00:39:06 +01:00
39f21af687
Merge pull request #2914 from crosbymichael/open-issues
...
Add instructions for opening issues on the repository
2013-11-27 15:25:12 -08:00
d1a631cedb
Only tag the top-most layer, not all interim layers
2013-11-27 22:00:58 +00:00
7f9cdaa342
Merge pull request #2831 from SvenDowideit/please-ignore-squiggle-backup-files
...
Please ignore squiggle backup files
2013-11-27 11:04:21 -08:00
e4ae44b844
Add instructions for opening issues on the repository
2013-11-27 10:41:20 -08:00
89454851d1
Merge pull request #2814 from dotcloud/release_checklist_update
...
update release checklist
2013-11-27 10:04:55 -08:00
f75dc36204
Merge pull request #2904 from SvenDowideit/dont-show-user-internal-slash-in-error-message
...
there appears to be a slash prepended to a container name internally
2013-11-27 09:58:24 -08:00
5fe5055bd9
Merge pull request #2910 from codeaholics/wait-for-simultaneous-pull
...
Allow multiple clients to pull the same tag simultaneously
2013-11-27 09:58:13 -08:00
4e826e99b2
Performance of deleteImageAndChildren.
...
Don't walk the file system for parents each time we recurse.
Fixes #2852
2013-11-27 12:55:15 -05:00
788feab3a7
Handle the case where poolAdd() gives an error for an unknown pool type
2013-11-27 16:53:36 +00:00
682a188ead
Arch docs: Added lxc-docker-nightly AUR package, modified deps
...
lxc-docker-nightly installs latest build. Removed go from dependencies, as it is not needed in lxc-docker and lxc-docker-nightly. The -git package will flag go as a dependency upon installation.
2013-11-27 10:25:30 -06:00
45b1e8c236
Update postgresql's version in example
...
It seems ppa:pitti/postgresql will be deprecated and only apt.postgresql.org has 9.3.
2013-11-27 09:55:41 -05:00
ae474e05f5
Allow multiple clients to pull the same tag simultaneously
...
If two clients simultaneously try to pull the same tag, there was a race
whereby one would succeed and the second would generate an error. Now,
the second simply waits for the first to complete.
2013-11-27 12:18:01 +00:00
0ff9bc1be3
Make sure the firewall rules are created even if the bridge interface is already created
2013-11-27 12:14:18 +01:00
b3e8ba1908
Arch docs: Updated dependencies to match AUR
...
The AUR packages lxc-docker and lxc-docker-git have changed their dependencies.
2013-11-26 22:07:56 -06:00
7b95d41092
tell anyone that might want to ignore their editor choice's backup files that there is a better way - thanks @pnasrat
2013-11-27 13:19:06 +10:00
1cb7b9adc6
there appears to be a slash prepended to a container name internally - don't tell the user about it in an error message, it might cause them to worry about it
2013-11-27 12:58:54 +10:00
d370a889c3
Deleted references to AUFS
...
AUFS is no longer a dependency (both lxc-docker and lxc-docker-git are >=0.7), and the Arch kernel doesn't need to be replaced with AUFS_friendly.
2013-11-26 20:00:13 -06:00
6d34c50e89
Increase max image depth to 127
2013-11-26 17:04:55 -08:00
6344e6f258
Merge pull request #2887 from kleptog/master
...
Add mkseccomp.pl, helper script to make seccomp profiles.
2013-11-26 15:24:35 -08:00
462e30dcbd
Add parseRun volume unit tests
2013-11-26 23:03:50 +00:00
c7661f40b6
Make volumes opts more strict
2013-11-26 23:00:44 +00:00
c707c587c1
Add ParseRun unit tests
2013-11-26 20:16:16 +00:00
5e3f6e7023
Change the default Host affectation to not rely on slice
2013-11-26 18:31:59 +00:00
1beb5005d1
Format main()
2013-11-26 17:47:58 +00:00
1ba11384bf
Refactor Opts
2013-11-26 17:46:06 +00:00
8398abf0dc
Fix CHANGELOG: we ended up not merging the btrfs driver for last night's release
2013-11-26 09:36:46 -07:00
ab3a83c617
Add mkseccomp.pl, helper script to make seccomp profiles.
2013-11-26 17:13:02 +01:00
8b99e4ed37
Merge pull request #2884 from nikai3d/patch-1
...
fix typo in CONTRIBUTING.md
2013-11-26 07:40:49 -08:00
17efa9dc2d
Merge pull request #2872 from goldmann/runtime_typo
...
Fix the 'but is not' typo
2013-11-26 07:40:25 -08:00
76c71260f1
fix typo in CONTRIBUTING.md
2013-11-26 16:13:39 +01:00
8267437294
Fix command line help for docker save
...
`docker save IMAGE DESTINATION` is not what `docker save` expects
2013-11-26 06:54:46 -08:00
9c15322894
Fix the 'but is not' typo.
2013-11-26 11:18:50 +01:00
0d078b6581
fix -link parsing
2013-11-26 00:09:45 -08:00
06d5e25224
Merge pull request #2870 from dotcloud/fix-links-parsing
...
fix -link parsing
2013-11-26 00:09:09 -08:00
009024ad64
fix -link parsing
2013-11-26 00:05:46 -08:00
14d9f04e89
fix docker run on an unknown image
2013-11-25 23:28:48 -08:00
18d08d0d42
Merge pull request #2869 from dotcloud/fix-docker-pull-run
...
fix docker run on an unknown image
2013-11-25 23:28:15 -08:00
0bb2c0b1d0
fix docker run on an unknown image
2013-11-25 23:20:36 -08:00
1af6ffb9bb
Add explicit test strings for new escapeFstabSpaces function
2013-11-26 00:11:42 -07:00
233ad38802
Merge branch 'release'
2013-11-25 22:25:47 -08:00
db28e839e0
Merge pull request #2857 from shykes/0.7-release
...
0.7 release
2013-11-25 22:14:33 -08:00
de30ffb2c3
Add 0.7.0 Changelog entry, with notable high-level features since 0.6.0.
2013-11-26 06:06:22 +00:00
5c5ee194cb
Bump version file to 0.7.0
2013-11-26 06:06:22 +00:00
b6dd67c707
Merge pull request #2868 from jamtur01/ubtfixes
...
Tidied up Ubuntu installation documentation
2013-11-25 22:05:36 -08:00
740958dda7
Merge pull request #2867 from shykes/more-random-names
...
Add more moods and inventor names to random name generator
2013-11-25 22:04:29 -08:00
c38386d876
Remove non-ascii characters from name generator
2013-11-26 06:02:37 +00:00
4267fb66ef
Merge pull request #2866 from tianon/binaries-docs
...
Update "Binaries" installation language to point to distro packages first
2013-11-25 22:00:20 -08:00
a74b512540
Tidied up Ubuntu installation documentation
2013-11-26 00:58:17 -05:00
60809a4f72
Add more moods to random name generator
2013-11-26 05:55:48 +00:00
65fcc81b42
Update "Binaries" installation language to point to distro packages first
...
Also, added a minor consistency update to our usage of "wget".
2013-11-25 22:53:50 -07:00
06cf8fee1b
Merge pull request #2865 from tianon/arch-docs
...
A couple tiny docs consistency fixes
2013-11-25 21:53:16 -08:00
c92dab0eb4
Update Fedora placeholder to include the same "community" and "pre-1.0" warnings so we don't forget them
2013-11-25 22:48:51 -07:00
6ad5b2bcf4
Update Arch Linux instructions to include warnings at the top like other "community" platforms
2013-11-25 22:47:15 -07:00
77f1362c64
Merge pull request #2864 from tianon/gentoo-docs
...
Update the Gentoo installation docs for 0.7+
2013-11-25 21:42:14 -08:00
4049359bee
Update the Gentoo installation docs for 0.7+
2013-11-25 22:40:24 -07:00
7daefc9d3f
Merge pull request #2862 from shykes/integration-tests-vfs
...
Improve integration tests with vfs driver
2013-11-25 21:37:35 -08:00
d4c32b9015
Merge pull request #2854 from dotcloud/copy_dockerinit
...
create a copy of dockerinit on new runtime to handle upgrades
2013-11-25 21:31:33 -08:00
8bd6127ab3
Merge pull request #2815 from tianon/hack-make-tgz
...
Add tgz bundlescript
2013-11-25 21:29:14 -08:00
2302293244
Fix a race condition in the integration tests
2013-11-26 05:28:00 +00:00
fd7ff6411d
Merge pull request #2863 from jamtur01/instsort
...
Installation docs update
2013-11-25 21:19:30 -08:00
59f76bf1c7
Installation docs update
...
* Updated TOC sort order
* Fixed some grammar in Rackspace doc
* Updated titles to remove Linux where not needed
2013-11-26 00:16:30 -05:00
02cb7f45fa
Fix a race condition in TestInterruptedRegister
2013-11-26 05:05:15 +00:00
a937313747
Always use the 'vfs' storage driver in integration tests. To test other drivers, we need a dedicated driver validation suite.
2013-11-26 05:05:15 +00:00
fb3d60f27a
Move all graph tests into integration, because they now rely on the underlying graph driver, which currently cannot be mocked.
2013-11-26 05:05:15 +00:00
5ff74e268d
Merge pull request #2860 from jamtur01/fedora2
...
Updated Fedora docs with simple placeholder
2013-11-25 20:59:15 -08:00
09b7b55e2c
Merge pull request #2861 from crosbymichael/fix-time-race-archive
...
Set consistent time for sample dir in archive test
2013-11-25 20:24:16 -08:00
110c4f2043
create a copy of dockerinit
2013-11-25 20:21:54 -08:00
0d1b5d7676
Set consistent time for sample dir in archive test
2013-11-25 19:58:14 -08:00
5242a49f3f
Updated Fedora docs
...
* Added warning to Fedora docs
2013-11-25 22:51:38 -05:00
2586c042ae
Merge pull request #2810 from dotcloud/use_utc_time
...
Use UTC for time
2013-11-25 19:11:59 -08:00
688e86c625
Merge pull request #2858 from jamtur01/fedora
...
Added Fedora skeleton
2013-11-25 19:10:50 -08:00
750d2d8d07
Added Fedora skeleton
2013-11-25 22:06:18 -05:00
19df6c32c0
Merge branch 'master' into use_utc_time
...
Conflicts:
image.go
2013-11-25 19:01:13 -08:00
1d903da6fd
Merge pull request #2609 from shykes/0.6.5-dm-plugin
...
Move aufs to a storage driver, add devicemapper and dummy drivers
2013-11-25 18:58:26 -08:00
aaefb8c07c
Docs: update install pages (ubuntu and kernel requirements) to reflect the optional nature of AUFS
2013-11-26 02:45:32 +00:00
b3959e69b5
Merge pull request #2837 from shykes/0.7-names
...
New collection of random names for 0.7
2013-11-25 18:39:36 -08:00
43c7df946d
Merge branch 'master' into 0.6.5-dm-plugin
2013-11-26 02:00:25 +00:00
6acdf68ee1
Merge pull request #2804 from tianon/fix-hack-git-assumption
...
Hack: add support for compiling using make.sh without '.git'
2013-11-25 16:52:22 -08:00
487b3d8a8c
Merge pull request #72 from shykes/creack-reduce-debug
...
Reduce debugf frequency to avoid terminal freeze
2013-11-25 15:50:07 -08:00
33f70f8978
Merge pull request #2725 from SvenDowideit/docker-export-doc
...
add 'to STDOUT' to the help and give an example
2013-11-25 14:42:57 -08:00
809239c0af
Merge pull request #2853 from estenberg/cfe-docker-process
...
docker in-container process management with CFEngine
2013-11-25 14:31:52 -08:00
937f52aef9
docker in-container process management with CFEngine
2013-11-25 14:24:23 -08:00
aa48acc5ec
Merge pull request #2849 from jamtur01/supervisor
...
Added a Supervisor process management example
2013-11-25 13:50:44 -08:00
ac70e296db
Merge pull request #2836 from fj/topic/spinx⇒sphinx
...
Corrects misspellings of 'Sphinx'
2013-11-25 13:40:26 -08:00
e2c3860ec3
Merge pull request #2835 from fj/topic/update-native-installation-instructions
...
Use requirements.txt rather than manual installation for docs
2013-11-25 13:28:18 -08:00
2d715bf3c0
Merge pull request #2833 from twillouer/patch-1
...
Better copy/paste :)
2013-11-25 13:21:50 -08:00
d9e54e28e7
Merge pull request #2848 from pnasrat/713-data-races
...
Fix data race in TestLogEvent
2013-11-25 12:07:01 -08:00
78d2e2dc37
Reduce debugf frequency to avoid terminal freeze
2013-11-25 12:06:16 -08:00
abfdaca3f8
Fix data race in TestLogEvent
...
Found with -race. Improve locking on Server.
2013-11-25 14:17:58 -05:00
3a2fbcfdec
Merge pull request #68 from crosbymichael/daemon-docs
...
Add daemon docs with selecting graph driver
2013-11-25 11:06:28 -08:00
ba2b36e192
Added a Supervisor process management example
2013-11-25 14:05:01 -05:00
d47d49a2f9
Merge pull request #71 from crosbymichael/fix-dummy-import
...
Rename dummy in driver.go to vfs
2013-11-25 10:30:20 -08:00
8b0b10b6f9
Rename dummy in driver.go to vfs
2013-11-25 10:28:17 -08:00
399c71de83
Merge pull request #67 from crosbymichael/driver-flag
...
Change graph-driver flag to be s
2013-11-25 09:45:31 -08:00
d8f4b733f2
Add daemon docs with selecting graph driver
2013-11-25 09:44:55 -08:00
b4eeb6be61
Change graph-driver flag to be s
2013-11-25 09:43:32 -08:00
41704d8933
Merge pull request #69 from crosbymichael/rename-dummy
...
Rename dummy driver to vfs
2013-11-25 09:42:50 -08:00
64dd4afed6
Merge pull request #70 from codeaholics/use-https-url-in-dockerfile
...
Clone LVM using https: instead of git:
2013-11-25 09:17:35 -08:00
5da1ed3291
Merge pull request #2730 from SvenDowideit/docker-insert-doc
...
Be more explicit about what insert does.
2013-11-25 09:16:08 -08:00
ad23745456
Clone LVM using https: instead of git:
...
The ports for the git protocol are not open in all corporate environments
2013-11-25 17:12:18 +00:00
cee0a292d0
Rename dummy driver to vfs
2013-11-25 09:04:04 -08:00
b702edadb7
Format lxc_template.go with gofmt
2013-11-24 20:02:06 -07:00
f16c45f8b0
Add space-escaping to path parts of lxc.mount.entry lines in generated lxc.conf, allowing for spaces in mount point names
...
Fixes #2802
2013-11-24 20:00:39 -07:00
07180f3aa7
Add unit test for awesomeness of generated container names
2013-11-25 00:25:15 +00:00
a606474825
Add Ada Lovelace to the names generator (thanks James Turnbull)
2013-11-25 00:22:06 +00:00
5d6ef3177b
New collection of random names for 0.7: mood + famous inventor. Eg. 'sad-tesla' or 'naughty-turing'
2013-11-25 00:22:06 +00:00
0a89db04fe
Better copy/paste :)
2013-11-24 13:55:53 +01:00
1cce9f25b2
Corrects misspellings of 'Sphinx'
2013-11-23 16:21:27 -05:00
f1b3e278b9
Suggest users install dependencies by using requirements.txt, not manually
2013-11-23 15:53:50 -05:00
e288e7763e
be very explicit about docker insert - it does not insert a file into an IMAGE, it creates a new image that adds only that file to its specified parent
2013-11-23 12:48:34 +10:00
9696ec509a
add 'to STDOUT' to the help, and add a simple eg that mentions it too
2013-11-23 12:28:50 +10:00
96b5be9dd9
add more searchable info to the error message when ADD tries to go outside the context
2013-11-23 12:23:31 +10:00
ba6dd1d8d6
Merge pull request #2827 from dotcloud/2778-fix-shell-corrupt
...
2778 fix shell corrupt
2013-11-22 15:46:02 -08:00
c67f9b671d
Remove useless New*Opt functions, singleline Opt types
2013-11-22 14:42:30 -08:00
1c8ae47770
Make a validation on links name
2013-11-22 14:33:25 -08:00
d55998be81
Remove goroutine leak. Make sure termcap are reset each time.
2013-11-22 14:09:37 -08:00
e69bbd239e
Merge branch 'master' into 0.6.5-dm-plugin
2013-11-22 14:06:59 -08:00
a26f9183bd
Merge pull request #56 from shykes/creack-dm-plugin
...
Use variable to call functions in devmapper_wrapper + some formatting
2013-11-22 14:05:59 -08:00
944a48ec5a
Merge pull request #2822 from dotcloud/better_port_help
...
Better port help
2013-11-22 13:59:35 -08:00
79e2b33ede
Use variable to call functions in devmapper_wrapper + some formatting
2013-11-22 12:25:37 -08:00
076c0eab70
Format CmdRun
2013-11-22 12:14:34 -08:00
1f9223a7c2
Use a constant for PortSpecTemplate + display the template in the CmdRun help
2013-11-22 12:00:34 -08:00
476559458d
Reformatting parseRun and partParse
2013-11-22 11:58:02 -08:00
d4c8fb9ee2
Merge pull request #2769 from vbatts/none_bridge
...
Do not setup bridge ip if 'none' bridge is provided
2013-11-22 11:48:33 -08:00
ae8c589d35
Merge pull request #2823 from dotcloud/2817-run_rm-fix
...
Fix docker run -rm
2013-11-22 11:35:29 -08:00
6130f2531e
Merge pull request #2677 from mrallen1/fix/2627
...
Check for a terminal before using escapes
2013-11-22 11:30:16 -08:00
ef14aaf627
fix the nil pointer panic on closing a disabled network manager
...
Issue #2768
2013-11-22 14:28:49 -05:00
1e7c04fcfe
fix -rm
2013-11-22 11:23:48 -08:00
37e0083169
Add a few more small RELEASE-CHECKLIST tweaks, fixes, and improvements
2013-11-22 11:46:15 -07:00
8b0cd60019
Pass terminal setting to display utils
2013-11-22 00:05:55 -06:00
0198f8a879
fixes #2671 , add support for bind mounting individual files in to containers, rebases of #1757 #2301
2013-11-21 23:40:35 -06:00
b3f5973f41
Add new tgz bundlescript to default make and release
2013-11-21 22:34:54 -07:00
3314e005f3
Add new bundlescript to build a tgz
2013-11-21 22:34:54 -07:00
a93e40a158
Merge pull request #2812 from dotcloud/bump_v0.6.7
...
Bump v0.6.7
2013-11-21 18:39:15 -08:00
58f8503b73
update release checklist
2013-11-21 18:34:23 -08:00
cb48ecc9dc
Merge pull request #2812 from dotcloud/bump_v0.6.7
...
Bump v0.6.7
2013-11-21 18:21:19 -08:00
53f1bf0f99
Bump version to v0.6.7
2013-11-21 18:03:41 -08:00
9dc59797e0
Merge branch 'master' into bump_v0.6.7
2013-11-21 17:40:29 -08:00
0cecc2a78c
Merge branch 'master' into 0.6.5-dm-plugin
...
Conflicts:
container.go
image.go
2013-11-21 17:18:41 -08:00
437bdeee59
Merge pull request #62 from shykes/devmapper-unit-tests
...
Devmapper unit tests
2013-11-21 16:54:50 -08:00
806abe90ba
Use UTC for time
2013-11-21 16:43:36 -08:00
25e443a3c7
Merge pull request #2798 from dotcloud/fix_state_race
...
Refactor State to be 100% thread safe
2013-11-21 16:39:50 -08:00
33e70864a2
Refactor State to be 100% thread safe
2013-11-21 16:34:58 -08:00
bc82940a57
Forbid syscalls in tests, add 2 new unit tests
2013-11-21 16:32:16 -08:00
d6e6214d37
Merge pull request #2678 from cxmcc/minor
...
Minor code simplification for Containers api
2013-11-21 16:27:15 -08:00
70f1bd3104
Merge pull request #2488 from viirya/fix_container_volumes_delete
...
Skip the volumes mounted when deleting the volumes of container.
2013-11-21 16:20:22 -08:00
f7c2a00557
Merge pull request #2304 from unclejack/fix_layer_size_computation
...
Fix layer size computation: handle hard links correctly
2013-11-21 16:10:24 -08:00
8498b44eac
Merge pull request #2731 from SvenDowideit/docker-commit-doc
...
make the docker commit help more copy&pasteable
2013-11-21 15:33:05 -08:00
f1e6dce047
Update test scripts to always run ALL tests, even when some fail
2013-11-21 16:19:19 -07:00
e2dcfc2cf7
Merge pull request #2772 from bitoiu/patch-3
...
Change to documentation for AWS AMI request
2013-11-21 15:15:04 -08:00
9b4c151142
Merge pull request #2717 from metalivedev/2342-uploadingcontext
...
Fix #2342 . Harmonize information about ADD. Cross-link build info.
2013-11-21 15:09:47 -08:00
50239e0573
Merge pull request #2799 from rosenhouse/patch-1
...
Fix title on doc page for remote_api_client_libraries.rst
2013-11-21 14:40:33 -08:00
42c23b0f04
Merge pull request #2763 from dotcloud/use_full_id_delete
...
Do ont truncate ID on docker rmi
2013-11-21 14:39:38 -08:00
eec91e7941
Merge pull request #2805 from pmorie/typo
...
Fix typo in pullImage
2013-11-21 14:35:07 -08:00
3f17844b6e
Fix typo in pullImage
2013-11-21 17:29:03 -05:00
efd0e13ca7
Add support for compiling using make.sh without '.git' (ie, from a Github tarball, for example)
2013-11-21 15:11:17 -07:00
bcdeb37bb6
Merge pull request #2794 from dotcloud/fix_status_code_and_usage
...
fix status code and usage
2013-11-21 13:48:38 -08:00
362e9d6b3c
Fix title on doc page for remote_api_client_libraries.rst
2013-11-21 12:45:01 -08:00
c4ab498920
Merge pull request #2797 from crosbymichael/revert-exit-lock
...
Revert "Lock state before we modify."
2013-11-21 12:19:23 -08:00
cb70eedfda
Revert "Lock state before we modify."
...
This reverts commit d7e2fc8982
2013-11-21 12:11:25 -08:00
75a7f4d90c
Return status exit status 2 on usage, move parserun into commands.go, display usage on stderr
2013-11-21 11:43:07 -08:00
da824b4a5a
Merge pull request #63 from tianon/flag-help-consistency
...
Update a few flag help strings for consistency and clarity
2013-11-21 11:31:34 -08:00
1ab6b8bf49
Update a few flag help strings for consistency and clarity
2013-11-21 12:30:17 -07:00
eaeb969138
Merge pull request #2795 from pnasrat/docker-testmultipleattachrestart-race
...
Lock state before we modify.
2013-11-21 11:28:02 -08:00
253214f07d
Update ImageExport after merge fail
2013-11-21 10:26:21 -08:00
a2c9d2da93
Merge branch 'master' into 0.6.5-dm-plugin
2013-11-21 10:21:30 -08:00
d7e2fc8982
Lock state before we modify.
...
When we start a container we lock state, we should do the same in stop.
Detected via -race.
2013-11-21 08:06:02 -05:00
f20c738963
Merge pull request #2793 from crosbymichael/offline-ids
...
Allow images to be saved and loaded by id and repository
2013-11-21 02:44:00 -08:00
df258f5861
Devmapper: test driver initialization and its interaction with libdevmapper
2013-11-21 02:17:03 +00:00
60f728b170
Devmapper: wrap calls to os/exec for easier mocking
2013-11-21 02:16:26 +00:00
2b7c63b1b5
devmapper: skip test which are not unit tests
2013-11-21 02:12:51 +00:00
fd7ab143bf
Allow images to be saved and loaded by id and repository
2013-11-20 17:28:19 -08:00
82cdd21a34
Merge pull request #2727 from SvenDowideit/docker-images-doc
...
add some common examples for docker images, and tell the user what -a filters out
2013-11-20 16:30:48 -08:00
a9230af52e
Merge pull request #57 from shykes/wait_on_pull_already
...
Wait on pull already in progress
2013-11-20 15:58:51 -08:00
2f0d18ac4a
Merge pull request #59 from crosbymichael/fix-image-save-size
...
Fix image save size
2013-11-20 15:58:31 -08:00
6469422465
Merge pull request #58 from crosbymichael/update-aufs-tests
...
Add more aufs tests and implement Status
2013-11-20 15:41:59 -08:00
5306053e21
Add more aufs tests and implement Status
2013-11-20 15:41:37 -08:00
e2390318bb
Devmapper: mock all calls to libdevmapper in the unit tests, and deny them by default
2013-11-20 23:39:02 +00:00
4e0c76b321
Ensure that only the layers are compressed and not mnt points
2013-11-20 15:37:26 -08:00
da514223d1
Devmapper: remove deprecated test helpers
2013-11-20 23:25:27 +00:00
023ff36704
devmapper: fix typo
2013-11-20 23:12:19 +00:00
8fdbf46afb
Fix image size calc on initial save
2013-11-20 14:51:04 -08:00
d233894c25
Add devmapper struct doc
2013-11-20 14:09:46 -08:00
8a756f417e
wait on pull already in progress
2013-11-20 14:04:19 -08:00
a39bd65662
Remove os from devmapper
2013-11-20 13:05:17 -08:00
5690139785
Remove all syscall calls from devicemapper
2013-11-20 12:49:01 -08:00
92f94f06ae
Mock calls to system functions to facilitate unit testing
2013-11-20 20:05:10 +00:00
2bc35287a0
Merge pull request #2723 from SvenDowideit/doc-build-image
...
Use the work Path for docker cp CONTAINER:PATH
2013-11-20 11:10:13 -08:00
2382a0f920
Merge branch 'master' into 0.6.5-dm-plugin
...
Conflicts:
server.go
2013-11-20 11:07:42 -08:00
579a5c843b
Merge pull request #51 from crosbymichael/driver-specific-image
...
Handle image metadata when drivers are switched
2013-11-20 10:45:51 -08:00
b3bee7e0c4
utils: remove dotcloud/tar dep
2013-11-20 18:45:12 +00:00
6ebb236aa1
Merge pull request #55 from alexlarsson/dm-plugins-cleanup-graph-test
...
graph_test: Clean up drivers allocated in tempGraph()
2013-11-20 10:41:18 -08:00
b4f7078a02
Merge pull request #2773 from dotcloud/speed_up_docker_ps
...
speedup docker ps
2013-11-20 10:40:03 -08:00
9e68913397
Merge pull request #2760 from dotcloud/improve_engine_test
...
improve tests on the engine
2013-11-20 10:38:46 -08:00
1b28cdc7f9
Handle image metadata when drivers are switched
2013-11-20 10:31:51 -08:00
304a80fcd5
Merge pull request #2747 from jpoimboe/test-fixes
...
Test fixes
2013-11-20 10:07:40 -08:00
04f1d4dcdb
Merge pull request #2788 from jpoimboe/resize-after-start
...
resize pty after starting
2013-11-20 10:01:59 -08:00
171d681724
resize pty after starting
...
Since ptyMaster is created during container start (startPty), it should
resized after starting, not before.
2013-11-20 11:40:30 -06:00
60cb5f1a34
do not setup bridge ip if bridgeNetwork is nil. This is the case when
...
-b='none' bridge is provided.
issue #2768
https://bugzilla.redhat.com/show_bug.cgi?id=1032094
2013-11-20 09:36:38 -05:00
cfdc284abe
tags test: cleanup driver
...
If not we leak a devicemapper pool
2013-11-20 14:52:06 +01:00
7192be47c5
graph_test: Clean up drivers allocated in tempGraph()
...
If we don't do this we leak devicemapper pools with the dm backend.
2013-11-20 14:42:32 +01:00
cd4c1ac356
Merge pull request #2779 from crosbymichael/pin-python-deps
...
Pip python deps to a specific version
2013-11-19 21:29:09 -08:00
b8af68a92b
Merge pull request #1974 from dotcloud/1155-offline-image-transfer
...
Implement offline image transfers
2013-11-19 20:00:58 -08:00
9de4590498
Add typo in remove all. Ensure tmpDir is removed
2013-11-20 03:52:33 +00:00
0ef6fed5c7
Fix error checks for offline transfer and remove unneeded debug output
2013-11-20 03:52:33 +00:00
383f95bba1
Adding 1.7 documentation
2013-11-20 03:52:33 +00:00
1211065c8d
Adding content type to images/(name)/get
2013-11-20 03:52:33 +00:00
844c13bce6
Fixing build
2013-11-20 03:52:33 +00:00
6014db4a7e
Setting offline package version to 1.0
2013-11-20 03:52:33 +00:00
bf504f2afa
Adding spaces to fix docs build
2013-11-20 03:52:33 +00:00
61a8020e51
Adding version info, switching to defer for cleanup
2013-11-20 03:52:33 +00:00
7eaa59f626
Offline Image Transfers #1155
2013-11-20 03:52:33 +00:00
2cccbbdadd
Pip python deps to a specific version
2013-11-19 19:25:54 -08:00
24586d7af5
Merge pull request #54 from shykes/vieux_merge_master
...
Merge from master
2013-11-19 18:38:15 -08:00
b700ee006a
Merge pull request #2777 from dotcloud/fix_port_stop_start
...
don't import emport empty hostconfig
2013-11-19 18:36:22 -08:00
880a0e9c36
Merge branch 'master' into vieux_merge_master
2013-11-19 18:34:19 -08:00
0169cf15dd
don't import emport empty hostconfig
2013-11-19 18:28:50 -08:00
cd022376b8
Merge branch 'master' into vieux_merge_master
...
Conflicts:
runtime.go
2013-11-19 17:32:08 -08:00
234f5ac39f
Merge pull request #2750 from jpoimboe/simplify-register-reconnect
...
Simplify the runtime Register reconnect logic
2013-11-19 17:30:59 -08:00
d4ef551d65
Merge pull request #53 from shykes/improve_cleanup
...
Improve aufs cleanup and debugging
2013-11-19 17:16:36 -08:00
76f54f3a28
Merge pull request #39 from crosbymichael/add-driver-flag
...
Add flag to set default graph driver
2013-11-19 17:16:25 -08:00
43b709ab36
Merge pull request #52 from crosbymichael/rename-aufs-driver
...
Rename AufsDriver to Driver to be consistent
2013-11-19 17:13:44 -08:00
43899a77bf
improve aufs cleanup and debugging
2013-11-19 17:12:37 -08:00
d575918038
Merge pull request #2748 from jpoimboe/fix-restart-race-condition
...
fix container restart race condition
2013-11-19 16:26:13 -08:00
f6629bbbd5
Merge pull request #50 from crosbymichael/limit-dm
...
Prohibit more than 42 layers in the core
2013-11-19 15:42:00 -08:00
91330243b5
Merge pull request #48 from crosbymichael/reset-mtime
...
Ensure same atime, mtime after applying whiteouts
2013-11-19 15:40:12 -08:00
3e0a5ac48b
Merge pull request #41 from alexlarsson/dm-plugin-device-tool
...
Update docker-device-tool
2013-11-19 15:38:47 -08:00
0d603df6dc
Merge pull request #49 from shykes/creack-merge-master
...
Merge master into 0.6.5-dm-plugin
2013-11-19 15:29:09 -08:00
12e993549d
Fix unit-tests
2013-11-19 15:24:14 -08:00
28d4cbbc59
Merge branch 'master' into creack-merge-master
...
Conflicts:
api_params.go
graph.go
graph_test.go
image.go
integration/api_test.go
integration/container_test.go
integration/runtime_test.go
runtime.go
2013-11-19 14:58:12 -08:00
5a4113140e
Merge pull request #43 from alexlarsson/dm-plugin-use-root-subdir
...
devmapper: Use a "root" subdirectory in the devmapper volume
2013-11-19 13:51:04 -08:00
85b5062502
Merge pull request #44 from crosbymichael/container-migration
...
Container and Image migration for aufs
2013-11-19 13:47:23 -08:00
66beafa9f3
rename file to remove testing flags from docker binary
2013-11-19 12:41:29 -08:00
3cbec95177
simplify the runtime Register reconnect logic
...
Refactor the Register code a little bit to make it easier to comprehend.
2013-11-19 14:09:30 -06:00
8e5ab5bfca
improve tests on the engine
2013-11-19 11:47:47 -08:00
9d867a389b
Merge pull request #2759 from dotcloud/lintify-1
...
Lintify code with confidence=1
2013-11-19 11:26:15 -08:00
4f9f83d6c6
Fix #2342 . Harmonize information about ADD. Cross-link build info.
2013-11-19 11:16:28 -08:00
145c2008ae
speedup docker ps
2013-11-19 11:02:10 -08:00
4eaba8de91
Merge pull request #2757 from Painted-Fox/patch-2
...
Simplify the upstart example in host_integration.rst
2013-11-19 10:29:54 -08:00
434c1613a4
Merge pull request #2770 from tianon/better-man-page
...
Switch sphinx man_pages generation to use commandline/cli
2013-11-19 10:28:50 -08:00
18da26c62a
Merge pull request #2766 from sbellem/doc-improvements
...
fixed typos, and made small improvements to the wording
2013-11-19 10:27:25 -08:00
4c2624a277
Merge pull request #45 from alexlarsson/dm-plugin-diff-size
...
Implement fallback for getting the size of a container
2013-11-19 10:25:31 -08:00
f4b3b7c055
Merge pull request #47 from alexlarsson/dm-plugin-ummount-when-removing
...
Devicemapper: Unmount when removing device
2013-11-19 10:24:44 -08:00
9af1b07086
Merge pull request #46 from alexlarsson/dm-plugin-dummy-use-cp
...
Dummy driver: Use cp --reflink=auto to copy directories
2013-11-19 10:16:56 -08:00
aeb304b37c
Change to documentation for AWS AMI request
...
Hi guys, it just might be me, but clicking the AMI from http://cloud-images.ubuntu.com/locator/ec2/ is broken to me. So I just did it via the normal Create Instance Wizard.
I just though some people might have the same issue.
Sorry if my markdown for links is screwed up, I went by the examples, since I'm used to the `[]()` traditional one.
Cheers.
2013-11-19 17:50:38 +00:00
1da8c50ded
Fix quote mistake.
2013-11-19 12:14:39 -05:00
1cd9529ad3
Switch sphinx man_pages generation to use commandline/cli instead of toctree for a more relevant/useful man page
2013-11-19 10:10:42 -07:00
f78d45863c
Merge pull request #2734 from zitrusmedia/master
...
Vagrantfile modified to support VBoxGuestAdditions_4.3.2
2013-11-19 09:04:28 -08:00
3656db66d2
fixed typos, and made small improvements to the wording
2013-11-19 14:44:50 +01:00
0ed762f2d2
devicemapper: Unmount when removing device
...
Without this the remove will fail due to a busy device.
2013-11-19 14:40:15 +01:00
242fd4b3ef
dummy driver: Use cp --reflink=auto to copy directories
...
On systems that supports reflinking (i.e. btrfs) this means the dummy
backend is much faster at copying files and will be sharing file data in
a CoW fashion.
On my (btrfs) system this makes "docker run ubuntu echo hello world" go
from about 3 seconds to about 1 second. Not instant, but clearly better.
cp --reflink=auto is availible since coreutils 7.5 (around 2009), so this
seems pretty ok to rely on.
cp is also better at preserving file metadata than tar, so for instance
it will copy xattrs.
2013-11-19 13:09:36 +01:00
78c843c8ef
fix container size computation: handle hard links
...
This change makes docker compute container size correctly.
The old code isn't taking hard links into account. Containers could
seem like they're up to 1-1.5x larger than they really were.
2013-11-19 13:53:34 +02:00
ac821f2446
fix layer size computation: handle hard links
...
This change makes docker compute layer size correctly.
The old code isn't taking hard links into account. Layers could
seem like they're up to 1-1.5x larger than they really were.
2013-11-19 13:37:54 +02:00
51a972f38d
Rename AufsDriver to Driver to be consistent
2013-11-19 03:27:59 -08:00
aea6001baf
Check env var for setting driver in tests
2013-11-19 03:13:22 -08:00
6dbeed89c0
Add flag to set default graph driver
...
Remove the env var DOCKER_DRIVER
2013-11-19 02:37:44 -08:00
5d76681c3d
Implement fallback for getting the size of a container
...
This moves Driver.Size() to Differ.DiffSize(), removing the empty
implementations in devmapper and dummy, and renaming the one in aufs.
Then we fall back to a container.Changes() implementation in the non-aufs
case.
2013-11-19 10:36:54 +01:00
9415c2b1f0
Move docker-device-tool to contrib
2013-11-19 10:03:04 +01:00
a0224e61b4
devicemapper tool: Add support for pool resizing
2013-11-19 09:59:13 +01:00
af753cbad8
Prohibit more than 42 layers in the core
...
We need to do this because we still support aufs
and users on other drivers can push incompat images
to the registory that aufs users cannot use.
2013-11-19 00:51:16 -08:00
80aecc7014
devmapper: Update device-mapper-tool
...
This makes the device mapper tool work again and adds new features
to get pool status, device status and to list all devices.
2013-11-19 09:44:19 +01:00
3edb4af663
Ensure same atime, mtime after applying whiteouts
2013-11-19 00:35:03 -08:00
00401a30b7
devmapper: Use a "rootfs" subdirectory in the devmapper volume
...
We place the actual image/containers in the "rootfs" directory, which
allows us to have other data in the toplevel directory in the mount.
For starters, this means the "lost+found" directory from mkfs will
not always be in your container/image.
Secondly, we can create a file "id" in the toplevel dir which is not
visible from the container. This is useful because it allows us to map
back from the device fs to the container if something goes wrong with
the devicemapper metadata.
2013-11-19 09:29:42 +01:00
5ee8e41e43
Retry moving dirs on every daemon startup
...
This will try to move the directories that were
previously symlinked until a full migration is complete.
2013-11-18 23:28:45 -08:00
29f07f8544
Add container migration to aufs driver
2013-11-18 18:39:21 -08:00
2fe4467d73
Do ont truncate ID on docker rmi
2013-11-18 18:39:02 -08:00
194d4b9376
Correct the quotations in the command to add the -r=false flag. Thanks to @tianon for pointing this out.
2013-11-18 21:23:00 -05:00
1de02a70de
Merge pull request #2719 from metalivedev/2702-knownissue-lxc-start-failed-to-mount
...
Fixes #2702 . Also cleans up formatting and long lines in volumes doc.
2013-11-18 17:27:49 -08:00
5e941f1ca0
Lintify code with confidence=1
2013-11-18 16:24:11 -08:00
f88b760809
Migrate images with parent relationship
2013-11-18 16:17:43 -08:00
511a62a099
Merge pull request #2755 from metalivedev/test-2592
...
Replace PR#2592
2013-11-18 15:29:48 -08:00
256d46fe68
Merge pull request #2721 from metalivedev/2701-addmedia
...
Add security section and embed private registry video.
2013-11-18 15:29:35 -08:00
76ee860ece
Simplify the upstart example in host_integration.rst
...
Taking some pointers from @tianon on my pull request #2685 .
2013-11-18 16:21:03 -05:00
94e854823f
Use tryRelocate to fall back to symlink if rename fails
2013-11-18 13:16:28 -08:00
e42b574579
Merge pull request #42 from alexlarsson/dm-plugin-archive-test-skip
...
Mark archive.TestApplyLayer as skipped
2013-11-18 13:10:39 -08:00
2ae1f29dfe
Fixes #2702 . Also cleans up formatting and long lines in volumes doc.
2013-11-18 13:09:13 -08:00
4b80ec9aae
test: remove extra args in TestExitCode
...
The extra blank argument isn't needed and confuses libvirt.
2013-11-18 15:07:11 -06:00
fef41ef7bf
test: fix TestRmi race condition
2013-11-18 15:07:06 -06:00
f946a486ea
Merge pull request #2718 from dotcloud/fix_tmp_dir_never_cleanup
...
Fix tmp dir never cleanup
2013-11-18 12:20:23 -08:00
e008c7c068
Merge pull request #2743 from tianon/go1.2rc5
...
Update to go1.2rc5
2013-11-18 12:11:56 -08:00
669e4bac30
Merge pull request #2729 from SvenDowideit/docker-info-doc
...
add example for docker info
2013-11-18 11:44:54 -08:00
f6362fbb0e
Merge pull request #2726 from SvenDowideit/docker-history-doc
...
add example for docker history
2013-11-18 11:43:44 -08:00
c1cd824570
Merge pull request #2742 from rick/patch-1
...
Tiny typo cleanup
2013-11-18 11:37:37 -08:00
4546832507
Merge pull request #2752 from dotcloud/gofmt_test
...
Go fmt tests
2013-11-18 11:34:59 -08:00
b5934711d0
Merge pull request #2724 from SvenDowideit/docker-diff-example
...
add an example of what to expect from docker diff, and what the 3 codes mean
2013-11-18 11:34:05 -08:00
ed8f75d25c
gofmt_test
2013-11-18 11:25:13 -08:00
cfbd9ea16d
Merge pull request #2749 from jpoimboe/dont-forward-SIGCHLD
...
Do not forward SIGCHLD to container
2013-11-18 11:24:08 -08:00
75dd1663e0
Merge pull request #2638 from FreakyDazio/2506-name-conflict-error
...
More informative error message on name collisions
2013-11-18 11:13:43 -08:00
3c67a28493
More informative error message on name collisions
...
This is the proposed fix for #2506 . It provides a more complete message
with regards to name collisions including informing of the opposing
containers ID.
I have included a test to ensure that the correct short id is displayed
to make the message easier to understand.
2013-11-18 17:51:47 +00:00
440422a963
don't forward SIGCHLD to container
...
It makes no sense to forward SIGCHLD to the container.
2013-11-18 11:45:29 -06:00
fc2f5758cf
fix container restart race condition
...
Finish container cleanup before setting the state to stopped.
Otherwise, for an application that exits quickly, a call to Restart
can allow Start to be called again before cleanup is done, resulting in
overritten data in the Container struct.
2013-11-18 11:42:30 -06:00
fe302fbfd2
test: 2 second timeout (not 2000)
2013-11-18 10:23:30 -06:00
72d02ecdde
test: skip TestCreate on Fedora due to lxc utils bug
...
In the dind environment running on a Fedora host, the lxc utils get
confused by the /sys/fs/cgroup/cpuacct,cpu cgroup mount and lxc-start
fails trying to access the wrong cgroup directory.
2013-11-18 10:23:30 -06:00
baa687bed2
test: fix TestCreateStartRestartStopStartKillRm
...
cat needs stdin opened, otherwise it dies immediately.
2013-11-18 10:23:30 -06:00
30ea0bebce
test: put each arg in a separate string
...
Each arg to docker run should be placed in a separate string.
Otherwise, when starting the command via exec.Cmd, the command is
interpreted as "echo test", which can't be found.
2013-11-18 10:23:06 -06:00
8ed4307f50
Mark archive.TestApplyLayer as skipped
...
Instead of just returning we call Skip to log that the test
was skipped.
2013-11-18 14:31:34 +01:00
9e1da3ec9c
Update to go1.2rc5
2013-11-17 22:36:26 -07:00
b76574f855
Tiny typo cleanup
2013-11-17 21:10:06 -08:00
457375ea37
Merge pull request #2732 from jplock/patch-2
...
Fix images not being properly tagged in mkimage-debootstrap.sh
2013-11-17 08:06:58 -08:00
7e580aacec
Vagrantfile modified to support VBoxGuestAdditions_4.3.2
2013-11-17 01:20:21 +01:00
0e64b987e8
Fix images not being properly tagged
2013-11-16 11:05:38 -05:00
bc74f65068
make the docker commit help more copy&pasteable
2013-11-16 21:11:34 +10:00
5c741ef11d
add example
2013-11-16 20:53:45 +10:00
152459b727
add some common examples for docker images, and tell the user what -a filters out
2013-11-16 20:45:30 +10:00
f04142c1f7
add example for docker history
2013-11-16 20:36:33 +10:00
af05ab399e
add an example of what to expect from docker diff, and what the 3 codes mean
2013-11-16 20:26:47 +10:00
27159ce6ba
expunge the word 'Resource' in reference to a file/dir in a CONTAINER - that way users don't wonder how its different from a Path
2013-11-16 20:15:04 +10:00
51576069ad
Merge pull request #2694 from shykes/separate-integration-tests
...
Separate integration tests
2013-11-15 18:21:34 -08:00
d33ffe44a9
Fixes #2701 . Adds security section.
2013-11-15 18:12:35 -08:00
afe230718e
Re-enable api integration tests using only public remote API.
2013-11-16 02:12:14 +00:00
427649eee1
Merge pull request #40 from shykes/creack-0.6.5-dm-plugin
...
Rename gograph and move drivers to sub pkg
2013-11-15 17:31:50 -08:00
a518b84751
WIP
2013-11-15 17:16:30 -08:00
9261690593
Fix tmp dir never cleanup
2013-11-15 16:23:55 -08:00
cbd1281ec9
rename gograph in graphdb
2013-11-15 15:55:45 -08:00
035c144242
Move all drivers to the same subdir graphdriver
2013-11-15 15:48:24 -08:00
fb245f7903
Merge pull request #38 from crosbymichael/add-container-driver
...
Save driver to container and skip incompat containers
2013-11-15 14:20:19 -08:00
dc5b7b32c3
Merge pull request #36 from crosbymichael/unlink-init-files
...
Unlink docker init files
2013-11-15 14:09:51 -08:00
e12bba66ea
Merge pull request #2709 from eugenkrizo/patch-1
...
path needs to be specified to 'docker build' command
2013-11-15 13:34:08 -08:00
92c3a319fb
Merge pull request #2713 from eugenkrizo/patch-2
...
port published explicitly (for docker 0.6.6)
2013-11-15 13:32:18 -08:00
323e86032d
Merge pull request #2685 from Painted-Fox/patch-1
...
Add more depth to the upstart example in host_integration.rst
2013-11-15 12:28:07 -08:00
c06d903edd
bring back tests about LXCConfig
2013-11-15 11:48:18 -08:00
9a9d3239e1
Fix typos, add links, streamline content of #2592
2013-11-15 11:38:03 -08:00
33110ddc3f
Merge branch 'fix_examples_use_docs' of git://github.com/rogaha/docker into test-2592
2013-11-15 11:15:14 -08:00
6341768393
Merge pull request #2689 from metalivedev/fix-syntax
...
Clean up sphinx syntax
2013-11-15 11:09:51 -08:00
ad96d5ff04
Merge pull request #2712 from makinacorpus/master
...
Do not drop sys_boot
2013-11-15 10:33:41 -08:00
7cad77b1e2
Merge pull request #33 from alexlarsson/dm-plugin-status
...
Add driver plugin status
2013-11-15 10:15:59 -08:00
2b23da1d2f
Merge pull request #34 from alexlarsson/dm-plugin-dummy-volumes
...
Use dummy driver for volumes
2013-11-15 09:41:16 -08:00
bcf96d95bc
Merge pull request #30 from alexlarsson/dm-plugins-archive-tests
...
Dm plugins archive tests
2013-11-15 09:38:17 -08:00
492ce4c665
port published explicitly (for docker 0.6.6)
...
port 5984 to couchdb needs to be published explicitly in docker version 0.6.6
2013-11-15 17:12:48 +01:00
76ab8fa00f
Merge pull request #1 from jpetazzo/2392-add-kernel-docs
...
Add warning about SYS_BOOT capability with pre-3.4 kernels and pre-0.8 LXC.
2013-11-15 07:58:54 -08:00
007964793d
path needs to be specified to 'docker build' command
...
current folder '.' appended as a path
2013-11-15 16:16:59 +01:00
10f23a94f6
Use dummy driver for volumes
...
It makes no sense to use the aufs or devicemapper drivers for volumes.
The aufs one is perhaps not a big problem, but the devicemapper one
certainly is. It will be unnecessarily using a dm
blockdevice-over-loopback with a limited size base FS.
This just hardcodes the driver to be the dummy, perhaps in the future
we can have other drivers that make sense for the volumes.
2013-11-15 11:30:28 +01:00
243843c078
Print devicemapper status details in docker info
...
This adds a generic Status call in the Driver api and
implements if for the devicemapper backend.
The status is an array of key/value strings rather than a map so that
we can guarantee some static order of the docker info output.
2013-11-15 11:04:02 +01:00
062810caed
Show active driver in docker info output
2013-11-15 10:24:48 +01:00
f7238f94e8
Add tests for the changes detection code
...
This adds 3 tests:
Verify that ChangesDirs() returns nothing when run on a copy of the
same directory.
Verify that various mutations of a directory get reported with the
right changes.
Verify that ExportChanges() + ApplyLayer() of the above mutation gets
an identical directory.
Unfortunately the last test is disabled because it fails in multiple
ways atm. But I want to get it in so that we can fix it.
2013-11-15 09:49:46 +01:00
d69a6a20f0
Use ExportChanges() in runtime.Diff()
...
This code was duplicated in two places, one which was unused. This
syncs the code and removes the unused version.
2013-11-15 09:49:42 +01:00
4908d7f81d
Save driver to container and skip incompat containers
...
For people who toggle drivers we want to save the driver used
to create a container so that if the driver changes we can skip
loading the container and it should not show up in docker ps
2013-11-14 22:53:59 -08:00
29fa1b6666
Unlink docker init files
2013-11-14 21:23:23 -08:00
bed87ea103
Merge pull request #2690 from codevin/master
...
Improvise documentation for builder.rst / VOLUME command
2013-11-14 19:23:18 -08:00
823674816e
Move iptables test to integration tests
2013-11-15 01:15:39 +00:00
8d3e35cd8d
Split auth tests between unit tests and integration tests
2013-11-15 01:13:20 +00:00
596810d8db
move TestMount to integration
2013-11-14 15:17:31 -08:00
661a8a0e0c
fix Integration tests
2013-11-14 14:46:13 -08:00
006e2a600c
ApplyLayer() use RemoveAll to handle removing directories
...
rmTargetPath can be a directory, so we have to use RemoveAll() or we
will fail to whiteout non-empty directories.
2013-11-14 22:56:18 +01:00
e9624bf715
Remove deprecated tags_test.go
2013-11-14 10:50:43 -08:00
2a209afe5f
gofmt
2013-11-14 10:50:43 -08:00
c001a5af67
Integration tests: remove dependency on private APIs
2013-11-14 10:50:43 -08:00
359a6f49b9
Move integration tests to integration/, expose missing public methods in the core
2013-11-14 10:50:00 -08:00
7267c4b746
Removing sudo
2013-11-14 05:53:53 +00:00
26533eb2c4
Adding a makefile
2013-11-14 05:34:25 +00:00
37abc07852
Improvise documentation for builder.rst / VOLUME command
2013-11-14 09:54:31 +05:30
059950b095
Clean up sphinx syntax, upgrade http markup package, minor link changes, update intro.
2013-11-13 17:45:22 -08:00
02884ee429
Add more depth to the upstart example in host_integration.rst
...
I found that the original example wasn't starting the docker container when docker is started. So, I modified it using information I found from https://groups.google.com/forum/#!msg/docker-user/OWz8EOpiXuo/L_uxGFQuYlkJ
Also, upstart wasn't starting docker if it wasn't running ahead of time. So, I added a change to the docker upstart script to solve this.
2013-11-13 13:34:34 -05:00
8145e57cee
Add warning about SYS_BOOT capability with pre-3.4 kernels and pre-0.8 LXC.
2013-11-13 10:29:29 -08:00
0013aa7d9f
Minor code simplification for Containers api
2013-11-13 01:29:00 -08:00
1d7f22c0d4
use Binds key in hostConfig to detect volumes mounted from external.
2013-11-13 15:08:46 +08:00
6a693176d6
skip the volumes mounted when deleting the volumes of container.
2013-11-13 14:58:24 +08:00
eba3c36b38
- Included the sudo alternative as an example_header
2013-11-07 14:44:07 -08:00
304d39cc50
- Fix the attach examples according to the new attach behavior
...
- Add the option of adding the user to docker's group and avoid the usage of "sudo" before each command
2013-11-07 14:06:49 -08:00
6d420407ca
Merge pull request #2577 from dotcloud/bump_v0.6.6
...
Bump v0.6.6
2013-11-06 12:03:03 -08:00
b64ce8e33c
Do not drop sys_boot
...
This fixes #2391
2013-10-25 18:41:03 +02:00
821a82ac6c
Add Developer Certificate of Origin Text
...
We purposely chose to license Docker under the Apache 2.0 license. This is a well-known
license, which is popular for its permissive and flexible properties, while still
encouraging a collaborative community. It also makes certain representations with regard
to contributions, and the rights given to contributors, the project, people who use Docker,
people who modify Docker, etc.
This approach to contributions is inspired by the popular Linux Developer
"Certificate of Origin". This approach makes it simple for new contributors to get started,
and avoids bureaucracy in tracking contributions and contributors.
To indicate accordance, each individual contribution to the Project is signed off by the
developer, using his or her real name, email address, and github handle in the format below:
Docker-DCO-1.0-Signed-off-by: Joe Smith <joe.smith@email.com >
2013-10-04 14:27:26 -07:00
Michael Crosby