Commit Graph

353 Commits

Author SHA1 Message Date
6ae4c9014c update go import path and libcontainer
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: b3ee9ac74e171e00f14027e39278013629e681b8
Component: engine
2014-07-24 22:19:50 +00:00
d94a180ef6 Add "apparmor_parser" warning to check-config.sh
If AppArmor is enabled on the current system, but "apparmor_parser" isn't installed, it causes all kinds of issues.

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 75ba7a9b32bc5904ef1b2751deff94283fce34a5
Component: engine
2014-07-22 10:34:28 -06:00
e2a35d06ac Merge pull request #7090 from philips/add-philips-to-systemd-maintainers
contrib/init/systemd: add philips as MAINTAINER
Upstream-commit: 6dd8eb9520ce63fce34bbd91e7ff625e25aaaef8
Component: engine
2014-07-21 11:41:38 -07:00
3eafec647b Merge pull request #6933 from ztombol/feat-mkimage-arch-expect
Fix expect script in mkimage-arch
Upstream-commit: 7ee8fd5ecfbae8982c4c0d953ed48038c809b91e
Component: engine
2014-07-18 15:47:18 -06:00
554507d5b7 contrib/init/systemd: add philips as MAINTAINER
As requested after #7021 add me as a maintainer alongside the sword
toting @lsm5.

Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
Upstream-commit: 81307680142d5ddd8e80c70c5da8afc799318556
Component: engine
2014-07-17 11:57:16 -07:00
fb15d12a83 zsh: update zsh completion for docker command
zsh completion is updated with the content of
felixr/docker-zsh-completion.

Docker-DCO-1.1-Signed-off-by: Vincent Bernat <vincent@bernat.im> (github: vincentbernat)
Upstream-commit: 67e3f7482f792ced05b6fb659d0d4cb8c9899a32
Component: engine
2014-07-17 19:50:50 +02:00
5d0d56f865 Merge pull request #7021 from lsm5/systemd-maintainer
Add systemd MAINTAINERS file and update docker.service to always use socket activation
Upstream-commit: 07f9d486964f797b46edcbe3c6991e2d0eddc3c1
Component: engine
2014-07-16 23:01:37 -06:00
e8b7012cbc Add "Acquire::GzipIndexes" to contrib/mkimage/debootstrap
This results in a dramatic improvement in the size of individual "apt-get update" layers (on a clean wheezy base, from "29.88 MB" down to "8.273 MB").

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 2e61e8267ea6a668d728fe72406619075330a26a
Component: engine
2014-07-16 14:58:02 -06:00
2ff183b13e Merge pull request #6755 from tianon/bash-completion-for-link-and-bind
Update bash completion for "docker run --link" and "docker run -v" to complete on running containers and the local filesystem respectively
Upstream-commit: 47de2e32698e7adbc3b1292186ce9dcddc15cf41
Component: engine
2014-07-15 00:15:13 -06:00
b8d866ae4d Merge pull request #6885 from tianon/standard-curl-sSL
Upstream-commit: 781a47e3f37f952630d2bdf4936388aaf52f3707
Component: engine
2014-07-14 18:39:31 -07:00
927ac2785f systemd unitfile requires docker.socket
modified:   contrib/init/systemd/docker.service

Docker-DCO-1.1-Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org> (github: lsm5)
Upstream-commit: 0bde827c3f01fc5ae99eb0b93170e75c99cd5d77
Component: engine
2014-07-14 18:08:38 -05:00
e091331e86 use systemd socket-activation by default
modified:   contrib/init/systemd/docker.service
	renamed:    contrib/init/systemd/socket-activation/docker.socket -> contrib/init/systemd/docker.socket
	deleted:    contrib/init/systemd/socket-activation/docker.service

Docker-DCO-1.1-Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org> (github: lsm5)
Upstream-commit: 076ac1d7d212c3a81a401a2fba8b9965bc26df16
Component: engine
2014-07-14 17:41:07 -05:00
5901c9dd26 add systemd MAINTAINERS file
new file:   contrib/init/systemd/MAINTAINERS

