Commit Graph

325 Commits

Author SHA1 Message Date
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
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
a5dd68c3f3 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)
Upstream-commit: d561fe6d2d47b2655d8532264ea9ae20e8d20f04
Component: engine
2014-06-14 01:44:55 -06:00
3174a5ef95 Added highlight for the COPY instruction
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net> (github: asbjornenge)
Upstream-commit: cb47ddd968747091fd1b3d408dd36c4c2086e69f
Component: engine
2014-06-12 08:25:09 +02:00
4e8352c6cd Merge pull request #6252 from tianon/update-check-config
Update contrib/check-config.sh to check for CGROUP_FREEZER and to use /proc/mounts
Upstream-commit: 5ff3a28cb4955b5d933c17d0d9c6f8f0b6267d7d
Component: engine
2014-06-10 08:09:34 -06:00
fb8eee397b BZ#1104401
Docker-DCO-1.1-Signed-off-by: Zac Dover <zdover@redhat.com> (github: zdover23)
Upstream-commit: 8f99875d030cb282090d41fbbf8669169fbc9e2f
Component: engine
2014-06-08 14:15:37 +10:00
a8e1ddc35b 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)
Upstream-commit: a59e1949b5ad448814ed2a4de93beca13062e590
Component: engine
2014-06-07 08:43:40 -06:00
4092b1735f Merge pull request #6182 from mheon/fix_manpage_issue
Clarify manpages on docker start
Upstream-commit: 19ef3ff1126be62c6dcb0a24a797a09ad251e5bb
Component: engine
2014-06-05 15:15:50 -07:00
0f498972d9 Merge pull request #6082 from FLGMwt/2342-change-wording-uploading-context
Change 'Uploading context' wording
Upstream-commit: 3704996089822f3df82c4b5441624418b7e3341d
Component: engine
2014-06-03 23:58:20 -07:00
801392d7a3 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)
Upstream-commit: c11fadb282ea7e96eef2280a5e422fd2c94e8c45
Component: engine
2014-06-03 16:57:32 -07:00
02bad2214b Merge pull request #6181 from SvenDowideit/change-out-port-number
IANA allocated Docker port: 2375
Upstream-commit: a2ec8fa1db6e2e77d29f58623f35c2b2ded8e3b7
Component: engine
2014-06-04 01:07:48 +03:00
8e81ab409a 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)
Upstream-commit: d96eb47dee10a059436b4d4cf285db1d70468e26
Component: engine
2014-06-03 17:10:59 -04:00
ddc2df6d84 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)
Upstream-commit: 5febba93babcf8c4b01862e88b6f6e11a1532bc8
Component: engine
2014-06-04 06:54:19 +10:00
6fe0f07752 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)
Upstream-commit: 9fc8028c987ac560ceb3b29eb609d77a82abdacc
Component: engine
2014-06-03 12:55:30 -07:00
8443458d22 Merge pull request #6173 from zdover23/03_Jun_2014
grammar; nothing big (added a "the")
Upstream-commit: 7f55d92837b74180939e2e4714ee66395497836e
Component: engine
2014-06-03 10:48:20 -07:00
5c45317df3 reuse the febootstrap-minimize from rinse
Docker-DCO-1.1-Signed-off-by: Sam Bailey <sam@thatsamguy.com> (github: thatsamguy)
Upstream-commit: d9885abdc4a7e028092fc18715b69075bb7c2f8d
Component: engine
2014-06-03 20:41:32 +10:00
8ce68c5f96 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)
Upstream-commit: 3a77a73a856f50a5954f22c5a76395ca77e43d00
Component: engine
2014-06-03 15:40:22 +10:00
b3698a5dd2 Merge pull request #6122 from mheon/fix_manpage_issue
Added documentation for special case in run command
Upstream-commit: 19e4fddcce70201223420099737dd5f840ec2def
Component: engine
2014-06-02 21:19:43 -07:00
fa1cbab9b2 Merge pull request #6056 from ipbabble/master
Made fixes to man pages to remove some ambiguities and typos 
Upstream-commit: dd93845ad0b6dc0df3d06a6a0521469ae7e4286d
Component: engine
2014-06-02 18:01:22 -07:00
5d504d032a 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
Upstream-commit: 2858180a9a05dad999df0f4d9adc9750b0fb1c66
Component: engine
2014-06-01 17:16:14 -06:00
1b862f62b6 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
Upstream-commit: e471a87f1975a101cf7464c0c2cc48db3b79ec26
Component: engine
2014-05-31 15:44:17 -06:00
d286021357 add mkimage support for mageia using urpmi
Docker-DCO-1.1-Signed-off-by: Sam Bailey <sam@thatsamguy.com> (github: thatsamguy)
Upstream-commit: 05e9574cf34b4615030d23a0f816cc309aa2e949
Component: engine
2014-05-31 21:37:56 +10:00
6fd1c7b5ee 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)
Upstream-commit: ba1c0f4c817e958693cfcef30f1de9991765d5db
Component: engine
2014-05-30 13:55:13 -04:00
62daf025f0 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)
Upstream-commit: a0505edc9a890b3d4cdf5cf1850273c250c3dc41
Component: engine
2014-05-29 11:20:41 +10:00
be791faeb8 Change 'Uploading context' wording
Docker-DCO-1.1-Signed-off-by: Ryan Stelly <ryan.stelly@live.com> (github: FLGMwt)
Upstream-commit: 50417f6abc6d6de7cf32e956d538fd9103c5f9b4
Component: engine
2014-05-28 11:59:29 -05:00
775ca94cb2 Merge pull request #5957 from cgwalters/manpage-typo
docker-run.1: Fix typo 'priviledged'
Upstream-commit: f00c2e5007cb7843c2bcea53e4a86835d3d5a958
Component: engine
2014-05-28 22:43:46 +10:00
ea93628b07 Merge pull request #6044 from zdover23/27May_dockerfile_2
27 may dockerfile 2
Upstream-commit: 58a0e8af8af0989139a3d3c6c3cae1fc30ae24de
Component: engine
2014-05-28 07:58:02 +10:00
20b77a0abf 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
Upstream-commit: a14a88e53dc71b1013d7b629d23d3908d15d57f4
Component: engine
2014-05-27 12:05:48 -06:00
beb63ec76f 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
Upstream-commit: 2cb184ade59ccb578d50f5ff535d1d02e7855563
Component: engine
2014-05-27 11:56:11 -06:00
2d0986f24f fixed spacing, removed extraneous line
Docker-DCO-1.1-Signed-off-by: Zac Dover <zdover@redhat.com> (github: zdover23)
Upstream-commit: 2bbf87504bc9eb6ee9a4694ce4d1d98287bccbc9
Component: engine
2014-05-28 03:32:52 +10:00