Commit Graph

12672 Commits

Author SHA1 Message Date
f9d0cdbb89 Add labels documentation
Adds more documentation for labels and adds the label instruction to the
man-pages.

Also included is a document called "Labels - custom meta-data in Docker"
in the user-guide, this is still a work-in-progress I started to describe
the "namespaces" conventions, an example on storing structured data.

I ran a bit "out of steam" (writers block?) on that document, but kept
it in (for now), in case it still ends up useful.

The Remote API documentation changes will need to be moved to the
docker_remote_api_v1.18.md document when rebasing the whole PR.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Darren Shepherd <darren@rancher.com>
Upstream-commit: 7d89e66dac59999ae2f07970b273e227fdf73ea7
Component: engine
2015-03-13 10:02:04 -07:00
de26f9599e Add docs for container/image labels
Signed-off-by: Darren Shepherd <darren@rancher.com>
Upstream-commit: 389eee1084ea7613fa56e5f6b3e24678bf9aebc2
Component: engine
2015-03-13 10:02:04 -07:00
58d45ba275 Set labels on container create
Signed-off-by: Darren Shepherd <darren@rancher.com>
Upstream-commit: abb5e9a0777469e64fe2c7ecfa66ea01083d2071
Component: engine
2015-03-13 10:02:04 -07:00
51b13a7774 Allow specification of Label Name/Value pairs in image json content
Save "LABEL" field in Dockerfile into image content.

This will allow a user to save user data into an image, which
can later be retrieved using:

docker inspect IMAGEID

I have copied this from the "Comment" handling in docker images.

We want to be able to add Name/Value data to an image to describe the image,
and then be able to use other tools to look at this data, to be able to do
security checks based on this data.

We are thinking about adding version names,
Perhaps listing the content of the dockerfile.
Descriptions of where the code came from etc.

This LABEL field should also be allowed to be specified in the
docker import --change LABEL:Name=Value
docker commit --change LABEL:Name=Value

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: cdfdfbfb6223fdd5b319942d412caac6bc09cdeb
Component: engine
2015-03-13 09:47:09 -07:00
8aa46e814e Merge pull request #11350 from delftswa2014/utils-directory-windows
Makes `directory` pkg compilable on Windows.
Upstream-commit: 6374c12fbb09d3fa04a46bc951e3c9e8baeac63f
Component: engine
2015-03-13 09:26:08 -07:00
baa877aaee Add CONFIG_CPUSETS to check-config.sh
See also https://bugs.gentoo.org/show_bug.cgi?id=536546:

