Commit Graph
22634 Commits
Author SHA1 Message Date
Roma Sokolov ab9a1b760e Add newlines to FormatProgress for JSON as well
Commit 060da572d20dfeee4fe02ce6b975a6cb33e50dbe has introduced newlines
to streamformatter to help parse Remote API responses. However,
FormatProgress method was omitted from the list of patched methods,
leaving progress messages in, say, /images/create without newlines.

Signed-off-by: Roma Sokolov <sokolov.r.v@gmail.com>
Upstream-commit: e98b8e08575d28e4cc15fbd64111c42b86841e4c
Component: engine
2015-10-28 12:58:47 +00:00
Zuhayr Elahi 870fa4ea2c modified docker_cli_kill_test.go to use c.Asserts
Signed-off-by: Zuhayr Elahi <elahi.zuhayr@gmail.com>
Upstream-commit: d0762a60e01339235917007fd48722ce5390ed71
Component: engine
2015-10-27 21:18:26 -07:00
Jess Frazelle 72e420120c Merge pull request #17418 from diogomonica/bump-go-1.5
Bump go 1.5
Upstream-commit: 96a6e810de0bfabe6cc59588f237470810703656
Component: engine
2015-10-27 20:12:43 -07:00
Lei Jitang 62616f762f Fix docker inspect display odd gateway value for none network mode
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 7fa601adc7858606630dec5b037e60b8955e716d
Component: engine
2015-10-27 21:47:12 -04:00
Jess Frazelle 238006044d Merge pull request #17423 from cpuguy83/so_sensitive
Revert "dockerversion placeholder for library-import"
Upstream-commit: b227d19cae34d6d0ce92b72a53f02330b0be5992
Component: engine
2015-10-27 18:32:18 -07:00
Brian Goff cc55863497 Revert "dockerversion placeholder for library-import"
This reverts commit d5cd032a86617249eadd7142227c5355ba9164b4.

