Commit graph

30607 commits

Author SHA1 Message Date
allencloud
1d1362bdb2 sort volume drivers and auth plugins in info response
Signed-off-by: allencloud <allen.sun@daocloud.io>
2017-02-01 12:01:49 +08:00
Vincent Demeester
9c94fa4563 Merge pull request #30582 from shin-/fix-network-prune-swagger-typo
Fix typo in swagger.yaml for NetworkPrune operation
2017-01-31 11:27:47 +01:00
Vincent Demeester
b61fe846b1 Merge pull request #30510 from albers/completion-swarm-logs
Add bash completion for `docker service logs`
2017-01-31 11:10:48 +01:00
Vincent Demeester
c0a1d2e0d8 Merge pull request #30117 from msabansal/natfix
Added support for dns-search and fixes #30102
2017-01-31 11:05:29 +01:00
Joffrey F
20c5fa3758 Fix typo in swagger.yaml for NetworkPrune operation
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-30 18:25:39 -08:00
Sebastiaan van Stijn
a51c17f90b Merge pull request #30576 from vieux/more_rebuild_labels
add powerpc and z to rebuild labels
2017-01-30 18:11:04 -08:00
Alexander Morozov
cdc79c54ec Merge pull request #28968 from darrenstahlmsft/TestEventsLimit
Limit TestEventsLimit to 4 concurrent containers on Windows
2017-01-30 15:09:54 -08:00
Victor Vieux
8304f30271 add powerpc and z to rebuild labels
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-01-30 14:54:17 -08:00
Tianon Gravi
1202592f6e Merge pull request #30480 from flx42/install-debian-stretch-support
install: map debian_version 9.X to debian stretch
2017-01-30 13:59:44 -08:00
Alexander Morozov
3e6712a6ef Merge pull request #30521 from dnephin/cleanup-compose-loader
`cli/compose` cleanup - remove the old loading system
2017-01-30 13:55:23 -08:00
Vincent Demeester
04f0e616f2 Merge pull request #30542 from skabashnyuk/master
Fixes work of inspectResponse in case of ContentLength=-1
2017-01-30 22:54:49 +01:00
Alexander Morozov
a08da82a28 Merge pull request #30186 from thaJeztah/add-version-annotation-to-flags
Add version annotation to various flags added in 1.13
2017-01-30 12:33:36 -08:00
Darren Stahl
2ec808ec08 Limit TestEventsLimit to 4 concurrent containers on Windows
Signed-off-by: Darren Stahl <darst@microsoft.com>
2017-01-30 11:04:52 -08:00
Tibor Vass
01e03cb85b Merge pull request #30545 from justincormack/arm-seccomp
Add two arm specific syscalls to seccomp profile
2017-01-30 10:47:09 -08:00
Tibor Vass
a88e529d28 Merge pull request #30489 from unclejack/bump_go_to_1.7.5
Dockerfile*: bump Go to 1.7.5
2017-01-30 10:32:55 -08:00
Tõnis Tiigi
61b2cda9f5 Merge pull request #27083 from RobSkye/25935-show-apparmor-default-profile-in-docker-inspect
Docker inspect "AppArmorProfile" field now shows "docker-default" when AppArmor is enabled and no other profile was defined
2017-01-30 10:05:52 -08:00
Alexander Morozov
61198b5ea3 Merge pull request #30548 from yongtang/vendor-swarmkit
Update SwarmKit to 78ae345f449ac69aa741c762df7e5f0020f70275
2017-01-30 09:41:08 -08:00
Daniel Nephin
9931cb045d Merge pull request #30534 from allencloud/remove-cli-command-secret-util
remove cli/command/secrets/utils.go
2017-01-30 12:28:45 -05:00
Daniel Nephin
d542f3e57c Merge pull request #30246 from vdemeester/integration-remove-utils
[test-integration] Remove most of the runCommandWithOutput
2017-01-30 10:37:51 -05:00
ROBERTO MUÑOZ
d97a00dfd5 Added an apparmorEnabled boolean in the Daemon struct to indicate if AppArmor is enabled or not. It is set in NewDaemon using sysInfo information.
Signed-off-by: Roberto Muñoz Fernández <robertomf@gmail.com>

Added an apparmorEnabled boolean in the Daemon struct to indicate if AppArmor is enabled or not. It is set in NewDaemon using sysInfo information.

Signed-off-by: Roberto Muñoz Fernández <robertomf@gmail.com>

gofmt'd

Signed-off-by: Roberto Muñoz Fernández <robertomf@gmail.com>

change the function name to something more adequate and changed the behaviour to show empty value on an apparmor disabled system.

Signed-off-by: Roberto Muñoz Fernández <robertomf@gmail.com>

go fmt

