Commit Graph

2849 Commits

Author SHA1 Message Date
5d2fe159f4 Docker run -e FOO should erase FOO if FOO isn't set in client env
See #10141 for more info, but the main point of this is to make sure
that if you do "docker run -e FOO ..." that FOO from the current env
is passed into the container.  This means that if there's a value, its
set.  But it also means that if FOO isn't set then it should be unset in
the container too - even if it has to remove it from the env.  So,
   unset HOSTNAME
   docker run -e HOSTNAME busybox env
should _NOT_ show HOSTNAME in the list at all

Closes #10141

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 9ab73260f8e4662e7321b257c636928892f023cf
Component: engine
2015-01-19 08:00:32 -08:00
ce31e7fa97 Merge pull request #9937 from SvenDowideit/add-https-test
Add a containerised test for the https cert doc
Upstream-commit: 22437eb9609cdbf4ed221d07557e206bc0066e18
Component: engine
2015-01-15 17:53:40 -08:00
1964402004 Merge pull request #10104 from thaJeztah/docs-add-note-to-cli-export
Docs: Add note that export doesn't include volume data.
Upstream-commit: 9725433988b7d83bcbbf2af1976995efc0aadd4e
Component: engine
2015-01-16 12:15:46 +13:00
8333dd3c16 Merge pull request #9840 from nhsiehgit/searchapidocs
updated search api docs to include pagination changes
Upstream-commit: 25a8602cbabaec44d5646923b2ae1564a3ba7f8b
Component: engine
2015-01-15 17:40:04 -05:00
3b76395570 changed format of cli note
Signed-off-by: Nathan Hsieh <hsieh.nathan@gmail.com>
Upstream-commit: c252d5f3f4fc98062fbda6335a04cca2602a4223
Component: engine
2015-01-15 08:39:16 -08:00
3abcc54bab Docs: Add note that export doesn't include volume data.
The documentation on `docker export` doesn't mention that
data in volumes is not included in the export.

This adds a note that volumes are not part of the export
and refers to the "Backup, restore, or migrate data volumes"
to give the user some pointers.

Relates to https://github.com/docker/docker/issues/10095

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 67588d0ec4d73a8f2efb150d555c38b7ebfca7f6
Component: engine
2015-01-15 16:54:45 +01:00
c72b573e2b added note to man & cli docs on search limit
Signed-off-by: Nathan Hsieh <hsieh.nathan@gmail.com>
Upstream-commit: 92ef40a8260e5e8dcd5579a6f9d942c4e68702ed
Component: engine
2015-01-14 18:03:09 -08:00
2a3eb3ae39 Merge pull request #10093 from crosbymichael/readonly-containers
Add --read-only for read only container rootfs
Upstream-commit: 95c0f07966035ce79c6b51a2eee8c60c59fb523c
Component: engine
2015-01-14 15:56:51 -08:00
2ef8faf6e3 Add --readonly for read only container rootfs
Add a --readonly flag to allow the container's root filesystem to be
mounted as readonly.  This can be used in combination with volumes to
force a container's process to only write to locations that will be
persisted.  This is useful in many cases where the admin controls where
they would like developers to write files and error on any other
locations.

Closes #7923
Closes #8752

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 409407091a7282d0c4086b71e86397e2d089ba13
Component: engine
2015-01-14 15:41:31 -08:00
bafbcb6583 Add a note that remote and Boot2Docker users should not type sudo
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: d5df948829bfd6e12dc2c0ca3228b583386b6e87
Component: engine
2015-01-13 21:40:14 -05:00
701611541f Merge pull request #10076 from MalteJ/ipv6-docs
IPv6 docs: The ARP cache is called NDP neighbor cache in IPv6
Upstream-commit: c9dab702bed3ffd6335a61df74b73e89b44fcbf9
Component: engine
2015-01-13 17:05:28 -08:00
863904b2ee Merge pull request #10080 from crosbymichael/pid-ns
Add --pid flag for staying in the host's pid namespace
Upstream-commit: 47e3da848ffbe88d0188ae6cfc09d6e1668bc293
Component: engine
2015-01-13 17:00:18 -08:00
b769333838 Merge pull request #10036 from HuKeping/docs-next
docs: update docker inspect part of docs
Upstream-commit: 8ac075b846609f73ad8aa29d6e9dbb6cd2392293
Component: engine
2015-01-13 16:43:42 -08:00
458ae31cfd Allow the container to share the PID namespace with the host
We want to be able to use container without the PID namespace.  We basically
want containers that can manage the host os, which I call Super Privileged
Containers.  We eventually would like to get to the point where the only
namespace we use is the MNT namespace to bring the Apps userspace with it.

