Commit Graph

16388 Commits

Author SHA1 Message Date
Sven Dowideit 72dd46b2de Notes should be indented
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 93c82360a6b530ef86769ee04e027f6159dc55da
Component: engine
2015-03-03 13:58:35 -08:00
Tianon Gravi d63f98eeb4 Rename .dockerversion to .go-autogen so it's clear that all autogenerated code goes here
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 8625a281c66180af867f59a041560bf5035ae404
Component: engine
2015-03-03 12:42:38 -07:00
Doug Davis 8c703a14a3 Fix 'docker ps --help' so the options don't span more than one line
and add a testcase to catch this in the future.

While in there I also:
- removed extra periods from the few options that had them (new test)
- made the --filter option consistent across all command

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 5595da2bde6574fe13785f07c55a155a2e90a7ca
Component: engine
2015-03-03 10:02:23 -08:00
Zen Lin(Zhinan Lin) 1e821173bd Just format some logs and notes in /daemon/networkdriver/bridge/driver.go
Signed-off-by: Zen Lin(Zhinan Lin) <linzhinan@huawei.com>
Upstream-commit: 2c0e027ab9b7da131451d571c4d0f25bc5fc14eb
Component: engine
2015-03-03 23:39:04 +08:00
Iavael 0a6bee6ece Fixed handling hardlinks to symlinks in tar stream
Signed-off-by: Iavael <iavaelooeyt@gmail.com>
Upstream-commit: ab181ce55707de6f47d662dcdf6eab9c6c040906
Component: engine
2015-03-03 16:10:53 +03:00
resouer d382609cd2 Rebase & update api doc v1.18 instead
Signed-off-by: harry zhang <resouer@163.com>
Upstream-commit: dc0a6c1f5edd78d23ab676c54c3e84df3c2b2bbf
Component: engine
2015-03-03 12:32:17 +08:00
resouer f947fbc4ae Add cors header flag and leave boolean flag not changed
Deprecate api-enable-cors

Update docs & man files

Signed-off-by: harry zhang <resouer@163.com>
Upstream-commit: f3dd2db4ff7de1399a49af928cd3eae4fccf8764
Component: engine
2015-03-03 11:21:19 +08:00
Tianon Gravi 66a4f89602 Update contrib/mkimage/debootstrap whitespace for consistency
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: dec67f7f573855cd1760ed180efc006f5a900c2d
Component: engine
2015-03-02 18:33:38 -07:00
Jessie Frazelle d146803485 Merge pull request #11121 from shishir-a412ed/docker_help_issue
Fix: docker -d -h start daemon instead of showing help menu
Upstream-commit: 8e107a93210c54f22ec1354d969c771b1abfbe05
Component: engine
2015-03-02 15:40:27 -08:00
Tianon Gravi 7e8cf8c782 Add secondary "simple" Dockerfile
This is the absolute bare minimum necessary to compile and test Docker -- this is going to be especially useful for testing and verifying assumptions.

With this, we can setup a Jenkins job that tests to ensure that all the work we do to make sure our build scripts and tests don't contain assumptions is not effort spent in vain.

This is important because this is the kind of bare-bones stock environment our packagers build in.  Additionally, this verifies that our scripts will work reasonably on other platforms (such as Darwin and Windows) as well.

Assumptions existing tests make that currently fail:

