Commit Graph

12287 Commits

Author SHA1 Message Date
5330278b47 Merge pull request #10730 from mattyw/fix-10728
api/server: don't print warning if serving on localhost
Upstream-commit: 4cc8ccb8d2635aaff5cf8525f2f83b5211259579
Component: engine
2015-02-20 10:43:56 -08:00
868befad3f Merge pull request #10913 from ahmetalpbalkan/win-cli/UnixSpecific-skip
integ-cli: Skip some unix-specific cli tests
Upstream-commit: 695bf3348f022e12c2d7deb21f8f3a088c079e89
Component: engine
2015-02-20 10:33:28 -08:00
340738a112 Merge pull request #10914 from kargakis/map-commands
Map Commands instead of using them as a slice
Upstream-commit: c5aca86654f9eeb07e533ece53da139aad692b2b
Component: engine
2015-02-20 10:32:04 -08:00
b51836333b Merge pull request #10625 from duglin/FixHelpHomeSlash
Fix for help when $HOME is /
Upstream-commit: fdfa7ee70286c3d08a839e20ea7663185cdbcd78
Component: engine
2015-02-20 10:06:22 -08:00
3f76171b24 Merge pull request #10665 from brahmaroutu/autogen_removeXflag
Removing -X flag option and autogenerating code to create Dockerversion....
Upstream-commit: b32564798df90222fd455a6db52a61f9b4ae2100
Component: engine
2015-02-20 09:53:07 -08:00
117a5aaace integ-cli: Typo fix in test_vars_* comments.
Signed-off-by: Ahmet Alp Balkan <ahmetb@microsoft.com>
Upstream-commit: 5d615dff10f31ea6bf77a1233b1821b0e525e456
Component: engine
2015-02-20 09:51:10 -08:00
105231e146 integ-cli: Skip some unix-specific cli tests
Skipping some of the tests closely tied to running in a
unix environment. Windows does not support chmod/chown
and this causes some tests to fail creating desired
behavior.

- `TestBuildWithInaccessibleFilesInContext`: uses chown/chmod
- `TestBuildDockerfileOutsideContext`: uses os.Symlink, not implemented on
  windows
- `TestCpUnprivilegedUser`: uses chmod, and requires 'unprivilegeduser'
  created by Dockerfile (and thus requires to run inside container)
- `TestBuildChownSingleFile`: uses chown

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 492a58f05fe026653e27ed75d3ad4221f2e615b1
Component: engine
2015-02-20 09:51:10 -08:00
1dea2eba06 Merge pull request #10911 from ahmetalpbalkan/win-cli/TestVolumesNoCopyData-fix
integ-cli: fix volume test by passing unix path as volume
Upstream-commit: b1509e868555abaa6cdc97c56f6b82d845f70a2e
Component: engine
2015-02-20 09:21:47 -08:00
34debd5101 commands: fix a comment typo
s/overide/override

Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
Upstream-commit: 0050efcd8f82144ea7f6c74f9bc9af357743370d
Component: engine
2015-02-20 23:46:29 +08:00
314f2be995 Map Commands instead of using them as a slice
The most obvious use case is when one wants to make sure as fast
as possible that a command is a valid Dockerfile command.

Signed-off-by: kargakis <kargakis@users.noreply.github.com>
Upstream-commit: 6ecf23861ec7036aa4210fe6d3b7dbfaaedbd6d0
Component: engine
2015-02-20 15:56:21 +01:00
1b9876efb2 integ-cli: fix volume test by passing unix path as volume
This fixes `TestVolumesNoCopyData` for test execution on
windows by passing a unix-style path as volume even though
it's running on windows.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 606283875616bf71af4814fc47ee5c2ca7b729c6
Component: engine
2015-02-20 00:58:44 -08:00
efffe9523d Fix for help when $HOME is /
estesp noticed that when $HOME is / the ~ substitutions messes up
becuase it tries to replace all paths that start with "/" with "~".
This fixes it so that it will only replace it when $HOME isn't "/".

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 116367eb07351125754aef01f7d3da152b018710
Component: engine
2015-02-19 22:21:17 -08:00
f634216d52 Removing -X flag option and autogenerated code to create Dockerversion.go functionality
Addresses #9207

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: 6871b9b16afe46e7566ac2937246b4a64be97269
Component: engine
2015-02-20 05:40:12 +00:00
05600313fd api/server: don't print warning if serving on localhost
Fixes bug #10728

