Commit Graph

460 Commits

Author SHA1 Message Date
Lei Jitang 00d3727106 Fix docker build and docker run bash completion
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-03-06 15:35:52 +08:00
Tianon Gravi 91770ec9e4 Adjust contrib/mkimage/debootstrap PATH handling to be more robust
Instead of applying it only for the final `chroot`, this adds a chroot helper function to apply it appropriately for every chroot, including making sure that we find `chroot` in our current host `PATH` in case it's in a strange place.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-02-28 00:11:55 -07:00
Damjan Georgievski a871327135 export a proper debian PATH for the chroot
when running in the chroot, it would be expected to have a Debian-ish environment,
most important the PATH variable. Otherwise the host PATH would be used which can wrong
for Debian, especially if the host is Arch (which doesn't have /bin, /sbin or /usr/sbin).

Signed-off-by: Damjan Georgievski <gdamjan@gmail.com>
2015-02-27 23:56:42 -07:00
Jessie Frazelle 09c4b45712 Merge pull request #10936 from vincentbernat/fix/zsh-completion-update-3
zsh: update zsh completion for docker command
2015-02-23 16:01:59 -08:00
Vincent Bernat 33fa197879 zsh: update zsh completion for docker command
zsh completion is updated with the content of
felixr/docker-zsh-completion.

ef4a3fce0437 Update completion for `wait' as per 1.5.0
ace5aa9c1282 Add completion for `stats'
91f112834865 Update completion for `search' as per 1.5.0
a5e4febe4bf6 Update completion for `save' as per 1.5.0
1cdbdb18a384 Add completion for `rename'
2f004bb724b9 Update completion for `pull' as per 1.5.0
773b88e0885b Update completion for `logs' as per 1.5.0
c57e5d5c4551 Update completion for `load' to favor archive files
9af7d12b487e Update completion for `images` as per 1.5.0
0d59e66aff30 update completion for `exec' to complete on commands
46b6c66760d7 Update completion for `events' as per 1.5.0
307e0bdc4c34 Update completion for `commit' as per 1.5.0
c4b331f38cc4 Update completion for `build' as per 1.5.0

Also added myself in the `MAINTAINERS` file.

Signed-off-by: Vincent Bernat <vincent@bernat.im>
2015-02-24 00:16:30 +01:00
Tianon Gravi acda41e7c3 Merge pull request #10887 from lkinley/master
Patch mkimage-yum.sh to work with Amazon Linux (2014.09)
2015-02-23 11:43:12 -08:00
Jessie Frazelle 55566f2f8f Merge pull request #10418 from bobrik/overlay-kernel-checks
Checking EXT4_FS_SECURITY for overlay
2015-02-19 14:29:17 -08:00
Jessie Frazelle e3fa8b36c2 Merge pull request #10886 from ahmetalpbalkan/win-cli/TestMainHelpWidth-fix
Shorten printed Windows paths on docker help command
2015-02-19 11:33:50 -08:00
Ahmet Alp Balkan 27a73a98b7 Shorten help messages for docker cmd flags
In order to fit printed messages to fit 80 chars,
rewording messages for `-H` and `--tls` flags.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-02-18 22:52:33 -08:00
Lance Kinley c15970eff9 Patch mkimage-yum.sh to work with Amazon Linux (2014.09)
Signed-off-by: Lance Kinley <lkinley@loyaltymethods.com>
2015-02-18 15:17:15 -08:00
Mike Dillon ded88a3170 Add bash completion for `docker rename`
Signed-off-by: Mike Dillon <mike@embody.org>
2015-02-18 11:49:05 -08:00
Harald Albers 01bd90c4ad Fix bash completion for docker run -d
Signed-off-by: Harald Albers <github@albersweb.de>
2015-02-16 19:23:29 +01:00
Jessie Frazelle 4f24b77826 Merge pull request #10762 from coolljt0725/fix_check_config
Fix check-config.sh usage
2015-02-13 10:36:00 -08:00
Manfred Touron 75f1c440dd
mkimage-alpine.sh: Allow to change ARCH from the environment
Signed-off-by: Manfred Touron <m@42.am>
2015-02-13 13:57:04 +01:00
Lei Jitang 82fda400b8 Fix check-config.sh usage
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-02-13 19:52:11 +08:00
Jessie Frazelle 9944f8b954 Merge pull request #10598 from lsm5/core-file-size
no limit on core size
2015-02-09 17:31:40 -08:00
Tianon Gravi 6da5b88bed Merge pull request #10277 from mleone896/rhinit_dead_pid_file
Fixing stale pidfile issue when docker dies abruptly
2015-02-09 12:19:23 -08:00
Lokesh Mandvekar ae9cdbbde7 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>
2015-02-09 19:04:50 +00:00
Mike Leone 05d04843e6 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>
2015-02-09 14:01:12 -05:00
Tianon Gravi 4b681c401c Merge pull request #10443 from jbiel/patch-1
mkimage-arch.sh - don't run docker in interactive mode
2015-02-09 08:45:20 -08:00
Tibor Vass 7b7c8f587b Merge pull request #10623 from jfrazelle/update-fish
Update docker.fish
2015-02-07 12:37:21 -05:00
Coenraad Loubser 2471134ae3 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>
2015-02-06 15:07:42 -08:00
Alexander Morozov 77815c5492 Merge pull request #10300 from hqhq/hq_add_args_for_checkconfig
add args support for check-config.sh
2015-02-06 13:49:09 -08:00
Ian Babrou a6c6d8bb91 Checking EXT4_FS_SECURITY and EXT4_FS_POSIX_ACL for overlay
Signed-off-by: Ian Babrou <ibobrik@gmail.com>
2015-02-05 17:41:13 +03:00
Harald Albers 532513153f Bash completion for docker kill
Signed-off-by: Harald Albers <github@albersweb.de>
2015-02-05 09:42:33 +01:00
Jared Biel 4ff56bbddf 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>
2015-01-29 19:49:28 +00:00
Michael Crosby 17e840a47a Merge pull request #10416 from icecrime/update_fish_completion
Update fish completion for 1.5.0
2015-01-28 10:28:47 -08:00
Arnaud Porterie 9cea20ffc5 Update fish completion for 1.5.0
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-01-28 08:52:06 -08:00
Jessica Frazelle b3dfe1a63a Add completion for stats.
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2015-01-26 11:19:29 -08:00
Jessie Frazelle b1f2fdeee2 Merge pull request #10219 from albers/bash-completion
Bash completion for the daemon flags
2015-01-25 10:25:22 -08:00
Qiang Huang aac6090f2d add args support for check-config.sh
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-01-23 16:36:55 +08:00
Harald Albers 4bb113f24e 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>
2015-01-21 09:15:30 +01:00
Vincent Batts 6bb6586458 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>
2015-01-20 16:00:41 -05:00
Vincent Batts eb76cb2301 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>
2015-01-20 14:22:04 -05:00
Sven Dowideit 18a2c77435 Add build --pull and evenets --filter flags to the docs for 1.4
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-01-15 15:20:48 +13:00
Zoltan Tombol 18c0b41564 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)
2015-01-13 18:10:50 +01:00
Zoltan Tombol 9f59b057be Revise list of installed packages in mkimage-arch.sh
Docker-DCO-1.1-Signed-off-by: Zoltan Tombol <zoltan.tombol@gmail.com> (github: ztombol)
2015-01-13 18:10:50 +01:00
Sven Dowideit 7b2331061e 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)
2015-01-06 17:01:10 +10:00
Evan Carmi 8d1485bd3f Update syntax/vim README with Vundle instructions
Signed-off-by: Evan Carmi <evan@ecarmi.org>
2015-01-05 11:08:22 -08:00
Harald Albers 70161b4d45 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>
2015-01-01 11:21:42 +01:00
Harald Albers 50eb14244d Add missing options to bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
2015-01-01 11:21:42 +01:00
Jessie Frazelle ed7a1fc8f2 Merge pull request #9822 from tianon/01autoremove-kernels
Remove /etc/apt/apt.conf.d/01autoremove-kernels in mkimage/debootstrap
2014-12-30 09:32:04 -08:00
Tianon Gravi 8803174e4f Add CONFIG_POSIX_MQUEUE to check-config.sh
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2014-12-26 14:59:25 -07:00
Tianon Gravi d30d12c102 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>
2014-12-26 14:51:53 -07:00
David Röthlisberger f42c0a53a3 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>
2014-12-16 21:25:01 +00:00
Harald Albers 46b104bd39 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>
2014-12-15 21:08:49 +01:00
Jessie Frazelle f58a79e591 Merge pull request #9630 from ztombol/9642-fix-mkimage-arch
Fix #9462
2014-12-15 08:13:11 -08:00
Tianon Gravi d727e3bea6 Merge pull request #9551 from barnybug/9550-fish-completions
Update fish shell completions.
2014-12-12 12:55:00 -08:00
Tianon Gravi 6b340e391c Fix a bashism and some minor bugs in nuke-graph-directory.sh
Signed-off-by: Andrew Page <admwiggin@gmail.com>
2014-12-12 11:51:12 -07:00
Zoltan Tombol d04debddd9 Fix #9462
Docker-DCO-1.1-Signed-off-by: Zoltan Tombol <zoltan.tombol@gmail.com> (github: ztombol)
2014-12-12 03:25:14 +01:00