Docker-DCO-1.1-Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org> (github: lsm5)
Upstream-commit: 5105981431def23a7424a0c0c09095d815243ea9
Component: engine
2014-07-14 17:38:23 -05:00
2226522e72 Add a conditional to contrib/init/sysvinit-debian/docker for Dash vs Bash support
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 4f0fbb885eb6b561fd6e4ba26b35cb30dd8d9121
Component: engine
2014-07-14 12:34:04 -06:00
a276156a44 Fix expect script in mkimage-arch
Docker-DCO-1.1-Signed-off-by: Zoltan Tombol <zoltan.tombol@gmail.com> (github: ztombol)
Upstream-commit: e72f8161b91e3cdb8a9bc4369ff5f9673a549e2c
Component: engine
2014-07-10 02:09:50 +02:00
b3bd2d5b6c Revert "removed expect from mkimage-arch since it was not working"
This reverts commit 962e1186f9a0a43344e19dcf70bac159f0eafb4e.

Conflicts:
	contrib/mkimage-arch.sh

Docker-DCO-1.1-Signed-off-by: Zoltan Tombol <zoltan.tombol@gmail.com> (github: ztombol)
Upstream-commit: de5f3020d92f14e7ff544d92440c5bf9e012d460
Component: engine
2014-07-10 01:58:15 +02:00
58d9480aa6 Update bash completion to only complete on directories as the argument to "docker build"
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 91769117365207ad3218ee7bea6c472583b3ba2b
Component: engine
2014-07-08 20:26:23 -06:00
2e4164d0ba Update contrib/mkimage/debootstrap to add "sqeeze-lts" to "oldstable" as well
Note that the archive does _not_ have a symlink from oldstable-lts to squeeze-lts, hence the change from using "${suite}" to not using it in here and just using the string "squeeze-lts" directly regardless of whether we're building a "squeeze" image or an "oldstable" image.

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: a6f19955506bd51ae5f6de57ff3ce7976fa7db27
Component: engine
2014-07-07 17:14:31 -06:00
e6a7274d4c Standardize "curl" arguments across the repo to be or include "-sSL"
- https://botbot.me/freenode/docker-dev/msg/17315692/
- https://botbot.me/freenode/docker-dev/msg/17315994/

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 9f61e233c6da72f692190f1f5eb672341253f3e7
Component: engine
2014-07-07 10:35:38 -06:00
9eda104cfe Fix the systemd socket activation socket permissions
Fixes #6836

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 3589f5b9c2d9e5cb6d057713aa8d591295c5f523
Component: engine
2014-07-07 08:09:25 -06:00
5f0247a4bd Fix "Error while reading file" Fish completion
An unbalanced single quote caused Fish to fail to load the completion file with `source: Error while reading file “/etc/fish/completions/docker.fish”`.

Docker-DCO-1.1-Signed-off-by: Andrew France <andrew@avito.co.uk> (github: Odaeus)
Upstream-commit: 6ad5fe86590f757eca754d5bb4a599faec63ae30
Component: engine
2014-07-04 15:07:49 +01:00
c8806a50df I'm going to wish I didn't do this
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: fa29b1f062d25c1a8ca62f02b9cc7533df4c7449
Component: engine
2014-07-03 10:31:56 +10:00
bedc0093af Update cli.md and man pages to match current cli
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: b07f193822d00e40580cd11320ed7e01b629f9d7
Component: engine
2014-07-03 10:22:20 +10:00
a3d12bd8ea Add NOFILE and NPROC ulimit settings to the SysV init script
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: bae79c3e7285c170f97a0f7f331a48fb47f0f40e
Component: engine
2014-07-02 09:38:19 -06:00
7c15233e4a Add NOFILE and NPROC ulimit settings to the OpenRC init script
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 7abe70c0b1018729006fd5d614ada2dc67edb9b2
Component: engine
2014-07-02 09:36:57 -06:00
f6a9c4ccbd Merge branch 'master' of https://github.com/NikolaMandic/docker into NikolaMandic-master
* 'master' of https://github.com/NikolaMandic/docker:
  removed expect from mkimage-arch since it was not working