- `registry-v2` exists as a binary in `$PATH` (FIXED IN #11005 🎉)
- `unprivilegeduser` exists as a user in `/etc/passwd`

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 5118f1431c9cae757d5e7c193ed85fc8fca3ae85
Component: engine
2015-03-02 15:20:16 -07:00
Shishir Mahajan cbc491abc7 Fix: docker -d -h start daemon instead of showing help menu
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
Upstream-commit: 0ab28c658952267af8e86a5b1055dd4b9cf0ec51
Component: engine
2015-03-02 17:01:56 -05:00
Alexander Morozov 2d25573473 Merge pull request #11106 from MabinGo/fix_log_info
Fix some revision about log output
Upstream-commit: 32ccde46dde5130adcfb170c846c8f0317761aee
Component: engine
2015-03-02 13:55:43 -08:00
Tianon Gravi 66c985e514 Download busybox from the Hub instead of GitHub
This downloads a specific image ID of `busybox:latest` from the Hub directly (within the `Dockerfile`, ready for `docker load`) instead of grabbing the source from GitHub and doing a `docker build` at daemon start time.  This ensures the test suite runs more consistently.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 351074edcd22e4ca587713feda541268a66cdb86
Component: engine
2015-03-02 14:38:19 -07:00
Jessie Frazelle a0531c5103 Merge pull request #11005 from ahmetalpbalkan/win-cli/RegistryV2-skip
integ-cli: skip tests launching registry-v2
Upstream-commit: f92213af882761a739fa0d8408e180e437b1a380
Component: engine
2015-03-02 12:41:21 -08:00
Jessie Frazelle 7023b06ad1 Merge pull request #10971 from Microsoft/10662-api_server_factor_out_windows
api\server: Factored out UnixHttp on Windows, supported on Linux only.
Upstream-commit: c5ecdfd878d67d0595561a04e4945f60893f8c6f
Component: engine
2015-03-02 12:40:20 -08:00
Jessie Frazelle b2afcdf656 Merge pull request #11006 from ahmetalpbalkan/win-cli/TestCommitChange-fix
integ-cli: fix TestCommitChange for pulled busybox
Upstream-commit: bedf3f8f201a06a1d0e9add103da2138a375ae97
Component: engine
2015-03-02 12:39:34 -08:00
moxiegirl 6a658a3da6 Merge pull request #11111 from zenlinTechnofreak/zlFixDriverNote
fix err in note at daemon/networkdriver/bridge/driver.go
Upstream-commit: 377e62aa027337cf360f22cbf54fdec87743776f
Component: engine
2015-03-02 12:31:37 -08:00
Jessie Frazelle c6435e1b51 Merge pull request #10986 from crosbymichael/create-api-type
Create api types package for structured responses
Upstream-commit: 2bfa701f45b55fbfd7e5d5a1d6fa45a8d84cd19a
Component: engine
2015-03-02 12:22:02 -08:00
Jessie Frazelle d23101e569 Merge pull request #11055 from MabinGo/checkfileoper2
when the file that was opened has been read into buffer, the file should be closed
Upstream-commit: 1500503b29d97257cf8c1789fc320e2409d9b394
Component: engine
2015-03-02 12:18:14 -08:00
Jessie Frazelle d0e86ebf79 Merge pull request #11054 from MabinGo/checkfileoper1
Add the file close operation before function return to advoid resource leaking
Upstream-commit: 82aa950f4e10dbd45b16ecfc144f8d4b450ad1ff
Component: engine
2015-03-02 10:44:26 -08:00
Phil Estes aeb9a73d60 Merge pull request #11083 from MabinGo/minor_typo
Modify the minor typo in deviceset.go
Upstream-commit: 738bdec4908755761b27b7d15baeefb1a824f770
Component: engine
2015-03-02 13:11:14 -05:00
Tianon Gravi 0a09f8ffe0 Add support for an optional ".bashrc" file
If `.bashrc` exists at the root of the source tree, it will be used as the `~/.bashrc` inside the container.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: c62230a879e0461c43a4fc7d2e2e2efdd466fedd
Component: engine
2015-03-02 10:33:26 -07:00
Zen Lin(Zhinan Lin) 8ce83c8f78 fix err in note at daemon/networkdriver/bridge/driver.go
Signed-off-by: Zen Lin(Zhinan Lin) <linzhinan@huawei.com>
Upstream-commit: e5bc50b5cd5237e820f5a708d0c351581905f1e2
Component: engine
2015-03-03 00:52:53 +08:00
Phil Estes 8ccc0c87e2 Merge pull request #11003 from brahmaroutu/rename_10996
Prefix / is ignored when container is renamed
Upstream-commit: 89db94ecf904bf09dbf80ca879a2b759443e2392
Component: engine
2015-03-02 09:48:07 -05:00
moxiegirl b8344b4ef2 Merge pull request #11060 from dmitrygusev/docs-improvements
Docs improvements typo fixes and consistency
Upstream-commit: 6bbf5c3e99d9943d6526a415de0875c441266eff
Component: engine
2015-03-02 06:46:17 -08:00
Phil Estes ae2cbed644 Merge pull request #11073 from zenlinTechnofreak/zenlinlogerrfix
To avoid the confusing in log, change '%s' to '%q', change the question ...
Upstream-commit: a3dc3bb758a40562f34659846b18243c72e94caa
Component: engine
2015-03-02 09:30:59 -05:00
Zen Lin(Zhinan Lin) 87e987a3ef To avoid the confusing in log, change '%s' to '%q', change the question sentence to a reminding sentence.
Signed-off-by: Zen Lin(Zhinan Lin) <linzhinan@huawei.com>
Upstream-commit: 08ea03ccb9c6c671b465572e4a5c9a5d1da1fda0
Component: engine
2015-03-02 19:14:22 +08:00
Mabin 4a59461365 Fix some revision about log output
Signed-off-by: Mabin <bin.ma@huawei.com>
Upstream-commit: adfd1ddfc6e094295d07ff2b36fb6e91cf7878dd
Component: engine
2015-03-02 17:06:38 +08:00
Mabin f3df541809 fix typo of comments in daemon/graphdriver/devmapper/deviceset.go
Signed-off-by: Mabin <bin.ma@huawei.com>
Upstream-commit: f4ac86de84c25bf1793d1e934695b7119dc51b70
Component: engine
2015-03-02 02:11:15 +08:00
Chen Hanxiao d411e5860d docs: add See Also for description of login/logout and start/stop
make them reference to each other.

Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
Upstream-commit: 41dc0e08d3f77b334670cc2ff3fb1a0c16fd9300
Component: engine
2015-03-01 01:36:00 -05:00
Sebastiaan van Stijn b10d9ac0eb Fix incorrect https example in mac.md (carry of 11063)
The document referenced https but was using the http port. I changed the
examples from https to http.

Also, fyi, when I tried accessing https using the correct 443 port, it
did not work. I have not investigated why. Port 80 worked fine.

For me:
jay-mac:.ssh jay$ docker port web
80/tcp -> 0.0.0.0:49153
443/tcp -> 0.0.0.0:49154
jay-mac:.ssh jay$ boot2docker ip
192.168.59.103

works: http://192.168.59.103:49153/
fails: https://192.168.59.103:49154/

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 1d4b2524ec080a19f47292020a7fb6a9a00c8932
Component: engine
2015-02-28 22:13:03 +01:00
Lei Jitang 1f225ba7bc Fix a minor typo in daemon/container.go
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 40dc18e2fa3724c5c4361f42a413c754ee03a492
Component: engine
2015-02-28 18:43:28 +08:00
Mabin 5e225bf426 Modify the minor typo in deviceset.go
Signed-off-by: Mabin <bin.ma@huawei.com>
Upstream-commit: 5c1559a754f7b1fba45be01a6f1a4b3c7c6c4c68
Component: engine
2015-02-28 18:04:10 +08:00
Tianon Gravi bb531c2235 Adjust contrib/mkimage/debootstrap PATH handling to be more robust
Instead of applying it only for the final `chroot`, this adds a chroot helper function to apply it appropriately for every chroot, including making sure that we find `chroot` in our current host `PATH` in case it's in a strange place.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 91770ec9e4b5bce330ddebc421248d275549ccc5
Component: engine
2015-02-28 00:11:55 -07:00
Damjan Georgievski 9654cdc98a export a proper debian PATH for the chroot
when running in the chroot, it would be expected to have a Debian-ish environment,
most important the PATH variable. Otherwise the host PATH would be used which can wrong
for Debian, especially if the host is Arch (which doesn't have /bin, /sbin or /usr/sbin).

Signed-off-by: Damjan Georgievski <gdamjan@gmail.com>
Upstream-commit: a8713271355c68023ea090eb223682e784c64f93
Component: engine
2015-02-27 23:56:42 -07:00
Jason Stangroome c8d8754d3e Correct IP/MAC address generation docs
The MAC address is generated from the IP address, not the other way.

Signed-off-by: Jason Stangroome <jason@codeassassin.com>
Upstream-commit: ed3fe85ba3b30d2586108a707fe20bba6c667e91
Component: engine
2015-02-28 10:05:06 +11:00
Jessica Frazelle 15ea5ae8fb fix racy events test
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 202709d178a24bcbfac223f0bcd9c4eda669e928
Component: engine
2015-02-27 14:48:39 -08:00
Srini Brahmaroutu 2b1fd26fbf Prefix / to the container name is ignored when container is renamed
Closes #10996

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: caaae78247d9ceecba07da381401c2376b478c2b
Component: engine
2015-02-27 22:40:04 +00:00
Dmitry Gusev 4020847acb Update cli.md
Use `-it` combination in example instead of `-ti`, because this is how it used everywhere in examples.

Update dockerfile_best-practices.md

Fix typo in command name

Signed-off-by: Dmitry Gusev <dmitry.gusev@gmail.com>
Upstream-commit: 39b3690ba1801b36c1f43fa220ae5128958a0739
Component: engine
2015-02-27 23:18:32 +03:00
Jessie Frazelle 7595c1bf94 Merge pull request #10998 from jfrazelle/fix-filter-events-test-better
Fix events test so it doesnt need new daemon
Upstream-commit: 2768ce0e4e773d0a0331c6294f31fd9ff9450062
Component: engine
2015-02-27 12:05:48 -08:00
Jessie Frazelle 030e1d866f Merge pull request #11037 from coolljt0725/add_parse_mac
Add validate the input mac address on docker run command
Upstream-commit: 314a678da7f948548a7f5aae886b3089ce4a7c9b
Component: engine
2015-02-27 12:03:25 -08:00
Jessie Frazelle 80fc2cf3da Merge pull request #11011 from coolljt0725/fix_rmi_conflict
Fix docker remove an image show misleading conflicts
Upstream-commit: 13030add69ca84a853c036ac139f3325afc1b0e0
Component: engine
2015-02-27 12:00:12 -08:00
Jessie Frazelle ec994adca7 Merge pull request #11002 from ahmetalpbalkan/win-cli/dockerfile-path-fix
Support windows style dockerfile paths for build cmd
Upstream-commit: 1061c56a5fc126a76344ea9dca9aa5f5e75eb902
Component: engine
2015-02-27 11:57:19 -08:00
Mabin 0fd505f748 Add the file close operation before function return to advoid resource leaking
Signed-off-by: Mabin <bin.ma@huawei.com>
Upstream-commit: b5eeab6e061d183be050143426dd7fd774c89a20
Component: engine
2015-02-28 00:24:41 +08:00
Lei Jitang b540023f69 Add validate the input mac address on docker run command
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 2ba0fbb0ae1701b638a4bb956187dd878385dc80
Component: engine
2015-02-27 07:27:12 -08:00
Mabin b67ac7ee80 when the file that was opened has been read into buffer, the file should be close.
Signed-off-by: Mabin <bin.ma@huawei.com>
Upstream-commit: d5ea4bae4a15cc9f3c16c046389737682277ff0f
Component: engine
2015-02-27 19:09:17 +08:00
Ahmet Alp Balkan 8ee526a485 integ-cli: fix TestCommitChange for pulled busybox
If the tests are running outside a container (i.e.
executed without `make test`), we are using a `busybox`
pulled from Docker Hub (not jpatezzo's docker-busybox).

That one adds an extra
`PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin`
env var all the time and that messes the test `TestCommitChange`.
That's currently breaking the windows CI.

I'm keeping the same PATH here but making it explicit
so that it's always set and we verify what we set. It's actually the same
thing if I set `ENV PATH foo` here but I thought it may lead to some
problems hard to debug in the future.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: c1b7792186c2408817e5027fdc1c2e4fa355dcf4
Component: engine
2015-02-26 20:08:16 -08:00
Phil Estes 2d06b1cf02 Merge pull request #11017 from brahmaroutu/random_10962
moving random.go from utils
Upstream-commit: f5850e8e30b9420d26bd12136d8bbb6669d1e2bb
Component: engine
2015-02-26 21:35:42 -05:00
Jessie Frazelle 91a8e60aaa Merge pull request #11013 from delftswa2014/10965-timeout
Move TimeoutConn to seperate pkg dir.
Upstream-commit: fe554589c0456c32d370615796c4fde4ecc23080
Component: engine
2015-02-26 17:40:42 -08:00
Jessie Frazelle b74aa8d071 Merge pull request #11029 from brahmaroutu/fixtest_10963
When --net=none enabled, the test uses local filesystem
Upstream-commit: bcbe70588d1ff3ff28d78d56e221ff1efb7bbc47
Component: engine
2015-02-26 17:30:02 -08:00