Commit caused issues on systems with case-insensitive filesystems.
Revert for now

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: b78ca243d9fc25d81c1b50008ee69f3e71e940f6
Component: engine
2015-10-27 21:23:53 -04:00
Qiang Huang ff53341015 Bump bolt to v1.1.0
It adds ARM64, ppc64le, s390x, solaris support, and a bunch of
bugfixs.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: a41917c2c88bd7f694d141ac67f4a194aaa16fa1
Component: engine
2015-10-28 08:49:45 +08:00
Dong Chen 76053edbd7 extract docker volume API from local
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
Upstream-commit: 9862a4b43ec6236305f6b57274c6edd61dad96b7
Component: engine
2015-10-27 17:28:19 -07:00
Tibor Vass 50ef9e9aba Merge pull request #17422 from calavera/inspect_networks_docs
Update inspect api examples with new network settings.
Upstream-commit: 94811ae814ddce67b623d35ef44dcf276629442f
Component: engine
2015-10-27 20:09:54 -04:00
David Calavera fbb5f4e19f Merge pull request #17393 from tiborvass/carry-17360
Carry Fix docker inspect container only reports last assigned information
Upstream-commit: 9ab71b68af5b340373411e26e679c6e7506ce167
Component: engine
2015-10-27 17:00:41 -07:00
David Calavera 28eb09ab06 Update inspect api examples with new network settings.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 9a7e632cf097b71aab6e46ef010d038f602e03d3
Component: engine
2015-10-27 19:56:29 -04:00
Brian Goff 1cfc0cf7f6 Merge pull request #17373 from Microsoft/10662-volumetests
Windows: Volume integration tests
Upstream-commit: 2266462f724492d3802d7043723347adeb18024e
Component: engine
2015-10-27 19:52:11 -04:00
Samuel Karp 069f98c935 [awslogs] Auto-detect region on EC2 instances
Signed-off-by: Samuel Karp <skarp@amazon.com>
Upstream-commit: 8a6dfb26f30331231839c420f8cf8889c9ef35a8
Component: engine
2015-10-27 23:47:28 +00:00
Samuel Karp 32f8320544 [awslogs] Set User-Agent for Amazon CloudWatch Logs
Signed-off-by: Samuel Karp <skarp@amazon.com>
Upstream-commit: 480c9c01784d65a46f6ba62e8176e9b2a6a3feab
Component: engine
2015-10-27 23:47:19 +00:00
Samuel Karp 2e7de41d92 Update vendored aws-sdk-go
Signed-off-by: Samuel Karp <skarp@amazon.com>
Upstream-commit: 70083e6fc3a7f64755fcf4752e6d24758bdd0543
Component: engine
2015-10-27 23:43:51 +00:00
David Calavera 6c30abdc61 Extract network settings types for inspect.
Keeping backwards compatibility.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 25682577c9d29b325b4b615c4b88c132a4640082
Component: engine
2015-10-27 19:16:21 -04:00
Sebastiaan van Stijn 3babd01129 Merge pull request #16017 from flowlo/master
docs: Explain volume_name in POST /container Binds
Upstream-commit: b96e076af9478f37c5efd3f56e5f0aa42c846b66
Component: engine
2015-10-27 23:28:47 +01:00
David Calavera d0602d1990 Merge pull request #17401 from hugomarisco/patch-1
update gpg add key command, without sudo it fails
Upstream-commit: 1156b7ff66c749814535008e66149a6027dc9a36
Component: engine
2015-10-27 15:16:27 -07:00
Nathan Williams ff3d7b63c1 fix oracle/rhel install docs
Signed-off-by: Nathan Williams <nath.e.will@gmail.com>
Upstream-commit: 258bbdb57e0388309491733fa135b041dd2f2f74
Component: engine
2015-10-27 15:12:15 -07:00
Nathan Williams 215d5fcb41 fix fedora install docs
Signed-off-by: Nathan Williams <nath.e.will@gmail.com>
Upstream-commit: 6ff8b32bff5a7748cfa41618f7688856c29dd749
Component: engine
2015-10-27 15:11:43 -07:00
Nathan Williams e9864fc636 fix docs for cent repo setup
Signed-off-by: Nathan Williams <nath.e.will@gmail.com>
Upstream-commit: c6e1d982666bbf37da746975c5ba7511ea9c98a1
Component: engine
2015-10-27 15:10:45 -07:00
Jessica Frazelle 99471f9ab2 update to binaries, fix parsers package, non-parallel test unit
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 9bcbb39fa8b91ceb54c3da7b245e79b56de1cb6b
Component: engine
2015-10-27 14:43:25 -07:00
Brian Goff a3a7b41a5a Merge pull request #17382 from jecarey/16765-docker_cli_images_test
Use of checkers on docker_cli_images_test.go
Upstream-commit: 1c8ee617d164fec5da15d274516dc5131bcd41dd
Component: engine
2015-10-27 17:25:45 -04:00
David Calavera 9cd08e6796 Merge pull request #17350 from vdemeester/11699-auto-libraryimport
dockerversion placeholder for library-import
Upstream-commit: 6276c676a897ab8a4c7fdcd78d18c8fc3a761707
Component: engine
2015-10-27 13:39:40 -07:00
Alexandre Beslic 95c227e717 Merge pull request #17364 from mavenugo/advertise
Enhancing --cluster-advertise to support <interface-name>
Upstream-commit: 85ae8b034a5bf9428dbcc7cfd94c55739eaf2862
Component: engine
2015-10-27 13:29:18 -07:00
David Calavera af90e68a88 Merge pull request #17405 from LK4D4/cont_pointer
Return pointer from newBaseContainer
Upstream-commit: 82f70677b99e7d30c63d40658b36b0c5373cadba
Component: engine
2015-10-27 13:27:10 -07:00
James Carey 46ab4a1920 Use of checkers on docker_cli_images_test.go
Signed-off-by: James Carey <jecarey@us.ibm.com>
Upstream-commit: 5814d67f9850e5eff9d6beb24b2b9dde89ee7381
Component: engine
2015-10-27 15:26:38 -05:00
Lei Jitang c2f87fdd0e Fix docker inspect container only reports last assigned information
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 1b9a08e719776e53b7aea1a89c2c29fbf27b1ae4
Component: engine
2015-10-27 16:26:06 -04:00
David Calavera 64556fe044 Merge pull request #17406 from LK4D4/ent_and_args_simple
Simplify getEntrypointAndArgs
Upstream-commit: 2b1b7823e61d9d14064708d37a56275ee7385bd2
Component: engine
2015-10-27 13:24:59 -07:00
moxiegirl 17762bddf9 Merge pull request #17161 from moxiegirl/commands-network
Updating network commands: adding man pages
Upstream-commit: bf9f2691ca6bf19d81b43c2faa37fbad89b68672
Component: engine
2015-10-27 13:22:30 -07:00
David Calavera edfe664f0f Merge pull request #17390 from sanimej/libn
Vendor in libnetwork changes to support container rename
Upstream-commit: 64854277f87d5f5d1f79db340ecb0b82d82f1865
Component: engine
2015-10-27 13:21:15 -07:00
Tibor Vass c7cd2c91a7 Merge pull request #17230 from aboch/ae
Do not update etc/hosts file for every container
Upstream-commit: 194b64951a19ef6254422891cc9ff191ed2567cd
Component: engine
2015-10-27 16:14:44 -04:00
Vincent Demeester 4d261096ec dockerversion placeholder for library-import
- Move autogen/dockerversion to version
- Update autogen and "builds" to use this package and a build flag

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: d5cd032a86617249eadd7142227c5355ba9164b4
Component: engine
2015-10-27 20:36:07 +01:00
David Calavera b99deef664 Merge pull request #17408 from jfrazelle/dnf-fedora-builds
update dockerfile to use dnf because i hate the warning
Upstream-commit: eec5e675615816138564b82a7b2ebbda69b67749
Component: engine
2015-10-27 11:04:08 -07:00
Madhu Venugopal 8ad5b6fcfd Enhancing --cluster-advertise to support <interface-name>
--cluster-advertise daemon option is enahanced to support <interface-name>
in addition to <ip-address> in order to amke it  automation friendly using
docker-machine.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 3e7db73b99498d037b43eb59972a6360cfbc971b
Component: engine
2015-10-27 11:03:22 -07:00
unclejack e7265101a5 Dockerfile: bump Go to 1.5
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: 42dcc4f3b5e0ddd2042a75c5d3f3c610d7e839c1
Component: engine
2015-10-27 10:56:49 -07:00
Jessica Frazelle e752bdf012 update dockerfile to use dnf because i hate the warning
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: b8891a32d13724bb992d9e8aca4777a32334371e
Component: engine
2015-10-27 10:25:39 -07:00
Alexander Morozov 33a72eeb51 Simplify getEntrypointAndArgs
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 5f6d27cebaec3d2e9e72579c91591aea5bcb6966
Component: engine
2015-10-27 09:36:11 -07:00
Alexander Morozov b9824763f3 Return pointer from newBaseContainer
It makes code more consistent.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 6d9bb99c97438edc996e51e13a0aca0feabc5d26
Component: engine
2015-10-27 09:05:28 -07:00
Mary Anthony 00621ae8e2 Updating network commands: adding man pages
Adding Related information blocks
Final first draft pass: ready for review
Review comments
Entering comments from the gang
Updating connect to include paused

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: d5364c71140208e1b861625e6394a5623e878e34
Component: engine
2015-10-27 08:29:07 -07:00
Sebastiaan van Stijn 922b28a2df Merge pull request #17394 from azurezk/doc
"docker --log-driver=XXX" in reference missing 'daemon'
Upstream-commit: b6fa541877bf9b0cedfb8861c0807d84146728df
Component: engine
2015-10-27 15:41:43 +01:00
Hugo Marisco 232998cce7 update gpg add key command, without sudo it fails
Signed-off-by: Hugo Marisco <0x6875676f@gmail.com>
Upstream-commit: 7f7953dcc27206acc31bfdef56f7471017640b70
Component: engine
2015-10-27 13:49:52 +00:00
Brian Goff cac8969eb3 Merge pull request #17396 from sdurrheimer/zsh-completion-fix-missing-double-quote
Fix missing double quote in zsh completion
Upstream-commit: ebf8ca9a67bb5b3e54ac0fe4144c395f96f2f497
Component: engine
2015-10-27 09:19:59 -04:00
Steve Durrheimer 9c9f207191 Fix missing double quote in zsh completion
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: e46445e844bca26775f88b3075d227f8e867a22a
Component: engine
2015-10-27 10:50:45 +01:00
Kun Zhang a589faa95d command missing 'daemon'
Signed-off-by: Kun Zhang <zkazure@gmail.com>
Upstream-commit: 9b0d0a64fa92afc94617dbf38db980e415871d33
Component: engine
2015-10-27 16:22:09 +08:00
Shijiang Wei 022782c7fa refacter attach API tests to use checkers
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
Upstream-commit: 4f6f46a11d9a8588d1e21f5cb543bb9c7181fec3
Component: engine
2015-10-27 16:20:06 +08:00
Tibor Vass 2dad2ae0d3 Merge pull request #17389 from tonistiigi/15995-duplicate-names
Fix duplicate container names conflict
Upstream-commit: b72a431928d6389727d07235bc4d5a7b22403a53
Component: engine
2015-10-27 02:42:50 -04:00
Alessandro Boch 3ad728d9e8 Do not update etc/hosts for every container
- Only user named containers will be published into
  other containers' etc/hosts file.
- Also block linking to containers which are not
  connected to the default network

Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 4f6f00e1916a8c58e67c8118d015988d86718d19
Component: engine
2015-10-26 20:08:57 -07:00
Sebastiaan van Stijn 8832da6b74 Merge pull request #17124 from vincentbernat/fix/zsh-option-stacking
zsh: enable option stacking
Upstream-commit: b92fd9ff0499deb7303557ef8163f0661361a8c0
Component: engine
2015-10-27 01:39:04 +01:00
David Calavera 7c4b8bccf9 Merge pull request #17381 from mavenugo/rc3v1
Vendoring in libnetwork with fixes for issues identified in RC1 & RC2
Upstream-commit: 91de5ddf1896347c05f5292b8a0de0fbad3e4ce2
Component: engine
2015-10-26 17:06:01 -07:00