Commit Graph

13713 Commits

Author SHA1 Message Date
f32b25fee3 Fix test pull verified
Update pull code to consider any layer download or new tag as an update.
Update hello-world frozen image to be explicitly tagged as frozen, to not interfere with pull tests.  The hello-world is used by pull tests because of its small size and there is no other official image with such a size.

fixes #11383

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 636037c3637eb1d09cc469cebe39ffb915bb0aa9
Component: engine
2015-03-16 12:22:00 -07:00
3d8e1bb89a Merge pull request #11345 from x1022as/cli
Change cli.md to show right `docker rmi` output
Upstream-commit: e2ca237aa26c73717af9111babf7f82c1123e5df
Component: engine
2015-03-13 16:33:03 -06:00
60c2c94566 Merge pull request #11373 from tianon/move-hack-scripts-back
Move scripts back to hack/, leave docs in project/
Upstream-commit: d2f925fb2784bbecb71f760a8fda3748b4db0a87
Component: engine
2015-03-13 15:26:54 -07:00
1174b9d420 Merge pull request #10238 from miminar/ephemeral-port-range-allocation
Use system's ephemeral port range for port allocation
Upstream-commit: 02c1dd899a7ea84c89cb6f5a87297f4690e393ef
Component: engine
2015-03-13 15:18:05 -07:00
7b2c2c2a97 Merge pull request #11379 from sbasyal/patch-1
Update Centos links
Upstream-commit: db39cc835166984fb50f28507a1afbbe622eae2b
Component: engine
2015-03-13 13:50:53 -07:00
719f00fbf2 Move scripts back to hack/, leave docs in project/
This also removes the now-defunct `*maintainer*.sh` scripts that don't work with the new TOML format, and moves a couple not-build-or-release-related scripts to `contrib/` instead.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 949a21b55f3b8d7d1ae7a7b9829111a8f0dbf7e2
Component: engine
2015-03-13 14:04:08 -06:00
8af9ec43ba Merge pull request #11378 from LK4D4/update_libcontainer
Update libcontainer to 5d6c507d7cfeff97172deedf3db13b5295bcacef
Upstream-commit: a97fbe7d7819041e605048ab386bbd5fba2d5b33
Component: engine
2015-03-13 12:14:54 -07:00
0d2843f030 Update Centos links
Signed-off-by: Sabin Basyal <sabin.basyal@gmail.com>
Upstream-commit: dba4651760d3ba41ea94cb9ab55abcd91cce1229
Component: engine
2015-03-13 11:48:09 -07:00
08d67abfd9 Update libcontainer to 5d6c507d7cfeff97172deedf3db13b5295bcacef
It includes new Type() method for Factory, which needed for replacing
execdriver.Driver.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: eade8eac09ad8cfdaf762e88d382daf6017201d7
Component: engine
2015-03-13 11:33:49 -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
3b87f2d7b5 Merge pull request #11374 from tianon/cpusets
Add CONFIG_CPUSETS to check-config.sh
Upstream-commit: b44aae395a5a5068868cf3f586699314587a873b
Component: engine
2015-03-13 09:12:21 -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
dc9421e6d9 Pass buffered file reader to Fscanf instead of string reader
Unless `file` is wrapped with buffered reader, `fmt.Fscanf` will read
just one byte and terminate with `EOF`.

Signed-off-by: Michal Minar <miminar@redhat.com>
Upstream-commit: 40d540637168fd5781e0c4a9cbd91959b7407d96
Component: engine
2015-03-13 09:40:53 +01: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
8ab6b4e2b5 Merge pull request #11359 from sunyuan3/m1
correct some daemon spelling mistakes
Upstream-commit: 4e7bf0dde4ac6707b24733a8e65da1ca10c40162
Component: engine
2015-03-12 22:17:19 -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
3ac5e5187d Merge pull request #11342 from sunyuan3/spellingmistake
correct a spelling mistake
Upstream-commit: d9c6787b4aa00db33b0f607dc67f1a83565f5269
Component: engine
2015-03-12 05:54:49 -07: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
9bcc20bae4 Change cli.md to show right docker rmi output
`docker rmi` output in docs/sources/reference/commandline/cli.md
is different from real scene. This commit fixes it.

Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
Upstream-commit: 98610282c23746eed4399b5ddf4f7d93de255298
Component: engine
2015-03-12 19:06:48 +08: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
8e9f76e225 Merge pull request #11333 from crosbymichael/upldate-libcontainer-mar-11
Update libcontainer to aa10040b570386c1ae311c6245b
Upstream-commit: 586f75d61c6f6b5d9bc9b4096c391b9ce0b2e58f
Component: engine
2015-03-11 13:04:51 -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