```console
$ docker run learn/tutorial echo "hello world"
FATA[0001] Error response from daemon: Cannot start container 1d0c0ca5cc7f39a271ec40c1479a80bffb7190fab97392b3453a1fc0b2dc8e78: mountpoint for cpuset not found
```

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 03de73a5e075e16656f5399f1957f7190f7bdc44
Component: engine
2015-03-13 09:18:10 -06:00
f792a41d7a Merge pull request #11363 from moxiegirl/split-contribute-out
Breaking out the project into more granular pieces
Upstream-commit: e79c91447f623da6ac9bd5f8097a4e54421b50ab
Component: engine
2015-03-13 08:33:51 -04:00
65389ed10a Breaking out the project into more granular pieces
Signed-off-by: Mary Anthony <mary.anthony@docker.com>
Upstream-commit: ec728939b167a32226d7556af38a51d3bc3a1b9e
Component: engine
2015-03-12 22:27:49 -07:00
6fd6c2d05a Merge pull request #11349 from cpuguy83/11132_better_error_message_on_graph_init
Make errors from graphdriver friendlier
Upstream-commit: 88c706e442fb489387ba8ef5fd2de42479f74b87
Component: engine
2015-03-12 23:26:35 -04:00
e70ef80162 correct some daemon spelling mistakes
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
Upstream-commit: 906974b185b431a8c493479f748677f3c0bc4ca3
Component: engine
2015-03-13 05:14:56 -04:00
b6672fca8d Merge pull request #11351 from tianon/bash-3-frozen
Update "download-frozen-image.sh" with Bash 3 support for msysGit
Upstream-commit: 50c6c675e666d2e17a961b40a82306219053c2a1
Component: engine
2015-03-12 18:05:11 -07:00
266f46c668 Merge pull request #11340 from fredlf/docs-lgtms
Adds Fred, updates docs LGTMs
Upstream-commit: eb435d70c138c842c238b4513c3c63cb7547c030
Component: engine
2015-03-12 14:35:23 -07:00
0b6f77080d Merge pull request #10620 from acbodine/notify_user_of_creds_save
Adds: notify user of login credential persistence for registry
Upstream-commit: e781c9624cb3b646fde1501d95d15933eedadf1e
Component: engine
2015-03-12 13:43:20 -07:00
b4071d7043 Merge pull request #10924 from tcnghia/master
engine.Tail() to ignore trailing whitespaces.
Upstream-commit: 227f60ce76a0b73ea0b6534cab34dd7ae777a6f6
Component: engine
2015-03-12 12:55:48 -07:00
fd3cd22156 Update "download-frozen-image.sh" with Bash 3 support for msysGit
This uses a bit of on-disk state in our export directory to emulate our associative array for generating the "repositories" JSON file.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 27aab3acc6b38ddc39d19e16d61d47f0a4436350
Component: engine
2015-03-12 12:32:16 -06:00
3dc824af8c Make errors from graphdriver init friendlier
In several cases graphdriver were just returning the low-level syscall
error and that was making it all the way up to the daemon logs and in
many cases was difficult to tell it was even coming from the graphdriver
at all.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: c0f7819905050ebdb583afba5b6f760d3892adb8
Component: engine
2015-03-12 08:13:00 -07:00
540b15bb62 Makes directory pkg compilable on Windows.
Also makes the test cases platform independent.

Signed-off-by: Rick Wieman <git@rickw.nl>
Upstream-commit: 46d4f12fbf25d605f2d034c8cc68f25a47164190
Component: engine
2015-03-12 15:54:22 +01:00
7f7a47b98e Merge pull request #11265 from duglin/ScratchSHfix
Fix builder when num of RUN args is 1
Upstream-commit: 565cff84b1ae13e21fa74af83e58d29bafbca47a
Component: engine
2015-03-12 09:30:56 -05:00
10fceb4fae Merge pull request #11269 from tianon/update-simple
Update Dockerfile.simple to include aufs-tools
Upstream-commit: 5d174e000f9e0d0d4d557367ab7685834d190a71
Component: engine
2015-03-12 10:05:56 -04:00
182d2d03b5 correct a spelling mistake
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
Upstream-commit: a02256577ab0806f004e41fd94aaaed52d1aff97
Component: engine
2015-03-12 09:22:51 -04:00
20b7c132ab Merge pull request #11278 from ahmetalpbalkan/win-cli/fakeGIT
integ-cli: use httpserver container for fakeGIT
Upstream-commit: 52f6da223839a5ac1fc003b259b74f6a02fc2858
Component: engine
2015-03-11 18:19:11 -07:00
2fb233b0f3 Adds Fred to list of people and clarifies that docs approval requires only two LGTMS (not a "majority" as it was before Mary and Steve were added).
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
Upstream-commit: 3bcd2006b56ad57caa7e8723c3269cbd50af1f4a
Component: engine
2015-03-11 17:38:35 -07:00
282d3dadfd Merge pull request #11331 from jfrazelle/update-logrus
Update logrus to 0.6.6
Upstream-commit: 5494432f917eb0f6e4cf73deed366f6830ec64ec
Component: engine
2015-03-11 16:18:22 -07:00
69e2749ca8 Merge pull request #11248 from Finkes/patch-1
improve Debian installation instructions
Upstream-commit: 254b6f8946dd7cceaa32d5e1da981287ace5f0f5
Component: engine
2015-03-11 15:36:01 -07:00
e0e2bdc16b Merge pull request #11280 from MabinGo/docs_api-enable-cors_deprecated
docs: --api-enable-cors is deprecated,updated docs description
Upstream-commit: cc4095a18cfff27dfca77251978b6a9bdaa5c86a
Component: engine
2015-03-11 15:28:28 -07:00
10a769231a Merge pull request #11329 from estesp/fix-run-test-doc
Remove escaping from TESTFLAGS; it is no longer required
Upstream-commit: 5b5b09275e47d3b2a91eef0122865388dc7774a8
Component: engine
2015-03-11 15:01:17 -07:00
018c3380f4 Merge pull request #11325 from duglin/11289-HelpDashF
Minor tweak to build -f text to make it clear Dockerfile is in context
Upstream-commit: 24408f1c18790bf607452108943b3e18cbb61f38
Component: engine
2015-03-11 14:58:38 -07:00
61eb7821e7 Merge pull request #11311 from delftswa2014/11309-add-filter-name
Adds 'name' filter to the CLI reference.
Upstream-commit: f960a79b7c0be371697f914fc8b2e270c73cc974
Component: engine
2015-03-11 14:54:51 -07:00
54029ad909 Merge pull request #11310 from ahmetalpbalkan/win-cli/ping-icmp
integ-cli: remove ICMP dependency from test, use nslookup
Upstream-commit: d6a6c7d4d9ef08d218cad6dd9ed72b3d2f40060c
Component: engine
2015-03-11 17:53:50 -04:00
4ae0ae0aee integ-cli: remove ICMP dependency from test, use nslookup
As we started running CI machines on Azure cloud and Azure
doesn't have ICMP stack implemented by replacing
`ping 8.8.8.8` with `nslookup google.com`.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 004ac85aa25f08e350465140ee7404ad31602d75
Component: engine
2015-03-11 14:27:11 -07:00
31b9b2a976 Merge pull request #11326 from cpuguy83/11315_rename_w_daemon_restart
Persist container to disk after rename
Upstream-commit: c6321931d234a190bf0696d0ab5711425c83480c
Component: engine
2015-03-11 13:44:13 -07:00
6f4d9f063b Merge pull request #11330 from ahmetalpbalkan/win-cli/events-daemon-time
integ-cli: Fix clock skew against remote test daemon
Upstream-commit: bf35122890016d4bac4d3b89657d7f0c46a9838e
Component: engine
2015-03-11 13:40:37 -07:00
e7e0b4ff1a Persist container to disk after rename
Fixes #11315