Signed-off-by: mattyw <gh@mattyw.net>
Upstream-commit: 0ae455333b3357f30f27da10557e4d9c006b5ba7
Component: engine
2015-02-20 12:37:17 +08:00
7b25cb1708 Merge pull request #10872 from jfrazelle/ugh-tomlv
fix tomlv because it doesn't read from stdin
Upstream-commit: a78ce5c228b895d8c614d72354a52e324817b9fc
Component: engine
2015-02-19 20:31:34 -08:00
299b14d7b4 Merge pull request #10898 from noironetworks/Fixing-docs-for-docker-ps-filter
Added missing documentation for PR #8543
Upstream-commit: 573e2484a5017385d645a11de29f9c9e7e207c5b
Component: engine
2015-02-19 17:19:09 -08:00
c61c12bda0 Merge pull request #10873 from ahmetalpbalkan/win-cli/TestBuildRenamedDockerfile-fix
integration-cli: Fix path problems in TestBuildRenamedDockerfile
Upstream-commit: e22487db370e431016b53b4044e452856ac72d10
Component: engine
2015-02-19 16:40:15 -08:00
2c330e66cf Merge pull request #10856 from coolljt0725/fix_expose
Fix docker run --expose with an invalid port does not error out
Upstream-commit: 140293734736e9b7ab61bf4dbb25bc318d6d1c7f
Component: engine
2015-02-19 16:01:15 -08:00
884ae09296 fix race in events test
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 27c61c39db414dd717aea04fc9440ee6d02b626d
Component: engine
2015-02-19 15:32:00 -08:00
a1eb08d949 Add a test for expose a invalid port
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 34b7c10e3eed8bd4d71b998d06ca10766ce4c754
Component: engine
2015-02-19 15:18:13 -08:00
d5362cffa1 Merge pull request #10468 from noironetworks/10457-Pause-and-unpause-accept-multi-containers
Allow docker pause and unpause to accept multiple containers
Upstream-commit: 934535db9c78b20481c8ccabdf174926c6e04d4d
Component: engine
2015-02-19 15:16:05 -08:00
0aa0a22313 integ-cli: Fix path problems in TestBuildRenamedDockerfile
`TestBuildRenamedDockerfile` tests hard-code unix-style
path building. Made use of `path/filepath` to make these
tests work on Windows as well.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 967d85a28fa1e9a8ac4d668960bca8760af2b722
Component: engine
2015-02-19 14:45:26 -08:00
1aeb75c1f3 Merge pull request #10418 from bobrik/overlay-kernel-checks
Checking EXT4_FS_SECURITY for overlay
Upstream-commit: 55566f2f8f10086d3f030deebd53915978f0591f
Component: engine
2015-02-19 14:29:17 -08:00
0385663f68 Merge pull request #10818 from estesp/link-add-aliases
Upstream-commit: 356fe89d2431bd54f38b3477aa91ef276f65ffb7
Component: engine
2015-02-19 17:22:53 -05:00
9a0fe3fe5e Merge pull request #10520 from dmcgowan/v2-registry-fallback-logging
Upstream-commit: a0a27e6a58d7c694bfe6f71ce1ccfc1589373675
Component: engine
2015-02-19 17:20:34 -05:00
c4aef2a226 Add linked container's name and hostname as aliases to /etc/hosts
Currently when containers are linked the alias name (e.g. from `--link
name:alias`) is added to the parent container's `/etc/hosts` with a
reference to the IP of the linked container.  Some software requires
using the official hostname or node name in operations that need to
match on those values, and it is therefore helpful if the parent
container can refer to the child/link using those same values and still
access the same IP.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: 16aa64dc82b6434ec78878fa35eb96e4983b46f8
Component: engine
2015-02-19 14:19:38 -08:00
320f4e4af1 Merge pull request #10852 from Snorch/check-docker-port-is-not-empty
Upstream-commit: ac7bef5e66aa55acc232826ab590149f8e162ad9
Component: engine
2015-02-19 17:18:36 -05:00
caf4b888be Added missing documentation for PR #8543
Added more examples and functionalities for docker ps documentation