By eliminating the PID namespace we can get better communication between the
host and the clients and potentially tools like strace and gdb become easier
to use.  We also see tools like libvirtd running within a container telling
systemd to place a VM in a particular cgroup, we need to have communications of the PID.

I don't see us needing to share PID namespaces between containers, since this
is really what docker exec does.

So currently I see us just needing docker run --pid=host

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: 23feaaa240853c0e7f9817f8c2d272dd1c93ac3f
Component: engine
2015-01-13 16:35:17 -08:00
dbd5499197 Add reference to rename endpoint in correct version & add to new
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: ee78e3f28459b655bf7df71eb4e2e22a04a8948d
Component: engine
2015-01-13 15:22:04 -08:00
7189e0cf12 IPv6 docs: The ARP cache is called NDP neighbor cache in IPv6
Signed-off-by: Malte Janduda <mail@janduda.net>
Upstream-commit: c03e15c9daddac86a4fdc7e6660f338b1b733f22
Component: engine
2015-01-14 00:20:17 +01:00
eacdfc7d44 rename a existing container
Closes #3036

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: 21a809d9ae0ef8392f37c9262dca93ff31966e22
Component: engine
2015-01-13 03:27:17 +00:00
8015360eaf update copyrights to 2015
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: e5869b2b0bdf85d15813c714565fd49943c3d754
Component: engine
2015-01-12 22:47:36 +00:00
d352fd4587 Merge pull request #9962 from andi5/fix-doc-cmdline-port
Fix order of pause and port in command line documentation.
Upstream-commit: 43a75f5b9332f4b3c002f79ea342b00127811b5b
Component: engine
2015-01-12 13:22:51 -08:00
b37502e6c0 Merge pull request #10019 from jfrazelle/9954-text-plain-content-type
Use "text/plain" content-type
Upstream-commit: 9215c3901eb8499f7bf86cf23512a451a951b449
Component: engine
2015-01-12 12:50:35 -08:00
41d533f2c1 Merge pull request #9953 from evverx/patch-1
Update Ubuntu image tag to 14.04
Upstream-commit: a52c3a74f8806e49915a4d5134ea14151519a954
Component: engine
2015-01-12 12:07:12 -08:00
dd12a29c6a Merge pull request #10006 from jfrazelle/docs-release-fixes
Update docs release script so we can have autodeploys
Upstream-commit: 1781fed7305dcba5e69df448d5df0438fec7e366
Component: engine
2015-01-12 10:03:33 -08:00
8ffe7cacc7 Update docs release script so we can have autodeploys
to docs.master.dockerproject.com.