After rename occured the graphdb was updated but the container struct
was never commited back to disk, so on daemon restart it loads the old
name again.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: c5c72cf151b21482b2f27417322342c6d781108c
Component: engine
2015-03-11 12:39:31 -07:00
1d54ba03b3 improve Debian installation instructions
Signed-off-by: Dominik Finkbeiner <finkes93@gmail.com>
Upstream-commit: cddb443da428c0b9c9f4f5910a36f478110db224
Component: engine
2015-03-11 20:14:32 +01:00
447782f74b Update libcontainer to aa10040b570386c1ae311c6245b
Includes mqueue label fix and cgroups improvements.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: c553be5a4f3ff24079337e2ffe2437325f9969e1
Component: engine
2015-03-11 11:49:15 -07:00
e4aa3231a3 Update logrus to 0.6.6
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 89e2e5fc55620634df3f2c9403594b0f701b0c5c
Component: engine
2015-03-11 11:29:13 -07:00
76ab368c1d integ-cli: fix clock skew against remote test daemon
This fixes the `docker events`-related tests as they have been
failing due to clock skew between CI machine and test daemon on
some other machine (even 1-2 seconds of diff causes races as
we pass local time to --since/--until).

If we're running in same host, we keep using time.Now(), otherwise
we read the system time of the daemon from `/info` endpoint.