Signed-off-by: André Martins <martins@noironetworks.com>
Upstream-commit: 401e93bbb9b4bd682234f0ebca59aa83bfbe3f2e
Component: engine
2015-02-19 22:05:14 +00:00
1a772e99d8 Merge pull request #10555 from duglin/MoreRenamedDockerfileTests
Add more tests around using -f Dockerfile via the CLI
Upstream-commit: 7829e7b40fafdc6bbe4489cf91a01fbf381c73b9
Component: engine
2015-02-19 13:59:35 -08:00
dd3dafec23 fix tomlv because it doesn't read from stdin
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 06685a53c16468a5fd3dfcc247a7a8dd5aaf85c1
Component: engine
2015-02-19 13:18:20 -08:00
0e10254635 Merge pull request #10722 from SvenDowideit/takeover-10710
added -extfile to server certificate documentation
Upstream-commit: ff2f1904c99ee907feb62c646ed1f047a47ac27a
Component: engine
2015-02-19 13:17:17 -08:00
0846fa52ae Merge pull request #10797 from tianon/strict-test-environment
Upstream-commit: d562f94d473a07c3bee84e66dd9cbf60c04ea7fe
Component: engine
2015-02-19 16:14:05 -05:00
b3d291c64f Merge pull request #10835 from jfrazelle/port-ranges
Upstream-commit: 1875cc2ef42787375055710fc6b359ca3dd85752
Component: engine
2015-02-19 16:11:59 -05:00
82000202e2 Merge pull request #10696 from dmcgowan/remove-nonofficial-trust-check
Upstream-commit: 47f60014162d4cc371513352085605cad98f1ed3
Component: engine
2015-02-19 16:09:52 -05:00
5dbf793edd Merge pull request #10751 from estesp/10701-update-ipv6-docs
Update IPv6 docs with modern `ip` command use + `sysctl`
Upstream-commit: 72e66136ee089c607552246b60a4bda677679ace
Component: engine
2015-02-19 12:59:42 -08:00
7eeecba437 Merge pull request #10619 from bcicen/add-logpath-to-inspect-container
Add logpath to inspect container
Upstream-commit: dc37358d8c9b177a050620731cf3b7f247a26f78
Component: engine
2015-02-19 12:56:45 -08:00
ae2aead6a0 Merge pull request #10819 from jsdir/10815-relative-path-fix
Fixed relative filepath check
Upstream-commit: 08544a89ebdb781234fd559230c5cde30da4503b
Component: engine
2015-02-19 12:54:44 -08:00
3ec6def239 Merge pull request #10750 from tianon/cirros-tar
Update cirros.tar.gz handling to be more agnostic of running within the image
Upstream-commit: eefe6c28318d8917c244906c9ae8e554e74decb9
Component: engine
2015-02-19 12:32:09 -08:00
2e1876988b Merge pull request #10866 from docker/shykes-new-docs-maintainers
Add Steve and Mary as docs maintainers
Upstream-commit: 009efd04c1d85004affb0c347696a9fdbeb9d31f
Component: engine
2015-02-19 11:40:33 -08:00
5198061b5e Merge pull request #10881 from shishir-a412ed/cpu-shares-manpage
man page description for `-c/--cpu-shares` flag for `docker run` command.
Upstream-commit: d6660ad605861e781ddbf0fd4228aa565ea7425b
Component: engine
2015-02-19 11:40:04 -08:00
123b13f7ed Merge pull request #10870 from ahmetalpbalkan/win-cli/TestRunSetMacAddress
integration-cli: remove bash dependency from TestRunSetMacAddress
Upstream-commit: 6c3f089fc724b4cec04913f0a049c97adfe6d625
Component: engine
2015-02-19 11:34:14 -08:00
30320ed3ab Merge pull request #10886 from ahmetalpbalkan/win-cli/TestMainHelpWidth-fix
Shorten printed Windows paths on docker help command
Upstream-commit: e3fa8b36c285e564b8541e1d6e07c32cc351edf0
Component: engine
2015-02-19 11:33:50 -08:00
2ad1bfd726 Merge pull request #10875 from ahmetalpbalkan/win-cli/TestCp
integ-cli: Fix path issues in docker cp tests
Upstream-commit: 5456ad2b427ad4e99371b6eaceaf17ab01d1d14d
Component: engine
2015-02-19 11:33:09 -08:00
c1343f737e Merge pull request #10794 from ahmetalpbalkan/win-cli/TestContainerApi-volume-path-fix
integration-cli: Generate unix-style volume paths for tests
Upstream-commit: 47e9f90be13d901c8fd6dfd0d77ec3f5debecada
Component: engine
2015-02-19 11:28:55 -08:00
6f46f00656 Merge pull request #10882 from LK4D4/fix_possible_panic_on_kill
Fix possible panic on killing container
Upstream-commit: d12593601558ca090864b54e1a2e519f6763e2fb
Component: engine
2015-02-19 11:09:31 -08:00
b9f8b5c826 Merge pull request #10901 from rseymour/patch-1
calcuate -> calculate typo fix
Upstream-commit: a4b04544b734a031a482f8697cb634a9394f987d
Component: engine
2015-02-19 10:34:05 -08:00
4f323b8a4b Merge pull request #10883 from md5/bash-completion-rename
Add bash completion for "docker rename"
Upstream-commit: b9cb004c99064700bd19520533dcd402ed8dd84c
Component: engine
2015-02-19 10:13:57 -08:00
2b138a5eaf calcuate -> calculate typo fix
Signed-off-by: Rich Seymour <rseymour@gmail.com>
Upstream-commit: ea8cb16af7e8c83a264a1d1c48db3cacd4cc082b
Component: engine
2015-02-19 12:44:38 -05:00
b3d6568e35 Update IPv6 docs with modern ip command use + sysctl
Fixes: #10701

Updates the IPv6 documentation and images to reflect the more modern
`ip -6` command set versus `route` and `ifconfig`.  Also removes the
use of the special 2002: address range as that is reserved for 6to4
addressing, as well as use of any public address range and re-works the
switched routing example to use 3 subnets of the documentation IPv6
prefix range.

Also conformed all use of addresses to the same doc range per @MalteJ's
commit.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Signed-off-by: Malte Janduda <mail@janduda.net>
Upstream-commit: 95668ed128c77b373bac54b721231bd320fa174d
Component: engine
2015-02-19 09:20:50 -08:00
a45709a819 Shorten printed Windows paths on docker help cmd
This makes use of `%USERPROFILE%` as a substitute for
`~` on Windows and prints shorter strings for default
cert paths etc.

Also removes string escaping/quotes around default
path values printed in `docker help` command as they
are not really necessary and adds double backslashes
(\\) on windows.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 1c9b37cb965be459a93ce07539d7b2a53fbdbc6a
Component: engine
2015-02-18 23:04:56 -08:00