Conflicts:
	contrib/mkimage-arch.sh

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 75b3b382ca182bf9386bc03726b4edfa41f044e8
Component: engine
2014-06-30 15:52:04 -06:00
fd631db79c Update bash completion for "docker run --link" and "docker run -v" to complete on running containers and the local filesystem respectively
Also, add completion for "docker run -a" ("stdin", "stdout", and "stderr"), "docker run --env-file" (local filesystem), and some other minor code style tweaks.

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 86f06b6deb6e5b9ddb30f781e81cc5b6241e20ae
Component: engine
2014-06-28 23:17:51 -06:00
0e8f1c0764 mkimage: use /var/tmp by default instead of /tmp
Additionally, this can be overridden by setting the TMPDIR variable,
like this was already the case for the generic `mkimage.sh` script.

As explained in #6456, the rationale to use `/var/tmp` instead of `/tmp`
is that `/tmp` is often a small tmpfs filesystem with more restricted
rights.

Docker-DCO-1.1-Signed-off-by: Vincent Bernat <vincent@bernat.im> (github: vincentbernat)
Upstream-commit: 287e604a8f53e569d355b1b6c75f6736f4927281
Component: engine
2014-06-27 14:43:12 +02:00
c8ce01c6ab Merge pull request #6693 from tianon/bash-complete-force-rm
Add bash completion for "docker rm -f" and complete on all containers instead of just stopped containers when "-f" is specified
Upstream-commit: 363b49948ab565d1496d2d0832c06fc54be6eb8f
Component: engine
2014-06-26 15:06:02 -04:00
10316c12ae Merge pull request #6640 from ostezer/commands.go-linguistics-1
docker help -> grammatical correction (pos. adj. apost.)
Upstream-commit: 56a0f49dcc3ef134abc9a05723c961233f6242b0
Component: engine
2014-06-26 11:59:49 -07:00
befb61a0bc Anglicanisms: Grammatical correction (pos. adj. apost.)
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)
Upstream-commit: 714c1bd8ca49c6fc5e7939d6a7abf6a54d56b06a
Component: engine
2014-06-26 08:41:58 +01:00
8c910849c0 Add bash completion for "docker rm -f" and complete on all containers instead of just stopped containers when "-f" is specified
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 5e256799ddd6a297e22756363fc5eb079af0f07e
Component: engine
2014-06-25 22:12:25 -06:00
2e8c60ee30 Update contrib/mkimage/debootstrap to remove /var/lib/apt/lists (trimming at least 40MB and forcing "apt-get update" in dependent images before packages can be installed)
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: c42b5575e5dff5b3a117462e32eda0095528e3b2
Component: engine
2014-06-25 19:07:39 -06:00
5c8857887a Merge pull request #6136 from thatsamguy/add-mageia-mkimage
Add mkimage support for mageia using urpmi
Upstream-commit: 5ef0fe4b53e402928b44a6995e2f5957996a68a7
Component: engine
2014-06-25 17:33:39 -06:00
c959443de4 Merge pull request #6185 from jbeda/debian-init-fix
Make debian init work when called repeatedly in quick succession
Upstream-commit: 02a0c7aca9b58be27dd52ecf24ddbaa5aebf91d5
Component: engine
2014-06-25 17:17:04 -06:00
b873d0d1bc move the man pages to the docs/ dir
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 42be6f2957c945e070079ec773e29b356a9f9452
Component: engine
2014-06-24 13:07:42 +10:00
b864ab9ae3 Merge pull request #6572 from tianon/better-debootstrap-self-documentation
Add a ton of simple improvements to contrib/mkimage/debootstrap, especially comments in the extra files put inside the image
Upstream-commit: 549e34b3d7889d658f7fd8ff2ac8fa3e96453e4c
Component: engine
2014-06-23 11:12:02 -06:00
115fbc39bb Merge pull request #6426 from tianon/fix-import-man-error
Fix contrib/man/md/docker-import.1.md warning ("macro `tar.gz,' not defined")
Upstream-commit: 875b0698e8d45bf1c6cadbc56b7fd208c303ca5d
Component: engine
2014-06-23 11:48:35 +10:00
414df5ef2f Add a ton of simple improvements to contrib/mkimage/debootstrap, especially comments in the extra files put inside the image
This also adds support for squeeze-lts. :)

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: a206186f8427c74fbf9625e4140bf84461a67eec
Component: engine
2014-06-20 10:11:26 -06:00
d94d81180e Merge pull request #6547 from tianon/update-bash-completion-for-pushing-tags
Update bash-completion to reflect ability to push single tags
Upstream-commit: 2eac1c4bc5e3b77a99d94811cc481bc27b648ee0
Component: engine
2014-06-19 12:40:31 -06:00
a9640bbe8b Update bash-completion to reflect ability to push single tags
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: bdf4b74b52cb313a869a0b15d1eb315a79e1cd52
Component: engine
2014-06-19 10:11:32 -06:00
5768bbc295 Fix mode on contrib/completion/zsh/_docker (-x)
ZSH completion scripts aren't supposed to be executable - they're sourced by ZSH and aren't run directly.

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: f619243099a384a499fb92ed1065cb4cb87ce3ea
Component: engine
2014-06-18 22:59:20 -06:00
6aadc112a6 Merge pull request #6518 from vieux/finish_remove_insert
cleanup all mentions of insert
Upstream-commit: 421707f638211807985d37d9baa5d941304a7487
Component: engine
2014-06-18 20:06:29 -04:00
350844d68d Merge pull request #6424 from tianon/fix-minor-md2man-bug
Fix minor bug in contrib/man/md/md2man-all.sh causing the creation of contrib/man/manREADME
Upstream-commit: a790d3309cc37760bce4f580b79ce4d802ce7745
Component: engine
2014-06-19 09:57:23 +10:00
b42966840e cleanup all mentions of insert
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 3e2a9f667fbfd2b526b5bab4f8983f8c44685e87
Component: engine
2014-06-18 23:13:54 +00:00
ac125f4405 removed expect from mkimage-arch since it was not working
Docker-DCO-1.1-Signed-off-by: NikolaMandic <mn080202@gmail.com> (github: NikolaMandic)
Upstream-commit: 962e1186f9a0a43344e19dcf70bac159f0eafb4e
Component: engine
2014-06-18 19:25:51 +02:00
10692d0667 Merge pull request #6306 from mheon/fix_manpage_issue
Update documentation for docker pull
Upstream-commit: d5f7b4df1b96a49fe1523daec48a01f2c1cafa3e
Component: engine
2014-06-17 09:13:29 +10:00
0bc0d4e474 Updated docker pull manpage to reflect ability to specify URL of registry.
Also fixed a typo in same file.

Docker-DCO-1.1-Signed-off-by: Matthew Heon <mheon@redhat.com> (github: mheon)
Upstream-commit: aab9078ff976c1ee7413a6cfc1b9d6424c3581fd
Component: engine
2014-06-16 15:13:47 -04:00
b13aa65bb4 Fix contrib/man/md/docker-import.1.md warning ("macro `tar.gz,' not defined")
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: e02cf69789d12e8d44c8168e1515f43f39be6461
Component: engine
2014-06-14 01:59:52 -06:00
cb48ac70c7 Fix several man page spelling errors
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: cb92c4714460aff9fc5c06c2daa3fd1474d77ef5
Component: engine
2014-06-14 01:49:51 -06:00