Tianon Gravi
7ee8fd5ecf
Merge pull request #6933 from ztombol/feat-mkimage-arch-expect
...
Fix expect script in mkimage-arch
2014-07-18 15:47:18 -06:00
Brandon Philips
8130768014
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)
2014-07-17 11:57:16 -07:00
Vincent Bernat
67e3f7482f
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)
2014-07-17 19:50:50 +02:00
Tianon Gravi
07f9d48696
Merge pull request #7021 from lsm5/systemd-maintainer
...
Add systemd MAINTAINERS file and update docker.service to always use socket activation
2014-07-16 23:01:37 -06:00
Tianon Gravi
2e61e8267e
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)
2014-07-16 14:58:02 -06:00
Tianon Gravi
47de2e3269
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
2014-07-15 00:15:13 -06:00
Solomon Hykes
781a47e3f3
Merge pull request #6885 from tianon/standard-curl-sSL
2014-07-14 18:39:31 -07:00
Lokesh Mandvekar
0bde827c3f
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)
2014-07-14 18:08:38 -05:00
Lokesh Mandvekar
076ac1d7d2
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)
2014-07-14 17:41:07 -05:00
Lokesh Mandvekar
5105981431
add systemd MAINTAINERS file
...
new file: contrib/init/systemd/MAINTAINERS
Docker-DCO-1.1-Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org> (github: lsm5)
2014-07-14 17:38:23 -05:00
Tianon Gravi
4f0fbb885e
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)
2014-07-14 12:34:04 -06:00
mschurenko
56fa079906
add --releasever=/ to mkimage-yum.sh
...
I didn't realize the commit required a Docker-DCO so it failed the travis-ci build. So I removed the commit from my forked repo. Now it looks like there is a pull request with no commit. So here it is again:
Needed to add '--releasever=/' flag to run yum groupinstall on Centos7 (didn't try on anything else). This snippet from yum man page explains why:
```
Note: You may also want to use the option --releasever=/ when creating the installroot as otherwise the $releasever value is taken from the rpmdb within the installroot (and thus. will be empty, before creation).
```
Docker-DCO-1.1-Signed-off-by: Matt Schurenko <matt.schurenko@gmail.com> (github: mschurenko)
2014-07-12 12:15:42 -07:00
Zoltan Tombol
e72f8161b9
Fix expect script in mkimage-arch
...
Docker-DCO-1.1-Signed-off-by: Zoltan Tombol <zoltan.tombol@gmail.com> (github: ztombol)
2014-07-10 02:09:50 +02:00
Zoltan Tombol
de5f3020d9
Revert "removed expect from mkimage-arch since it was not working"
...
This reverts commit 962e1186f9
.
Conflicts:
contrib/mkimage-arch.sh
Docker-DCO-1.1-Signed-off-by: Zoltan Tombol <zoltan.tombol@gmail.com> (github: ztombol)
2014-07-10 01:58:15 +02:00
Tianon Gravi
9176911736
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)
2014-07-08 20:26:23 -06:00
Tianon Gravi
a6f1995550
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)
2014-07-07 17:14:31 -06:00
Tianon Gravi
9f61e233c6
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)
2014-07-07 10:35:38 -06:00
Tianon Gravi
3589f5b9c2
Fix the systemd socket activation socket permissions
...
Fixes #6836
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-07-07 08:09:25 -06:00
Andrew France
6ad5fe8659
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)
2014-07-04 15:07:49 +01:00
SvenDowideit
fa29b1f062
I'm going to wish I didn't do this
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-07-03 10:31:56 +10:00
SvenDowideit
b07f193822
Update cli.md and man pages to match current cli
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-07-03 10:22:20 +10:00
Tianon Gravi
bae79c3e72
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)
2014-07-02 09:38:19 -06:00
Tianon Gravi
7abe70c0b1
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)
2014-07-02 09:36:57 -06:00
Tianon Gravi
75b3b382ca
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)
2014-06-30 15:52:04 -06:00
Tianon Gravi
86f06b6deb
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)
2014-06-28 23:17:51 -06:00
Vincent Bernat
287e604a8f
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)
2014-06-27 14:43:12 +02:00
Tibor Vass
363b49948a
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
2014-06-26 15:06:02 -04:00
Victor Vieux
56a0f49dcc
Merge pull request #6640 from ostezer/commands.go-linguistics-1
...
docker help -> grammatical correction (pos. adj. apost.)
2014-06-26 11:59:49 -07:00
O.S. Tezer
714c1bd8ca
Anglicanisms: Grammatical correction (pos. adj. apost.)
...
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)
2014-06-26 08:41:58 +01:00
Tianon Gravi
5e256799dd
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)
2014-06-25 22:12:25 -06:00
Tianon Gravi
c42b5575e5
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)
2014-06-25 19:07:39 -06:00
Tianon Gravi
5ef0fe4b53
Merge pull request #6136 from thatsamguy/add-mageia-mkimage
...
Add mkimage support for mageia using urpmi
2014-06-25 17:33:39 -06:00
Tianon Gravi
02a0c7aca9
Merge pull request #6185 from jbeda/debian-init-fix
...
Make debian init work when called repeatedly in quick succession
2014-06-25 17:17:04 -06:00
SvenDowideit
42be6f2957
move the man pages to the docs/ dir
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-06-24 13:07:42 +10:00
Tianon Gravi
549e34b3d7
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
2014-06-23 11:12:02 -06:00
Sven Dowideit
875b0698e8
Merge pull request #6426 from tianon/fix-import-man-error
...
Fix contrib/man/md/docker-import.1.md warning ("macro `tar.gz,' not defined")
2014-06-23 11:48:35 +10:00
Tianon Gravi
a206186f84
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)
2014-06-20 10:11:26 -06:00
Tianon Gravi
2eac1c4bc5
Merge pull request #6547 from tianon/update-bash-completion-for-pushing-tags
...
Update bash-completion to reflect ability to push single tags
2014-06-19 12:40:31 -06:00
Tianon Gravi
bdf4b74b52
Update bash-completion to reflect ability to push single tags
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-06-19 10:11:32 -06:00
Tianon Gravi
f619243099
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)
2014-06-18 22:59:20 -06:00
Tibor Vass
421707f638
Merge pull request #6518 from vieux/finish_remove_insert
...
cleanup all mentions of insert
2014-06-18 20:06:29 -04:00
Sven Dowideit
a790d3309c
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
2014-06-19 09:57:23 +10:00
Victor Vieux
3e2a9f667f
cleanup all mentions of insert
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-06-18 23:13:54 +00:00
NikolaMandic
962e1186f9
removed expect from mkimage-arch since it was not working
...
Docker-DCO-1.1-Signed-off-by: NikolaMandic <mn080202@gmail.com> (github: NikolaMandic)
2014-06-18 19:25:51 +02:00
Sven Dowideit
d5f7b4df1b
Merge pull request #6306 from mheon/fix_manpage_issue
...
Update documentation for docker pull
2014-06-17 09:13:29 +10:00
Matthew Heon
aab9078ff9
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)
2014-06-16 15:13:47 -04:00
Tianon Gravi
e02cf69789
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)
2014-06-14 01:59:52 -06:00
Tianon Gravi
cb92c47144
Fix several man page spelling errors
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-06-14 01:49:51 -06:00
Tianon Gravi
d561fe6d2d
Fix minor bug in contrib/man/md/md2man-all.sh causing the creation of contrib/man/manREADME
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-06-14 01:44:55 -06:00
Asbjørn Enge
cb47ddd968
Added highlight for the COPY instruction
...
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net> (github: asbjornenge)
2014-06-12 08:25:09 +02:00
Tianon Gravi
5ff3a28cb4
Merge pull request #6252 from tianon/update-check-config
...
Update contrib/check-config.sh to check for CGROUP_FREEZER and to use /proc/mounts
2014-06-10 08:09:34 -06:00
Zac Dover
8f99875d03
BZ#1104401
...
Docker-DCO-1.1-Signed-off-by: Zac Dover <zdover@redhat.com> (github: zdover23)
2014-06-08 14:15:37 +10:00
Tianon Gravi
a59e1949b5
Update contrib/check-config.sh to check for CGROUP_FREEZER (which is newly required), and to use /proc/mounts for checking if we have a cgroup hierarchy instead of using /proc/$$/mountinfo (which on systemd might not list the cgroup hierarchy)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-06-07 08:43:40 -06:00
James Turnbull
19ef3ff112
Merge pull request #6182 from mheon/fix_manpage_issue
...
Clarify manpages on docker start
2014-06-05 15:15:50 -07:00
Victor Vieux
3704996089
Merge pull request #6082 from FLGMwt/2342-change-wording-uploading-context
...
Change 'Uploading context' wording
2014-06-03 23:58:20 -07:00
Joe Beda
c11fadb282
Make debian init work when called quickly.
...
We use the start-stop-daemon pid creation mechanism in addition the intrinsic built into docker. This means the pid file is guaranteed to be written out by the time the script exits.
See #6184 .
Docker-DCO-1.1-Signed-off-by: Joe Beda <joe.github@bedafamily.com> (github: jbeda)
2014-06-03 16:57:32 -07:00
unclejack
a2ec8fa1db
Merge pull request #6181 from SvenDowideit/change-out-port-number
...
IANA allocated Docker port: 2375
2014-06-04 01:07:48 +03:00
Matthew Heon
d96eb47dee
Added note in manpages to clarify effect of docker start on started container
...
When run on a container that is already running, docker always succeeds.
This was an intentional change in v0.10; it previously caused an error.
This commit clarifies the man pages to indicate this is intended behavior.
Docker-DCO-1.1-Signed-off-by: Matthew Heon <mheon@redhat.com> (github: mheon)
2014-06-03 17:10:59 -04:00
SvenDowideit
5febba93ba
IANA allocated Docker port: 2375
...
2375/2376 are assigned:
http://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xhtml?search=docker
For #1440
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-06-04 06:54:19 +10:00
James Turnbull
9fc8028c98
Changed all references from Trusted Builds to Automated Builds
...
* Updated docker images output
* Deprecated docker images -t/--trusted option and replace with --automated
* Changed *trusted variables to *automated
* Changed added support for is_automated alongside deprecated is_trusted
* Updated man pages, docs and completion
* Updated API documentation
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
2014-06-03 12:55:30 -07:00
Sven Dowideit
7f55d92837
Merge pull request #6173 from zdover23/03_Jun_2014
...
grammar; nothing big (added a "the")
2014-06-03 10:48:20 -07:00
Sam Bailey
d9885abdc4
reuse the febootstrap-minimize from rinse
...
Docker-DCO-1.1-Signed-off-by: Sam Bailey <sam@thatsamguy.com> (github: thatsamguy)
2014-06-03 20:41:32 +10:00
Zac Dover
3a77a73a85
grammar; nothing big
...
Docker-DCO-1.1-Signed-off-by: Zac Dover <zdover@redhat.com> (github: zdover23)
Added another "The"
Docker-DCO-1.1-Signed-off-by: Zac Dover <zdover@redhat.com> (github: zdover23)
2014-06-03 15:40:22 +10:00
James Turnbull
19e4fddcce
Merge pull request #6122 from mheon/fix_manpage_issue
...
Added documentation for special case in run command
2014-06-02 21:19:43 -07:00
Sven Dowideit
dd93845ad0
Merge pull request #6056 from ipbabble/master
...
Made fixes to man pages to remove some ambiguities and typos
2014-06-02 18:01:22 -07:00
William Henry
2858180a9a
Changed the term rename to alias etc.
...
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com> (github: ipbabble)
Changes to be committed:
modified: contrib/man/md/docker-tag.1.md
2014-06-01 17:16:14 -06:00
William Henry
e471a87f19
Fixed some typos and other issues from ostezer 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.1.md
modified: contrib/man/md/docker-run.1.md
modified: contrib/man/md/docker-tag.1.md
2014-05-31 15:44:17 -06:00
Sam Bailey
05e9574cf3
add mkimage support for mageia using urpmi
...
Docker-DCO-1.1-Signed-off-by: Sam Bailey <sam@thatsamguy.com> (github: thatsamguy)
2014-05-31 21:37:56 +10:00
Matt Heon
ba1c0f4c81
Documented special case of container memory limits in manpages
...
If a container is started with a memory limit of 0, no memory limit is applied.
To prevent this from causing confusion, make interaction explicit in docs.
Docker-DCO-1.1-Signed-off-by: Matthew Heon <mheon@redhat.com> (github: mheon)
2014-05-30 13:55:13 -04:00
Robin Speekenbrink
a0505edc9a
updated documentation for mentioning images vs containers
...
Docker-DCO-1.1-Signed-off-by: Robin Speekenbrink <robin@kingsquare.nl> (github: fruitl00p)
rebased by
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-05-29 11:20:41 +10:00
FLGMwt
50417f6abc
Change 'Uploading context' wording
...
Docker-DCO-1.1-Signed-off-by: Ryan Stelly <ryan.stelly@live.com> (github: FLGMwt)
2014-05-28 11:59:29 -05:00
Sven Dowideit
f00c2e5007
Merge pull request #5957 from cgwalters/manpage-typo
...
docker-run.1: Fix typo 'priviledged'
2014-05-28 22:43:46 +10:00
Sven Dowideit
58a0e8af8a
Merge pull request #6044 from zdover23/27May_dockerfile_2
...
27 may dockerfile 2
2014-05-28 07:58:02 +10:00
William Henry
a14a88e53d
Fixed some typos in docker-build.
...
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-05-27 12:05:48 -06:00
William Henry
2cb184ade5
Some changes to semantics around tagging, detaching.
...
Tried to clarify some of the semantics regarding --tag and renaming etc.
Added some text clarifying how to detach from a running containers.
Fixed a bug that reference /varlog instead of /dev/log.
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com> (github: ipbabble)
Changes to be committed:
modified: docker-attach.1.md
modified: docker-build.1.md
modified: docker-run.1.md
modified: docker-tag.1.md
2014-05-27 11:56:11 -06:00
Zac Dover
2bbf87504b
fixed spacing, removed extraneous line
...
Docker-DCO-1.1-Signed-off-by: Zac Dover <zdover@redhat.com> (github: zdover23)
2014-05-28 03:32:52 +10:00
Tianon Gravi
b2cf28306d
Merge pull request #6029 from jeffreybolle/master
...
Update upstart script to ensure networking is up before starting docker
2014-05-27 11:23:54 -06:00
Sven Dowideit
4a2ca56ea0
Merge pull request #6039 from zdover23/26May_dockerfile
...
Dockerfile.5.md stub
2014-05-26 16:46:12 +10:00
Zac Dover
41a913b390
Dockerfile.5.md stub
...
Properly formatted DCO:
Docker-DCO-1.1-Signed-off-by: Zac Dover <zdover@redhat.com> (github: zdover23)
Docker-DCO-1.1-Signed-off-by: Zac Dover <zdover@redhat.com> (github: )
2014-05-26 15:57:20 +10:00
Tianon Gravi
dd3319636d
Fix embarrassing debootstrap typo :)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-05-25 21:59:43 -06:00
Jeffrey Bolle
c52889db27
Ensure networking is up before starting docker
...
This resolves a problem that I have been having where docker starts before networking is up. See issue #5944 for more details.
Docker-DCO-1.1-Signed-off-by: Jeffrey Bolle <jeffreybolle@gmail.com> (github: jeffreybolle)
2014-05-24 19:03:11 +01:00
Tianon Gravi
0c0ffb7773
Add more required cgroup subsystems to check-config.sh (specifically, SCHED for cpu and CPUACCT for cpuacct)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-05-23 10:27:09 -06:00
Tianon Gravi
8006f6583d
Merge pull request #5967 from tianon/consolidated-mkimage
...
Add new consolidated mkimage scripts
2014-05-22 11:27:08 -06:00
Tianon Gravi
51f707cf9d
Add deprecation warnings to the mkimage scripts that are have consolidated mkimage implementations
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-05-21 09:58:11 -06:00
Tianon Gravi
7e42505083
Add new consolidated mkimage scripts
...
These new scripts are streamlined such that, for example, "contrib/mkimage/debootstrap" is _only_ responsible for filling a directory with the results of running debootstrap, and it can accept any arbitrary arguments.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-05-21 09:47:36 -06:00
Brian Goff
6d9e64b27b
Fixes some docs issues with using single-dash arguments where they should be double
...
I found a bunch of issues where we have "-<opt>" instead of "--<opt>".
Also a couple of other issues, like "-notrunc", which is now "--no-trunc"
Fixes #5963
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
2014-05-21 09:35:22 -04:00
Colin Walters
cfe7211a22
man/docker-run.1: Fix typo 'priviledged', add missing closing brackets
...
Docker-DCO-1.1-Signed-off-by: Colin Walters <walters@verbum.org> (github: cgwalters)
2014-05-21 07:00:38 -04:00
Tianon Gravi
47aa9f5a0e
Merge pull request #5844 from stpierre/init-script-wait-for-pidfile
...
Wait for pidfile to exist when starting with RedHat init script
2014-05-20 10:25:03 -06:00
Dan Walsh
2e0d47e5c4
Add description of --volume read-only/read-write to docker-run man page.
...
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
2014-05-16 15:06:34 -04:00
unclejack
ba0c829291
contrib/init/upstart: start on local-filesystems
...
This changes the upstart init script to start on `local-filesystems`.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-05-16 19:12:59 +03:00
Chris St. Pierre
1ee423bd5d
added timeout when waiting for docker pidfile
...
Docker-DCO-1.1-Signed-off-by: Chris St. Pierre <chris.a.st.pierre@gmail.com> (github: stpierre)
2014-05-16 09:36:54 -04:00
Chris St. Pierre
a598dba134
Wait for pidfile to exist when starting with Redhat init script
...
Fixes #5359
Docker-DCO-1.1-Signed-off-by: Chris St. Pierre <chris.a.st.pierre@gmail.com> (github: stpierre)
2014-05-16 09:08:59 -04:00
Sven Dowideit
8da44c9b2a
Merge pull request #5732 from SvenDowideit/pr_out_the_last_remaining_raw_github_com_url_s
...
the last remaining raw.github.com URL's
2014-05-16 10:01:14 +10:00
Tianon Gravi
8904dfe082
Merge pull request #5657 from tianon/sysvinit-should-start
...
Add "Should-Start" cgroupfs-mount and cgroup-lite to sysvinit-debian init script
2014-05-14 16:05:32 -06:00
Dan Keder
653328c6ce
Fix a typo in contrib/man/md/docker.1.md
2014-05-13 11:17:42 +02:00
Sven Dowideit
c1108f5d60
the last remaining raw.github.com URL's
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-05-12 14:50:41 +10:00
Tianon Gravi
36d913078b
Add "Should-Start" cgroupfs-mount and cgroup-lite to sysvinit-debian init script
...
It's fine to list both here because "Should-Start" is a loose binding (ie, if the listed service exists, it'll be started first, but otherwise, this one will start without it).
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-05-07 09:46:41 -06:00
Jonathan McCrohan
9e64a4d862
mkimage-debootstrap: set ubuntuLatestLTS as Trusty
...
Ubuntu 14.04 LTS (Trusty Tahr) was released on Thu, 17 Apr 2014; Update
ubuntuLatestLTS accordingly.
Docker-DCO-1.1-Signed-off-by: Jonathan McCrohan <jmccrohan@gmail.com> (github: jmccrohan)
2014-05-07 08:26:24 +01:00
Dan Walsh
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
Tianon Gravi
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