Signed-off-by: Roberto Muñoz Fernández <robertomf@gmail.com>
2017-01-30 16:23:23 +01:00
Vincent Demeester
ecbb0e62f6 Remove most of the runCommandWithOutput from integration tests
There is 5 calls left, that use StdinPipe that is not yet supported by
icmd.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-01-30 10:54:06 +01:00
Sergii Kabashniuk
28d59e57ca Added test for the case if ContentLength = -1
Signed-off-by: Sergii Kabashniuk <skabashnyuk@codenvy.com>
2017-01-30 10:05:05 +02:00
Harald Albers
105231556a Add bash completion for docker service logs
Signed-off-by: Harald Albers <github@albersweb.de>
2017-01-29 22:29:07 -08:00
Akihiro Suda
48dd90d398 Merge pull request #30522 from gazoo74/fix-make-install
Fix installation using make install
2017-01-30 11:24:02 +09:00
Akihiro Suda
14b9562c48 Merge pull request #30540 from asottile/unnecessary_if
Remove unnecessary if in builder/dockerfiles/parser Dump
2017-01-30 11:18:10 +09:00
Yong Tang
2cc2d059de Update TestSwarmNetworkPlugin test
This commit updates TestSwarmNetworkPlugin, similiar to
changes in https://github.com/docker/docker/pull/30332

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2017-01-29 10:57:58 -08:00
Sergii Kabashniuk
22a9ec009b Fixes work of inspectResponse in case of ContentLength=-1
Signed-off-by: Sergii Kabashniuk <skabashnyuk@codenvy.com>
2017-01-29 20:48:07 +02:00
Yong Tang
849816dd0f Update SwarmKit to 78ae345f449ac69aa741c762df7e5f0020f70275
This fix updates SwarmKit to 78ae345f449ac69aa741c762df7e5f0020f70275
(from 037b4913929019d44bc927870bf2d92ce9ca261f)

