Commit Graph

448 Commits

Author SHA1 Message Date
11e97d1f42 Fix bash completion for docker run -d
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 01bd90c4ad5322d443d6952c897dd6ba8d17a3ba
Component: engine
2015-02-16 19:23:29 +01:00
6a9a983a60 Merge pull request #10762 from coolljt0725/fix_check_config
Fix check-config.sh usage
Upstream-commit: 4f24b77826227a17048432a51d728a5ea05dceaa
Component: engine
2015-02-13 10:36:00 -08:00
935df32156 mkimage-alpine.sh: Allow to change ARCH from the environment
Signed-off-by: Manfred Touron <m@42.am>
Upstream-commit: 75f1c440dd9332d28d33585bf16e05a7647412c9
Component: engine
2015-02-13 13:57:04 +01:00
44be94d7d0 Fix check-config.sh usage
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 82fda400b8a2528b1b90e64fc4be6827afbd04ed
Component: engine
2015-02-13 19:52:11 +08:00
2dc29a37bd Merge pull request #10598 from lsm5/core-file-size
no limit on core size
Upstream-commit: 9944f8b95453e3d0726fc037aaed41a98e72e070
Component: engine
2015-02-09 17:31:40 -08:00
12a8539065 Merge pull request #10277 from mleone896/rhinit_dead_pid_file
Fixing stale pidfile issue when docker dies abruptly
Upstream-commit: 6da5b88bedf7d14c7efb25ae659cccd8980732a4
Component: engine
2015-02-09 12:19:23 -08:00
2989e6a633 no limit on core size
set LimitCORE=infinity to ensure complete core creation,
allows extraction of as much information as possible.

Thanks to Ulrich Obergfell <uobergfe@redhat.com>
and Jeremy Eder <jeder@redhat.com>

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
Upstream-commit: ae9cdbbde7824951b124a648e897ac4c291108e3
Component: engine
2015-02-09 19:04:50 +00:00
71dfbf9d9b Fixing stale pidfile issue when docker dies abruptly
Signed-off-by: Mike Leone <mleone896@gmail.com>

fixing indent

Signed-off-by: Mike Leone <mleone896@gmail.com>
Upstream-commit: 05d04843e6b80f131c07882c882f7e4da018a306
Component: engine
2015-02-09 14:01:12 -05:00
379cbf8e87 Merge pull request #10443 from jbiel/patch-1
mkimage-arch.sh - don't run docker in interactive mode
Upstream-commit: 4b681c401c4e01e4cabdfc5197232272f3e88ba2
Component: engine
2015-02-09 08:45:20 -08:00
0eb30d2c37 Merge pull request #10623 from jfrazelle/update-fish
Update docker.fish
Upstream-commit: 7b7c8f587b81eee4733685cc11ad4b40f196d2d3
Component: engine
2015-02-07 12:37:21 -05:00
a6d778b8d7 Update docker.fish
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)

Signed-off-by: Coenraad Loubser <coenraad@wish.org.za>
Upstream-commit: 2471134ae38cf5a3743dc530ea746fb2ee42a107
Component: engine
2015-02-06 15:07:42 -08:00
695e4a4343 Merge pull request #10300 from hqhq/hq_add_args_for_checkconfig
add args support for check-config.sh
Upstream-commit: 77815c5492a20afc390b70ada662c3dc58e682c7
Component: engine
2015-02-06 13:49:09 -08:00
a2390c36ad Bash completion for docker kill
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 532513153f64abdda87332b3cf76863dd07bf0ff
Component: engine
2015-02-05 09:42:33 +01:00
4c5199075f mkimage-arch.sh - don't run docker in interactive mode
Don't run docker in interactive mode in the archlinux container build script. Recent versions of Docker error out with "cannot enable tty mode on non tty input" when being run non-interactively (such as in a cron job, Jenkins build, etc.)