- Make the invaidation profile the bucket variable, not hard coded.
- Add no cache variable for settings cache to "no-cache"

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: a6a748b9a0ce459fe1e250fdc5d107363315aeca
Component: engine
2015-01-12 09:56:43 -08:00
15511ad11d docs: update docker inspect part of docs
The docker inspect part of docs is quit different with what it
really be.

Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: 8d414fd434c55f1d9ac9387e17dd16608fca1bfd
Component: engine
2015-01-12 13:20:27 +08:00
1f71c08b6d Properly handle containers which pre-date the resolv.conf update feature
This fixes the container start issue for containers which were started
on a daemon prior to the resolv.conf updater PR. The update code will
now safely ignore these containers (given they don't have a sha256 hash
to compare against) and will not attempt to update the resolv.conf
through their lifetime.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: 30eff2720a110f3ece0e429ef1897a254f0d9e71
Component: engine
2015-01-10 00:48:41 -05:00
aaad06b5f5 Change some instances of this mistake in the documentation as well.
Signed-off-by: Jean-Paul Calderone <exarkun@twistedmatrix.com>

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@linux.com> (github: jfrazelle)
Upstream-commit: 807f486f874d87adb423d486944f5dc59842f1eb
Component: engine
2015-01-09 20:31:38 -08:00
c2ad023d0c Merge pull request #9948 from tangicolin/improve-doc-networking
Improve networking documentation with default mac address range
Upstream-commit: ef2d6dda0f25d29e19b7cc6afeee57c2d6971660
Component: engine
2015-01-09 07:44:49 -05:00
bf959c1542 Merge pull request #9964 from duglin/MoveBuildDocs
Move docs on the build API out of 'misc' and under 'Images' section
Upstream-commit: 90149b11dbc1d2f8adb8c65d66b9209c9901db14
Component: engine
2015-01-09 07:17:53 -05:00
9b3e85e5fb Merge pull request #9974 from lasote/master
Added c++ client library for REST API
Upstream-commit: 2675f1a153140f99b1c9758d14ccccd6d08b637e
Component: engine
2015-01-09 07:16:38 -05:00
0ed50630d4 Merge pull request #9963 from duglin/FixDocV1.17
Make API docs v1.17 visible
Upstream-commit: cd4d3b8d36fa6c21d6293a7e2d59165d843189b7
Component: engine
2015-01-09 07:15:47 -05:00
146962fdd3 Adding IPv6 network support to docker
Signed-off-by: Malte Janduda <mail@janduda.net>
Upstream-commit: 813ff7f19d6a097f39dae363d8dd81b70eee515a
Component: engine
2015-01-09 00:13:09 +01:00
093790b35a Fix order of pause and port in command line documentation.
Signed-off-by: Andreas Köhler <andi5.py@gmx.net>
Upstream-commit: 3807d96d379cb5b08ad3dae3d624fb3d24306b77
Component: engine
2015-01-08 23:21:54 +01:00
52226000bd Merge pull request #9918 from SvenDowideit/state-centos-kernel-restrictions-clearly
Centos project does not support custom kernels
Upstream-commit: 273472a5c21075fa6fd223e30ddd6451fa180044
Component: engine
2015-01-08 14:19:24 -08:00
8404235dd8 Merge pull request #9648 from estesp/9202-update-resolvconf
Update container resolv.conf when host network changes /etc/resolv.conf
Upstream-commit: 92af1f014520b4f75a6220478b01ed6a02ca5bfb
Component: engine
2015-01-08 14:06:55 -08:00
ae1406d798 Update container resolv.conf when host network changes /etc/resolv.conf
Only modifies non-running containers resolv.conf bind mount, and only if
the container has an unmodified resolv.conf compared to its contents at
container start time (so we don't overwrite manual/automated changes
within the container runtime). For containers which are running when
the host resolv.conf changes, the update will only be applied to the
container version of resolv.conf when the container is "bounced" down
and back up (e.g. stop/start or restart)

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: 63a7ccdd2372d87f56f7a86da07c72ea51332c2a
Component: engine
2015-01-08 14:15:13 -05:00
14432954b7 Merge pull request #9898 from SvenDowideit/document-https-proxy-daemon-setup
Add @ArikaChen's tip for using HTTPS proxy to pull
Upstream-commit: b168ef274aa6676d2fa4da071b06def22f3824be
Component: engine
2015-01-08 10:40:02 -08:00
8a714aa856 Add c++ client library
Signed-off-by: Luis Martínez de Bartolomé Izquierdo <lmartinez@biicode.com>
Signed-off-by: Luis Martínez de Bartolomé Izquierdo <lasote@gmail.com>
Upstream-commit: e54d8c47e45ca19ab9548a7e3689aa1584733210
Component: engine
2015-01-08 16:24:52 +01:00
634dc343e2 Rewritten as the requested SvenDowideit
Signed-off-by: Tangi COLIN <tangicolin@gmail.com>
Upstream-commit: b69580615f82efe1fccecf15fd09a6c5dfbb01f1
Component: engine
2015-01-08 09:33:08 +01:00
0027284b49 Move docs on the build API out of 'misc' and under 'Images' section
It seems odd to have such an important API hidden under 'misc'.
While in there I noticed that during the "-f Dockerfile" PR I changed
the query param from f to dockerfile and missed this one spot in the docs.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: b7cb29137bd9c8d7de73993cc7415b62acd498cd
Component: engine
2015-01-07 20:27:09 -08:00
5f20ff67a9 Make API docs v1.17 visible
w/o this one-liner the v1.17 docs didn't appear in the Reference dropdown
and I would get a 404 when I tried to access
.../reference/api/docker_remote_api_v1.17/