Fixes pretty much all events-related tests on windows CI.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: e424c54d9c4030dc3290701e8e76add372e09e08
Component: engine
2015-03-11 10:28:56 -07:00
d6ac6e4561 Remove escaping from TESTFLAGS; it is no longer required
In fact, it doesn't work as the bare `\` backslashes are now preserved
and therefore are not valid regex matches on any test, making it not run
any tests at all.  I assume at some point there was a process in the
pipeline that needed escaping, but on master (for quite a while) this
has not worked.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: ed3f3835071496e9314d0e2a1806ac43f304decc
Component: engine
2015-03-11 13:09:40 -04:00
424b1cdcc8 Merge pull request #11291 from ahmetalpbalkan/info/system-date
Add system time to /info
Upstream-commit: d010bf0d994ce562a3be693f6afef71d55bea887
Component: engine
2015-03-11 09:43:43 -07:00
45e612ea59 Minor tweak to build -f text to make it clear Dockerfile is in context
Closes #11289

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 1b46248a332dab1a886d9c4352f9e0057e6c284f
Component: engine
2015-03-11 09:04:30 -07:00
2c409e6dd8 Fix builder when num of RUN args is 1
FROM scratch
ADD echo /
RUN [ "echo" ]

will die with
  exec: "/bin/sh": stat /bin/sh: no such file or directory

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 645f8a32df3b5b22e5e194664a9f0733709714c9
Component: engine
2015-03-11 07:30:44 -07:00
b582bfa2e6 Merge pull request #11317 from zenlinTechnofreak/helpSuffixSpace
Help suffix space
Upstream-commit: 830544044edff87980a176d8984c1288822755cc
Component: engine
2015-03-11 10:04:23 -04:00
6cc0f5d3a1 Merge pull request #11316 from ahmetalpbalkan/win-cli/help-homepath-fix
Make use of %USERPROFILE% in cli help message
Upstream-commit: 1a5e46ce8957149d45eb8792254625ae696c8e4e
Component: engine
2015-03-11 09:28:43 -04:00
8ea0c3c94e Add checking trailing space for all lines of the help output
Signed-off-by: Zen Lin(Zhinan Lin) <linzhinan@huawei.com>
Upstream-commit: 491b63e0daa9103cf9471c03c4b41026f6955323
Component: engine
2015-03-11 21:24:30 +08:00
cb89c142a6 Merge pull request #11244 from ChristopherBiscardi/docs-code-fixes
Fix a few code rendering errors in docs
Upstream-commit: 95dcb2748442fc1f59e8c2e010679e0aea3cef1c
Component: engine
2015-03-11 08:34:53 -04:00
362dc0b239 Normalize the log for docker subcommand usage,
delete unecessary blank after "[OPTIONS] "
and add a blank to the log between options and signature.

To make the code style consistency.

Signed-off-by: Zen Lin(Zhinan Lin) <linzhinan@huawei.com>
Upstream-commit: 2b051bcbda06ec48287e75da506bacf95be2b652
Component: engine
2015-03-11 18:58:32 +08:00
8855da6111 Add the check for suffix of option in each line of help, to make sure no extra space in it
Signed-off-by: Zen Lin(Zhinan Lin) <linzhinan@huawei.com>
Upstream-commit: f63a29ddeee62c8e4fcb1cf8eaf84aff305380c0
Component: engine
2015-03-11 18:46:01 +08:00
b147bc8ddc Make use of %USERPROFILE% in cli help message
An earlier commit was causing docker windows CLI build to not to pick up
the shorthand form for home directory (`%USERPROFILE%`) shown in when
`docker --help` is executed.

Fixing that bug and making the if statement concise and clear.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 802c90500073ad79e5a6520402ef2a7268c824b7
Component: engine
2015-03-11 02:14:49 -07:00
dbea27ac5e Adds 'name' filter to the CLI reference.
Also sorts the filter and fixes the bullet list.

Signed-off-by: Rick Wieman <git@rickw.nl>
Upstream-commit: 179e45f27c5e6d526d4082296bba563705195755
Component: engine
2015-03-11 07:41:56 +01:00
546ad5a411 integ-cli: use httpserver container for fakeGIT
This change enables `fakeGIT()` to use the new `fakeStorage`
server which is automatically starting a container on the remote test
daemon machine using the git repo directory (when requested).

Fixes the following tests:

- `TestBuildApiLowerDockerfile`
- `TestBuildApiBuildGitWithF`
- `TestBuildApiDoubleDockerfile` (skipped on windows: NTFS case-insensitive)
- `TestBuildFromGIT` (still needs local server)

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 44ffb199d03f0d63a2c9ad05e9fd03a6a08c594d
Component: engine
2015-03-10 22:48:35 -07:00