Signed-off-by: Jared Biel <jared.biel@bolderthinking.com>
Upstream-commit: 4ff56bbddf23c64586920a8861f75c3d35413e49
Component: engine
2015-01-29 19:49:28 +00:00
55694ca80d Merge pull request #10416 from icecrime/update_fish_completion
Update fish completion for 1.5.0
Upstream-commit: 17e840a47a7e65a96d53db1bbace43f59a4b1a31
Component: engine
2015-01-28 10:28:47 -08:00
3665f098e8 Update fish completion for 1.5.0
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 9cea20ffc5904201efdda2c8d6623759e15ad8eb
Component: engine
2015-01-28 08:52:06 -08:00
7acff5d3a0 Add completion for stats.
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: b3dfe1a63a51639400e691939b0879e9b0807703
Component: engine
2015-01-26 11:19:29 -08:00
4bcd09aacc Merge pull request #10219 from albers/bash-completion
Bash completion for the daemon flags
Upstream-commit: b1f2fdeee213c437a363db9eda235444ffdcc4a5
Component: engine
2015-01-25 10:25:22 -08:00
8b134ecd31 add args support for check-config.sh
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: aac6090f2df3cc9192d1813e3c1f48b882f063d4
Component: engine
2015-01-23 16:36:55 +08:00
50eae15c89 Add bash completions for daemon flags, simplify with extglob
Implementing the deamon flags the traditional way introduced even more
redundancy than usual because the same list of options with flags
had to be added twice.

This can be avoided by using variables in the case statements when
using the extglob shell option.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 4bb113f24e1ea12ab7ab9ddfe0508e4f833445e5
Component: engine
2015-01-21 09:15:30 +01:00
2a76864b4e contrib/sysvinit-redhat: unshare mount namespace
unshare the mount namespace of the docker daemon to avoid other pids
outside the daemon holding mount references of docker containers.

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: 6bb65864589fbd720622cbd795763d108999a366
Component: engine
2015-01-20 16:00:41 -05:00
89ba84c840 contrib/systemd: mount namespace and subtree flags
This systemd.exec setting will construct a new mount namespace for the
docker daemon, and use slave shared-subtree mounts so that volume mounts
propogate correctly into containers.

By having an unshared mount namespace for the daemon it ensures that
mount references are not held by other pids outside of the docker
daemon. Frequently this can be seen in EBUSY or "device or resource
busy" errors.

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: eb76cb2301fc883941bc4ca2d9ebc3a486ab8e0a
Component: engine
2015-01-20 14:22:04 -05:00
792af8c0a5 Add build --pull and evenets --filter flags to the docs for 1.4
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 18a2c77435cdad8f759421500cba6ac20057daf8
Component: engine
2015-01-15 15:20:48 +13:00
d5a1764c0a Delete man pages of installed packages in mkimage-arch.sh
Docker-DCO-1.1-Signed-off-by: Zoltan Tombol <zoltan.tombol@gmail.com> (github: ztombol)
Upstream-commit: 18c0b415644b594969bbec49de51098be62d18f8
Component: engine
2015-01-13 18:10:50 +01:00
88f9df3419 Revise list of installed packages in mkimage-arch.sh
Docker-DCO-1.1-Signed-off-by: Zoltan Tombol <zoltan.tombol@gmail.com> (github: ztombol)
Upstream-commit: 9f59b057be25656214d65040ae113c0d76d99324
Component: engine
2015-01-13 18:10:50 +01:00
4bf864f7fb Explicitly mention that '-P' maps to random ports
as noted in https://github.com/boot2docker/boot2docker/issues/690

Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: 7b2331061e428176cf513487745ac496e2bd7027
Component: engine
2015-01-06 17:01:10 +10:00
bdbc984c7d Update syntax/vim README with Vundle instructions
Signed-off-by: Evan Carmi <evan@ecarmi.org>
Upstream-commit: 8d1485bd3f1c1c8c94b8673ba818ed374fe10022
Component: engine
2015-01-05 11:08:22 -08:00
21017010a3 Sort options in bash completion alphabetically
This introduces a sort order for options:

