Commit Graph

28791 Commits

Author SHA1 Message Date
2af5a366ad Add --read-only for service create and service update
This fix tries to address the issue raised in 29972 where
it was not possible to specify `--read-only` for `docker service create`
and `docker service update`, in order to have the container's root file
system to be read only.

This fix adds `--read-only` and update the `ReadonlyRootfs` in `HostConfig`
through `service create` and `service update`.

Related docs has been updated.

Integration test has been added.

This fix fixes 29972.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 499a0dd43e50c6f253f8890f5c54ae99675b1e7e
Component: engine
2017-01-30 12:47:26 -08:00
c74a5fc7cf Merge pull request #30186 from thaJeztah/add-version-annotation-to-flags
Add version annotation to various flags added in 1.13
Upstream-commit: a08da82a28848b4857e86b9a493143e9ac3fcee6
Component: engine
2017-01-30 12:33:36 -08:00
cfdc548475 Merge pull request #30545 from justincormack/arm-seccomp
Add two arm specific syscalls to seccomp profile
Upstream-commit: 01e03cb85b9cd77b78db88705780d77cd1c43507
Component: engine
2017-01-30 10:47:09 -08:00
74edba628c Merge pull request #30489 from unclejack/bump_go_to_1.7.5
Dockerfile*: bump Go to 1.7.5
Upstream-commit: a88e529d28266a804e7b32bbce72ee18ececdddb
Component: engine
2017-01-30 10:32:55 -08:00
62197945dc 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 
Upstream-commit: 61b2cda9f58a548bd62ac62c8896cfd7ccac6733
Component: engine
2017-01-30 10:05:52 -08:00
b9e6f00c54 Merge pull request #30548 from yongtang/vendor-swarmkit
Update SwarmKit to 78ae345f449ac69aa741c762df7e5f0020f70275
Upstream-commit: 61198b5ea38eb333d93f5eeebf66df1c820a8abd
Component: engine
2017-01-30 09:41:08 -08:00
abfd1e8fe4 Merge pull request #30534 from allencloud/remove-cli-command-secret-util
remove cli/command/secrets/utils.go
Upstream-commit: 9931cb045da4ad9ca6ec0db89993222a234b8612
Component: engine
2017-01-30 12:28:45 -05:00
d359ab9e02 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>
Upstream-commit: d97a00dfd5ec884a98e087b1fc6e705459ca81e9
Component: engine
2017-01-30 16:23:23 +01:00
e290b2d1c4 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>
Upstream-commit: ecbb0e62f66da7d698c4f4583f36b927d8cfa811
Component: engine
2017-01-30 10:54:06 +01:00
d49013c86c Merge pull request #30522 from gazoo74/fix-make-install
Fix installation using make install
Upstream-commit: 48dd90d3985889ca008faa3b041bf31d2ada95c5
Component: engine
2017-01-30 11:24:02 +09:00
206777c199 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>
Upstream-commit: 2cc2d059ded77c4c5afa6704194cae5bc0c64cf5
Component: engine
2017-01-29 10:57:58 -08:00
8c590c8511 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>
Upstream-commit: 849816dd0fbd70d0e46567fffc7416b667bff9b5
Component: engine
2017-01-29 08:11:26 -08:00
9c368e3cf9 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>
Upstream-commit: d6adcd6a82ba0997fcc123090711b5502da5cbfd
Component: engine
2017-01-29 14:59:45 +00:00
3c805f2872 Remove unnecessary if in parser.Dump
Signed-off-by: Anthony Sottile <asottile@umich.edu>
Upstream-commit: 2283cd020373ebd00e5cf37a81df451349c3b506
Component: engine
2017-01-28 23:07:24 -08:00
3526619d18 remove cli/command/secrets/utils.go
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 51b37a7983435edcd2331571bcb85b2686cbd006
Component: engine
2017-01-29 13:32:49 +08:00
103252f15f Merge pull request #29504 from yongtang/29334-awslogs-CreateLogGroup
Support of CreateLogGroup for awslogs
Upstream-commit: 8820d0aec09a6b93c5d212f46611eb9c714c5317
Component: engine
2017-01-29 01:00:03 +01:00
99ebe18b10 Merge pull request #30527 from continusec/minorformatstring
Fixup use of Error() with format string to use Errorf()
Upstream-commit: 88ab0e0efc7a69813c9e186662f523872c4ea447
Component: engine
2017-01-28 11:28:30 -08:00
4ee2b66de5 add 400 status code for build api
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: c81a818b568e892a7fe37552aff84fbc3736a3a4
Component: engine
2017-01-29 00:07:35 +08:00
fae10cddd0 Fixup use of Error() with format string to use Errorf()
Signed-off-by: Adam Eijdenberg <adam.eijdenberg@gmail.com>
Upstream-commit: 8bad0ab1399ae756995e2d6e65c1945bfb2fbe35
Component: engine
2017-01-28 22:46:56 +11:00
21a0759342 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>
Upstream-commit: 425cd7d1c5c17af5eeebc241d289d81519e748ab
Component: engine
2017-01-27 17:34:38 -05:00
bd156d75a3 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>
Upstream-commit: 4930652c675a45a179aa2c902c003fa86b7c998a
Component: engine
2017-01-27 13:39:26 -08:00
47697dba88 Merge pull request #29218 from yongtang/28884-secret-inspect-follow-up
Move secret name or ID prefix resolving from client to daemon
Upstream-commit: 3c32e1775a174edfc6883a7167326bc91bc2eb24
Component: engine
2017-01-27 13:31:04 -08:00
8e059928f2 Merge pull request #30067 from tophj-ibm/add-more-detailed-install-script-message
add suggestions in failure message in install script
Upstream-commit: 002312d6c1cbf2f9e173f8057a4a868e6fc6ee46
Component: engine
2017-01-27 13:25:34 -08:00
38a091bebe Merge pull request #27783 from epiloque/add-rpm-armhf-centos-7
add rpm builder for ARM CentOS 7
Upstream-commit: 865b3b76521c561f09afadb46574df36f927c85b
Component: engine
2017-01-27 13:18:20 -08:00
c2b8506e34 Merge pull request #27713 from resouer/return-err
return when error happens on listener close
Upstream-commit: 40c51569e2a557e6656ea4314c824fb1eabb2c4e
Component: engine
2017-01-27 12:29:08 -08:00
aca0e65f66 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)
Upstream-commit: 6d1937aa2d803e10124eea5ef68e2e4f89d3b4b3
Component: engine
2017-01-27 12:26:36 -08:00
98bfe1d80f change sh to bash for shopt
Signed-off-by: Jess Frazelle <acidburn@google.com>
Upstream-commit: 026b71087928c89db32b5746f7cbf02589b32416
Component: engine
2017-01-27 12:16:40 -08:00
3d425cdd35 Merge pull request #30256 from Microsoft/jjh/getpidsforcontainer
Windows: Remove GetPidsForContainer old implementation
Upstream-commit: 81cf5a1834aba165f0f5b1dfc86faff6cd02e3b0
Component: engine
2017-01-27 12:12:19 -08:00
1257e4f01b Merge pull request #30006 from mueller-ma/add-names-to-generator
Add names to namesgenerator
Upstream-commit: 023f7f51007705783beeb0d64f49f7cf27996a58
Component: engine
2017-01-27 11:19:19 -08:00
b3cefe89d8 Merge pull request #30508 from albers/plugin-usage-options
Add [OPTIONS] to usage of `plugin disable|push`
Upstream-commit: e55e1841160276589ecbca6d12403bb8104ce7c5
Component: engine
2017-01-27 11:17:08 -08:00
733876ff1e 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>
Upstream-commit: 864b0c2e47e66e1037115b5d7267e641ba776d49
Component: engine
2017-01-27 11:15:17 -08:00
754408c859 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>
Upstream-commit: fa358a87571f9212f91d8fde6696926d76ecca64
Component: engine
2017-01-27 10:40:05 -08:00
45e2da134e Merge pull request #29887 from vdemeester/daemon-extract-stats-collector
Extract daemon statsCollector to its own package
Upstream-commit: cd6a61f1b17830464250406244ed8ef113db8a3c
Component: engine
2017-01-27 10:28:03 -08:00
62b3bbd197 Merge pull request #30090 from wangxing1517/fix-rename-error-when-sid-is-empty
Fix rename error when sid is empty
Upstream-commit: c06a82490400114d8f61670271ce5f84ffc14778
Component: engine
2017-01-27 10:01:50 -08:00
58a26ce2d7 Merge pull request #30478 from mstanleyjones/fix_broken_links
Fix broken relative links in old API docs
Upstream-commit: 05d4c1314efd6b2ce408734aeece0e73f5d278f0
Component: engine
2017-01-27 09:45:52 -08:00
a8d9877163 Merge pull request #28304 from ijc25/jsonmessage-use-terminfo
use terminfo in pkg/jsonmessage
Upstream-commit: 2c948ac3e6b3b1440c5583cfa9d2c581e96280eb
Component: engine
2017-01-27 09:29:18 -08:00
3fde96c14f Merge pull request #30473 from albers/completion-plugins-format
Use native call for listing plugins in bash completion
Upstream-commit: fa5e0973ecf8c84a9cc5b4d920c3b564ce97b2f0
Component: engine
2017-01-27 18:05:07 +01:00
0a060e99f3 Merge pull request #30468 from ralphtheninja/master
update api docs on Placement.Constraints for services
Upstream-commit: 0b47ca43397f03d7cf2c77a4d3d96748f694592d
Component: engine
2017-01-27 17:43:46 +01:00
fadc588fd6 Merge pull request #30344 from cpuguy83/refactor_attach
Refactor attach
Upstream-commit: 77ec3aa8f295ef1e85b1ad8a2ea54f8acbf77e97
Component: engine
2017-01-27 07:35:44 -08:00
7e2571b991 Add [OPTIONS] to usage of plugin disable|push
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: aad095f573e99b69366f46d6da5bc6536f4237f1
Component: engine
2017-01-27 16:17:02 +01:00
def8cc7670 Merge pull request #30493 from sanimej/netv
Vendoring libnetwork @e8431956
Upstream-commit: 3daa8ad5e3789fbbeedc7d892b9203555b7d575b
Component: engine
2017-01-27 11:24:29 +01:00
dcf554f4c7 Merge pull request #28634 from ghostplant/check_cfg_memsw
Checking whether CG_MEM_SWAP is enabled at the moment.
Upstream-commit: e2de2123399f494cb41a4cb62392999c80c2e99c
Component: engine
2017-01-27 10:49:32 +01:00
0ddcabf8da Fix json format of plugin
Signed-off-by: Janonymous <janonymous.codevulture@gmail.com>
Upstream-commit: 2d24dbe896b33ab2b450ace457b0e266b27dfd74
Component: engine
2017-01-27 09:32:19 +03:00
c0d224023d Vendoring libnetwork @e8431956
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
Upstream-commit: 03ab20291b255662708b4932df60e7b483dc2b8e
Component: engine
2017-01-26 18:08:18 -08:00
1a024c5e04 Merge pull request #30157 from aboch/att
Remove attachable network on swarm leave
Upstream-commit: 43544cf2b4752e56066242ef71d06558f233fbc7
Component: engine
2017-01-26 17:03:23 -08:00
b3f0aa463e Dockerfile*: bump Go to 1.7.5
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: b6e2703230c9262b14df22d4a865f140a897740d
Component: engine
2017-01-27 02:14:36 +02:00
59a5f47eb6 Merge pull request #29835 from yongtang/29810-btrfs-rescan
Run btrfs rescan only if userDiskQuota is enabled
Upstream-commit: 93e322f5be3b1c00e8e085a510f2a8194f7bedc5
Component: engine
2017-01-26 15:55:51 -08:00
e827bea430 Merge pull request #30144 from dnephin/add-secrets-to-stack-deploy
Add secrets to stack deploy
Upstream-commit: 5706d8206bd41fca36ed634f80fe85f5ffbed71b
Component: engine
2017-01-26 14:54:04 -08:00
189d700cd2 Merge pull request #30438 from albers/completion-windows-specific
Add windows specific bash completion for `docker run|create|build`
Upstream-commit: cd7f3e7f9ae6e551a824c057f0f48e1d7e8706f6
Component: engine
2017-01-26 14:25:35 -08:00
2e5c358a33 Merge pull request #29428 from rhatdan/selinux
We need to fix labels if the user requests on volumes
Upstream-commit: 541150da53ea84b0fb86342bfd3e32483e2018ca
Component: engine
2017-01-26 11:47:14 -08:00