The following issues in docker are related
- Can not update service in host publish mode (#30199) (fixed)
- Add `ReadonlyRootfs` in ContainerSpec for `--read-only` (#29972) (needed)
- Explicitly disallow network pluginv1 creation in swarm mode
  (See discussion in docker/swarmkit/pull/1899, docker/swarmkit/pull/1894,
  and docker/docker/pull/30332#issuecomment-274277948)

This fix fixes #30199

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2017-01-29 08:11:26 -08:00
Justin Cormack
d6adcd6a82 Add two arm specific syscalls to seccomp profile
These are arm variants with different argument ordering because of
register alignment requirements.

fix #30516

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-29 14:59:45 +00:00
Anthony Sottile
2283cd0203 Remove unnecessary if in parser.Dump
Signed-off-by: Anthony Sottile <asottile@umich.edu>
2017-01-28 23:07:24 -08:00
allencloud
51b37a7983 remove cli/command/secrets/utils.go
Signed-off-by: allencloud <allen.sun@daocloud.io>
2017-01-29 13:32:49 +08:00
Sebastiaan van Stijn
8820d0aec0 Merge pull request #29504 from yongtang/29334-awslogs-CreateLogGroup
Support of CreateLogGroup for awslogs
2017-01-29 01:00:03 +01:00
Brian Goff
88ab0e0efc Merge pull request #30527 from continusec/minorformatstring
Fixup use of Error() with format string to use Errorf()
2017-01-28 11:28:30 -08:00
Sebastiaan van Stijn
011a4087bd Merge pull request #30533 from allencloud/add-40x-for-build-api
add 400 status code for build api
2017-01-28 17:32:30 +01:00
allencloud
c81a818b56 add 400 status code for build api
Signed-off-by: allencloud <allen.sun@daocloud.io>
2017-01-29 00:07:35 +08:00
Adam Eijdenberg
8bad0ab139 Fixup use of Error() with format string to use Errorf()
Signed-off-by: Adam Eijdenberg <adam.eijdenberg@gmail.com>
2017-01-28 22:46:56 +11:00
Gaël PORTAY
425cd7d1c5 Fix installation using make install
The following command fails when the target directory does not exist.

	$ sudo make install DOCKER_MAKE_INSTALL_PREFIX=/opt/docker AUTO_GOPATH=1
	KEEPBUNDLE=1 hack/make.sh install-binary
	# WARNING! I don't seem to be running in a Docker container.
	# The result of this command might be an incorrect build, and will not be
	# officially supported.
	#
	# Try this instead: make all
	#

	---> Making bundle: install-binary (in bundles/1.14.0-dev/install-binary)
	Installing docker to /opt/docker/bin/
	cp: cannot create regular file '/opt/docker/bin/': No such file or directory
	make: *** [Makefile:119: install] Error 1

The patch installs the target directory before copying any binaries.

	$ sudo make install DOCKER_MAKE_INSTALL_PREFIX=/opt/docker AUTO_GOPATH=1
	KEEPBUNDLE=1 hack/make.sh install-binary
	# WARNING! I don't seem to be running in a Docker container.
	# The result of this command might be an incorrect build, and will not be
	# officially supported.
	#
	# Try this instead: make all
	#

	---> Making bundle: install-binary (in bundles/1.14.0-dev/install-binary)
	Installing docker to /opt/docker/bin/
	Installing dockerd to /opt/docker/bin/
	Installing docker-runc to /opt/docker/bin/
	Installing docker-containerd to /opt/docker/bin/
	Installing docker-containerd-ctr to /opt/docker/bin/
	Installing docker-containerd-shim to /opt/docker/bin/
	Installing docker-proxy to /opt/docker/bin/
	Installing docker-init to /opt/docker/bin/

Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com>
2017-01-27 17:34:38 -05:00
Daniel Nephin
daaeeafa7a Remove the old loading system from compose config loading
The original Compose config loading used the `compose` tag, which
was replaced by mapstructure. Some fields were left on the old tag. This
commit removes the old tag and uses types and mapstructure.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-01-27 17:03:41 -05:00
Yong Tang
4930652c67 Update bash and zsh completion for aws-create-group
This commit updates bash and zsh completion for aws-create-group.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2017-01-27 13:39:26 -08:00
Alexander Morozov
3c32e1775a Merge pull request #29218 from yongtang/28884-secret-inspect-follow-up
Move secret name or ID prefix resolving from client to daemon
2017-01-27 13:31:04 -08:00
Alexander Morozov
002312d6c1 Merge pull request #30067 from tophj-ibm/add-more-detailed-install-script-message
add suggestions in failure message in install script
2017-01-27 13:25:34 -08:00
Alexander Morozov
865b3b7652 Merge pull request #27783 from epiloque/add-rpm-armhf-centos-7
add rpm builder for ARM CentOS 7
2017-01-27 13:18:20 -08:00
Alexander Morozov
40c51569e2 Merge pull request #27713 from resouer/return-err
return when error happens on listener close
2017-01-27 12:29:08 -08:00
Tianon Gravi
6d1937aa2d Merge pull request #30519 from jessfraz/shopt
Adjust "nuke-graph-directory.sh" shebang to be explicitly Bash (includes a Bashism as of https://github.com/docker/docker/pull/27869)
2017-01-27 12:26:36 -08:00
Jess Frazelle
026b710879
change sh to bash for shopt
Signed-off-by: Jess Frazelle <acidburn@google.com>
2017-01-27 12:16:40 -08:00
Alexander Morozov
81cf5a1834 Merge pull request #30256 from Microsoft/jjh/getpidsforcontainer
Windows: Remove GetPidsForContainer old implementation
2017-01-27 12:12:19 -08:00
Alexander Morozov
023f7f5100 Merge pull request #30006 from mueller-ma/add-names-to-generator
Add names to namesgenerator
2017-01-27 11:19:19 -08:00
Victor Vieux
e55e184116 Merge pull request #30508 from albers/plugin-usage-options
Add [OPTIONS] to usage of `plugin disable|push`
2017-01-27 11:17:08 -08:00
Yong Tang
864b0c2e47 Support of CreateLogGroup for awslogs
This fix tries to address the issue raised in 29344 where it was
not possible to create log group for awslogs (CloudWatch) on-demand.
Log group has to be created explicitly before container is running.

This behavior is inconsistent with AWS logs agent where log groups
are always created as needed.

There were several concerns previously (See comments in 19617 and 29344):
1. There is a limit of 500 log groups/account/region so resource might
be exhausted if there is any typo or incorrect region.
2. Logs are generated for every container so CreateLogGroup (or equally,
DescribeLogGroups) might be called every time, which is redundant and
potentially surprising.
3. CreateLogStream and CreateLogGroup have different IAM policies.

This fix addresses the issue by add `--log-opt awslogs-create-group`
which by default is `false`. It requires user to explicitly request
that log groups be created as needed.

Related unit test has been updated. And tests have also been done
manually in AWS.

This fix fixes 29334.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2017-01-27 11:15:17 -08:00
Yong Tang
fa358a8757 Move secret name or ID prefix resolving from client to daemon
This fix is a follow up for comment:
https://github.com/docker/docker/pull/28896#issuecomment-265392703

Currently secret name or ID prefix resolving is done at the client
side, which means different behavior of API and CMD.

This fix moves the resolving from client to daemon, with exactly the
same rule:
- Full ID
- Full Name
- Partial ID (prefix)

All existing tests should pass.

This fix is related to #288896, #28884 and may be related to #29125.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2017-01-27 10:40:05 -08:00