Not sure if there are other spots that need to be fixed but this seemed to
fix it for me.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 7275cd4bbccb9a3b3ea6b9422a59a092fb08bf8d
Component: engine
2015-01-07 20:14:45 -08:00
1f0a72e010 Specify ENV variables are also used for CMD.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 66387aee5970a9b100f0d14612d7b7726eaf7b9d
Component: engine
2015-01-07 10:07:44 -08:00
2872296531 Update Ubuntu image tag to 14.04
`apt-get update` for non-supported 12.10 doesn't work.
Building failed with
```
INFO[0011] The command [/bin/sh -c apt-get update && apt-get install -y redis-server] returned a non-zero code: 100
```

Signed-off-by: Evgeny Vereshchagin <evvers@ya.ru>
Upstream-commit: 736558b6ae15afb3f5f0d7ba7801fa44bec9f285
Component: engine
2015-01-07 18:12:02 +03:00
4aff255d5d Improve networking documentation with default mac address range
since we can control it with --mac-address.

Signed-off-by: Tangi COLIN <tangicolin@gmail.com>
Upstream-commit: d9ec04e18d5e1fede1afcec27a0d2c69d514a123
Component: engine
2015-01-07 11:01:32 +01:00
2f43c653ae Add a containerised test for the https cert doc
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: cf27b310c4fc8d2c13ba181398a628d03e1e3c58
Component: engine
2015-01-07 16:19:47 +10:00
5b87d47ac2 Centos project does not support custom kernels - see #9696
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: e23d07a110fcf615bf36defd76e7be06cd7e80df
Component: engine
2015-01-06 23:30:03 -05:00
5bab4d3f4f Merge pull request #9933 from cpuguy83/fix_api_docs_for_info
doc: Update API docs to reflect correct values for /info
Upstream-commit: f65b781d2151973c233d7c517635208c2b96dce4
Component: engine
2015-01-07 14:26:28 +10:00
58cea25946 Merge pull request #9707 from duglin/RenameDockerfile
Allow for Dockerfile to be named something else.
Upstream-commit: a67e7382b838bbf74d7e10b2c03434ce4657202e
Component: engine
2015-01-06 17:25:20 -08:00
269ee3bcdf Allow for Dockerfile to be named something else.
Add a check to make sure Dockerfile is in the build context
Add docs and a testcase
Make -f relative to current dir, not build context

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: eb3ea3b43c716ad727521a7d0bc20d7321bb0867
Component: engine
2015-01-06 16:33:26 -08:00
e576cc5858 Merge pull request #9896 from flowlo/doc-https
doc: Improve article on HTTPS
Upstream-commit: 2f588c69f271f69ac5da48903a5342a23313d7af
Component: engine
2015-01-07 10:21:07 +10:00
873526f7b8 Update API docs to reflect correct values for /info
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: cc3bf34c787f4fdf067a459158f38f8413ec4e33
Component: engine
2015-01-06 15:35:45 -08:00