Arrange options sorted alphabetically by long name with the short
options immediately following their corresponding long form.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 70161b4d45ec990a4e597e133092e389e168ad79
Component: engine
2015-01-01 11:21:42 +01:00
6e9adc8ae3 Add missing options to bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 50eb14244d3139e8aa9141d8f7076043ffecbc6e
Component: engine
2015-01-01 11:21:42 +01:00
783229617c Merge pull request #9822 from tianon/01autoremove-kernels
Remove /etc/apt/apt.conf.d/01autoremove-kernels in mkimage/debootstrap
Upstream-commit: ed7a1fc8f25ff82aaafe043c864f64d606dd0a41
Component: engine
2014-12-30 09:32:04 -08:00
847659a0a9 Add CONFIG_POSIX_MQUEUE to check-config.sh
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 8803174e4f8a3f0a2e5d0d077e8bed0607f3cbe3
Component: engine
2014-12-26 14:59:25 -07:00
39ae00e73e Remove /etc/apt/apt.conf.d/01autoremove-kernels in mkimage/debootstrap
This file is one APT creates to make sure we don't "autoremove" our currently in-use kernel, which doesn't really apply to debootstraps/Docker images that don't even have kernels installed.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: d30d12c1027e8f2bdb6cac01f8e7cc25d82b0d6a
Component: engine
2014-12-26 14:51:53 -07:00
4ee7be3ff1 upstart: Don't emit "started" event until docker.sock is available
Fixes #6647: Other upstart jobs that depend on docker by specifying
"start on started docker" would often start before the docker daemon was
ready, so they'd fail with "Cannot connect to the Docker daemon" or
"dial unix /var/run/docker.sock: no such file or directory".

This is because "docker -d" doesn't daemonize, it runs in the
foreground, so upstart can't know when the daemon is ready to receive
incoming connections. (Traditionally, a daemon will create all necessary
sockets and then fork to signal that it's ready; according to @tianon
this "isn't possible in Go"[1]. See also [2].)

Presumably this isn't a problem with systemd init with its socket
activation. The SysV init scripts may or may not suffer from this
problem but I have no motivation to fix them.

This commit adds a "post-start" stanza to the upstart configuration
that waits for the socket to be available. Upstart won't emit the
"started" event until the "post-start" script completes.[3]

Note that the system administrator might have specified a different path
for the socket, or a tcp socket instead, by customising
/etc/default/docker. In that case we don't try to figure out what the
new socket is, but at least we don't wait in vain for
/var/run/docker.sock to appear.

If the main script (`docker -d`) fails to start, the `initctl status
$UPSTART_JOB | grep -q "stop/"` line ensures that we don't loop forever.
I stole this idea from Steve Langasek.[4]

If for some reason we *still* end up in an infinite loop --I guess
`docker -d` must have hung-- then at least we'll be able to see the
"Waiting for /var/run/docker.sock" debug output in
/var/log/upstart/docker.log.

I considered using inotifywait instead of sleep, but it isn't worth
the complexity & the extra dependency.

[1] https://github.com/docker/docker/issues/6647#issuecomment-47001613
[2] https://code.google.com/p/go/issues/detail?id=227
[3] http://upstart.ubuntu.com/cookbook/#post-start
[4] https://lists.ubuntu.com/archives/upstart-devel/2013-April/002492.html

Signed-off-by: David Röthlisberger <david@rothlis.net>
Upstream-commit: f42c0a53a38a2a141bec8768d0836a3726de4a83
Component: engine
2014-12-16 21:25:01 +00:00
74d75a87de Refactor completion for docker run and docker create
_docker_run and _docker_create had only one differing line.

This refactoring features:

- direct completion for both commands to the same function
- factor out the common arguments, sort & format them nicely
- compute the argument for _docker_pos_first_nonflag.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 46b104bd3977c4777b0d99ba6c190f37ae780245
Component: engine
2014-12-15 21:08:49 +01:00
fdaf63a14a Merge pull request #9630 from ztombol/9642-fix-mkimage-arch
Fix #9462
Upstream-commit: f58a79e59191dd196a48c65ed945e96b944b8567
Component: engine
2014-12-15 08:13:11 -08:00
725ed0d2e6 Merge pull request #9551 from barnybug/9550-fish-completions
Update fish shell completions.
Upstream-commit: d727e3bea6cb0b833f415f6ba2207ee2f82c1453
Component: engine
2014-12-12 12:55:00 -08:00
67fd26525f Fix a bashism and some minor bugs in nuke-graph-directory.sh
Signed-off-by: Andrew Page <admwiggin@gmail.com>
Upstream-commit: 6b340e391cff68e6fc2c816cf15ffd67feddf029
Component: engine
2014-12-12 11:51:12 -07:00
f42b6ea0bd Fix #9462
Docker-DCO-1.1-Signed-off-by: Zoltan Tombol <zoltan.tombol@gmail.com> (github: ztombol)
Upstream-commit: d04debddd983b3aa48ad38659d2c3debe794d374
Component: engine
2014-12-12 03:25:14 +01:00
2ecd40b772 Merge pull request #9581 from vbatts/vbatts-fix_gh9138
contrib: fix the docker-device-tool
Upstream-commit: ca2ebaeafe96f1e7e05177058a2a3723c979f830
Component: engine
2014-12-09 09:30:37 -08:00
16cbc8473e Update fish shell completions.
Fixes #9550

Signed-off-by: Barnaby Gray <barnaby@pickle.me.uk>
Upstream-commit: 4f6cdb12ab64cf76f5a57cb1d24081882c61def3
Component: engine
2014-12-07 12:40:29 +00:00
996111b8d3 Merge pull request #9272 from SvenDowideit/pr_out_try_out_a_different_phrase_for_icc
Try out a different phrase for --icc
Upstream-commit: 8dfcbf62edb2853176eb3f5cf077dae68f2e85c3
Component: engine
2014-12-05 16:22:51 +10:00
34e4a16b13 Rename the overlay storage driver
so that docker is started with `docker -d -s overlay` instead of `docker -d -s overlayfs`

Signed-off-by: Lénaïc Huard <lhuard@amadeus.com>
Upstream-commit: d680ca5c96484474757fb6f92274f47bf1520631
Component: engine
2014-12-03 13:57:23 +01:00
215ea5a487 fixes as per feedback
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 070a519a9b972ffffda62b82fbc27825d4a6f9b0
Component: engine
2014-12-03 12:46:23 +10:00
7045c111d6 Try out a different phrase for --icc
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 94d67d5d5b300c346e17503810d521c91db89c14
Component: engine
2014-12-03 12:46:23 +10:00
d67f32cdc7 Man: describe --icc option better
Current description is misleading. It make an impression the --icc=false
prevents containers to talk with each other.

Signed-off-by: Michal Minar <miminar@redhat.com>

Docker-DCO-1.1-Signed-off-by: Michal Minar <miminar@redhat.com> (github: SvenDowideit)
Upstream-commit: a61a4a31882335020cfbffc49ffe274847a5c803
Component: engine
2014-12-03 12:46:16 +10:00
506a27fa45 Rename overlayfs to overlay
Since Linux 3.18-rc6, overlayfs has been renamed overlay.

This change was introduced by the following commit in linux.git:
ef94b1864d1ed5be54376404bb23d22ed0481feb ovl: rename filesystem type to "overlay"

Signed-off-by: Lénaïc Huard <lhuard@amadeus.com>
Upstream-commit: c57317893a743720a241ae328d1bdf7bd02b1fea
Component: engine
2014-12-02 10:02:59 +01:00
f439fe36a4 Minor bash completion cleanup
The -n and --networking options were removed because they are
unsupported. 
Bash completion should not reveal the existence of otherwise
undocumented unsupported options.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: eac9f2e5c4fa47b0ef1e064ac2bc62be6f3a3c99
Component: engine
2014-11-25 08:53:13 +01:00
3701f3bcf6 Add missing options to bash completion for the run and create commands
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 2e863e8a3849f6ea34dd281aac6f8a6c700bf029
Component: engine
2014-11-25 08:53:12 +01:00
aba2469af0 Merge pull request #9224 from tianon/custom-debootstrap
Allow for custom debootstrap wrappers like qemu-debootstrap in contrib/mkimage/debootstrap
Upstream-commit: 27127437a6249bbf6f70707ff681992eb00ac47b
Component: engine
2014-11-24 18:11:59 -08:00
fa79f79bdc contrib: fix the docker-device-tool
Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
Upstream-commit: e07daa58d99fc1733603a9fbc5c795818cdc6687
Component: engine
2014-11-24 13:49:09 -05:00