Commit Graph

19622 Commits

Author SHA1 Message Date
98eaf4874e Merge pull request #18941 from dnephin/runconfig_in_cli
Move runconfig/parse.go into the runconfig/opts package
Upstream-commit: dc4ca0e89785a93faffeb8736dcb14e3e1769ae8
Component: engine
2016-01-04 11:06:18 -08:00
8b7715407a Merge pull request #19054 from calavera/remove_version_from_types
Remove version package from API types.
Upstream-commit: 972653c310a400a26b8c618288b2c0a328af4c5e
Component: engine
2016-01-04 10:54:47 -08:00
65930d6983 Merge pull request #19002 from jfrazelle/update-test-images
cleanup test images
Upstream-commit: fa57eedff409edb7a4ad926b365213a944a97954
Component: engine
2016-01-04 10:24:30 -08:00
5b8857958e Remove version package from API types.
It's an internal type that only extends string.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 9961816adead89622f5d4201a0b5cb33845fa852
Component: engine
2016-01-04 12:51:45 -05:00
7bea2a5a61 Move volume.SplitN() to the one place it is used in runconfig.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: c5a2fdb697e403af228a68d08c68d17d347f6cf3
Component: engine
2016-01-04 12:06:30 -05:00
c43ba74b61 Move the runconfig.Parse() function into the runconfig/opts package.
The parse.go file is used almost exclusively in the client. The few small
functions that are used outside of the client could easily be copied out
when the client is extracted, allowing this runconfig/opts package to
move to the client.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 2b7ad47bd2649c3f164e8b57b31fae313045c8f4
Component: engine
2016-01-04 12:06:29 -05:00
29d22b9aad Move ParseExec to the client where it is used.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 4c0d586bd3a1b81cfba78af89af02be56041bc6b
Component: engine
2016-01-04 12:06:29 -05:00
b1b6046ba2 Merge pull request #18499 from thaJeztah/fix-run-reference-example
Fix pid=host example in documentation
Upstream-commit: 0fae65e228d29c8f8dd25e29a61eaa0922e13d1d
Component: engine
2016-01-04 08:51:02 -08:00
fff1179c45 Merge pull request #19048 from thaJeztah/update-configuring-docker
docs: update configuring docker for systemd
Upstream-commit: 822a80868801966f2a6664cdc3c9365a0536dc63
Component: engine
2016-01-04 08:46:45 -08:00
7489ecd35e Fix pid=host example in documentation
The existing example didn't illustrate how to
install strace in the container. In addition,
the rhel7 image used is no longer public (and maintained)
so not a good image to use in the example.

This updates the example to use htop (strace is
not working without disabling apparmor for the container)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 9b6592ca858a23376b838e9808d7fa3f15ebc381
Component: engine
2016-01-04 16:25:54 +01:00
eee47109fa Merge pull request #19033 from cr7pt0gr4ph7/19032-fix-native-execdriver-compile-error
Fix declarations of of execdriver/native.NewDriver to have the same signature for all platforms
Upstream-commit: 0fff66977a5f4245aedc780acde319a587e945a7
Component: engine
2016-01-04 10:22:10 -05:00
d68e62b901 docs: update configuring docker for systemd
Ubuntu 15.04 and above uses systemd. Add a note
in the docs to point users to the right instructions.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 59301e018ce7933c86c9874c209802acdb170d69
Component: engine
2016-01-04 15:26:55 +01:00
1162375d21 Merge pull request #15666 from vdemeester/3519-configurable-escape
Implement configurable escape key for attach/exec
Upstream-commit: db738dd77f699e93f976441d5fc11ab48a2d6c68
Component: engine
2016-01-04 00:49:07 +01:00
5582f5eb83 Implement configurable detach key
Implement configurable detach keys (for `attach`, exec`, `run` and
`start`) using the client-side configuration

- Adds a `--detach-keys` flag to `attach`, `exec`, `run` and `start`
  commands.
- Adds a new configuration field (in `~/.docker/config.json`) to
  configure the default escape keys for docker client.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 15aa2a663b47b6126a66efefcadb64edfbffb9f5
Component: engine
2016-01-03 23:03:39 +01:00
32d7540e6a Creating a man page for the configuration file
Signed-off-by: Mary Anthony <mary@docker.com>

Adding comments. Fixing bit in daemon

Signed-off-by: Mary Anthony <mary@docker.com>

Arrrgggh

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 32b5f71f0d9e997bcbc28cc450b23aa70e445bfa
Component: engine
2016-01-03 13:23:18 -08:00
c32d38aa18 Merge pull request #18387 from wenchma/18385-improve_help_msg
Improvement for docker subcommand's help messages
Upstream-commit: 9d6c2196b54a20cef3ede074d521ccb6bdabbe63
Component: engine
2016-01-03 12:19:53 +01:00
d07a95279c Merge pull request #19035 from albers/completion-authorization-plugins
Compute plugin list in bash completion for `docker daemon --authz-plugin`
Upstream-commit: 29da9903d4bccb19a9f26322f031374583f8bf4f
Component: engine
2016-01-02 18:21:19 -08:00
2a9f1ff856 Merge pull request #19036 from calavera/thank_you_ian
Thanks for everything Ian.
Upstream-commit: 233787040c6441b8c8eac5bc4802332babf2eb6d
Component: engine
2016-01-02 21:21:03 -05:00
43528a656a Add Ian Murdock to the names generator.
❤️ 😢

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: e11ebfcb0984225690dccc1e644712a80bae2dec
Component: engine
2016-01-02 19:17:17 -05:00
c4ab65d87a Compute plugin list in bash completion for docker daemon --authz-plugin
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 2134d38935e99a0fa750870e1a509eb2515d104f
Component: engine
2016-01-02 14:53:10 -08:00
da10444c78 Fix declarations of of execdriver/native.NewDriver to have the same signature.
This change is done so that driver_unsupported.go and driver_unsupported_nocgo.go
declare the same signature for NewDriver as driver.go.

Fixes #19032

Signed-off-by: Lukas Waslowski <cr7pt0gr4ph7@gmail.com>
Upstream-commit: 9a03967f0abae4cc1dca00f339c58c31579c45b5
Component: engine
2016-01-02 19:55:37 +01:00
b09d7888d3 Merge pull request #18891 from HackToday/18872-fix-volume-cmd
Fix the restore data example
Upstream-commit: dcbd5e04b79cab9e53f9700a07939f21a3268e6b
Component: engine
2016-01-02 00:43:46 +01:00
8a76cb28e3 Merge pull request #18932 from wenchma/same_name_of_container_image
Update integration tests when container and image have same name
Upstream-commit: 1a5b97c76143b7d26006916b23daf8fde73c35ac
Component: engine
2016-01-01 21:40:51 +01:00
02ac964b69 Merge pull request #19028 from AvdN/patch-1
fix typo
Upstream-commit: c431bcba5bc8fd01d07d8b394044b22a250bc5b2
Component: engine
2016-01-01 12:26:44 -08:00
e6a1cabd50 Merge pull request #19027 from runcom/remove-getter
daemon: info: remove exported getter
Upstream-commit: 838e4c86e85c724e914e8e6d192b58d5c1a89e6f
Component: engine
2016-01-01 12:26:24 -08:00
005167cd3e Merge pull request #19019 from duglin/constScratch
Use constant instead of "scratch"
Upstream-commit: 3544d48ca1e673b6e7f5990431fe39a1d3803152
Component: engine
2016-01-01 21:02:41 +01:00
38393c4316 fix typo
Signed-off-by: Anthon van der Neut <a.van.der.neut@ruamel.eu>
Upstream-commit: b4d4a805eaaf56c071327a528d8837f18796e209
Component: engine
2016-01-01 20:39:04 +01:00
f30e7903ee daemon: info: remove exported getter
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 77ef3a606a228a688bb6a4108af7b34aa3a2aa65
Component: engine
2016-01-01 20:22:29 +01:00
7d8fd50344 Merge pull request #19006 from jen20/f-solaris-stat
Fix downstream client API build errors on Solaris
Upstream-commit: 5c0af43ebe043713aad1284d8d6d7928d271fa9a
Component: engine
2016-01-01 20:09:22 +01:00
796aa9ca72 Merge pull request #19007 from aboch/npe
Properly initialize IpamConf structure in initBridgeDriver
Upstream-commit: e7c62065742ab59ad546d905c6349892011da9b2
Component: engine
2016-01-01 10:50:54 -08:00
b350f7594e Improvement for docker subcommand's help messages
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: d7dc439623ff18d2a8dd152dbb032a307100cb2e
Component: engine
2016-01-01 12:27:28 +08:00
8159db2034 Merge pull request #18836 from vdemeester/18829-info-authz-plugins
Add authorization plugins to docker info
Upstream-commit: e7e3e568d12ea7b1759a311ed3ef722ed187bcec
Component: engine
2015-12-31 09:47:59 -05:00
b58ec08634 Use constant instead of "scratch"
Move NoBaseImageSpecifier to a common spot and then use it instead of
"scratch" in a couple of places.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: e6806223e81c916c9b24580b19207271f1a36965
Component: engine
2015-12-31 06:21:56 -08:00
4c3f62f975 Update LICENSE date
Signed-off-by: Tim <timwangdev@gmail.com>
Upstream-commit: 4b32d59595f6cf59dafb10782d464a13d5ab5fbe
Component: engine
2015-12-31 13:07:35 +00:00
902a67f4ef add more seccomp profile tests
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 327421d1df557e156b29d14359a2bfdc59cfb46f
Component: engine
2015-12-30 17:30:44 -08:00
479e415aa9 Fix the restore data example
Fixes: #18872

For backup, restore case, we usually restore in same directory, so
when we untar it, we not need go to /dbdata directory, wich could
result in /dbdata/dbdata, this fix make it untar directly. The directory
/dbdata would be same as old container /dbdata.

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
Upstream-commit: 83c705c00d9be3d5064a7a3fcc5de0645fce21b1
Component: engine
2015-12-31 00:56:01 +00:00
b985b8195a cleanup jess/unshare image
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 626c933730cffb6ca9112271dc4df5a1e462cac1
Component: engine
2015-12-30 16:20:05 -08:00
40fe4ff4d5 Properly initialize IpamConf structure in initBridgeDriver
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: aa97eee1a3cf5c932bdd31535b1e82ca53347ca5
Component: engine
2015-12-30 15:44:50 -08:00
3f495d0416 Fix downstream client API build errors on Solaris
The client API at fsouza/go-dockerclient has dependencies on packages in
the docker/docker repository which currently do not build on Solaris. In
particular, stat_unsupported.go makes use of the Mtimespec field of the
syscall.Stat_t struct, which is not present on Solaris, and a number of
Unix-specific packages do not list Solaris in their compile targets.

This commit adds enough support to be able to build
fsouza/go-dockerclient on SmartOS using Go 1.5.1 without affecting other
platforms.

Signed-off-by: James Nugent <james@jen20.com>
Upstream-commit: c12dbb8c82457a58e209302bf9752aec64234404
Component: engine
2015-12-30 18:25:42 -05:00
e16a7b429c Merge pull request #18999 from tonistiigi/fix-comment-in-inspect
Fix missing comment in docker inspect
Upstream-commit: 102eb03c680b2989efc1548ed1e28686a6aab4bd
Component: engine
2015-12-30 15:07:04 -08:00
5af0a64a16 Move test out of the windows build.
Because it can still run on windows server and fail because it doesn't
have `chown`.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 9aad7d209f8919726b40034a40e619f1efa46716
Component: engine
2015-12-30 16:36:48 -05:00
301494dba6 Merge pull request #18964 from hqhq/hq_fix_memory_swap_doc2
Fix docs for memory-swap
Upstream-commit: 2c3d1a9b126d45647cfe8aa89008a93f83203a0c
Component: engine
2015-12-30 21:01:48 +01:00
9cbaaf7f9f Fix missing comment in docker inspect
Fixes #18571

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: d32f43013bf4c3aaa90c9ea409fbb9ade4105200
Component: engine
2015-12-30 11:52:53 -08:00
cd2f0504b4 Merge pull request #18158 from mauri/add_owner
ADD files to a folder doesn't set correct UID and GID
Upstream-commit: 56f8b051ebc423b188c4a9eb8c151a338a4cb042
Component: engine
2015-12-30 11:19:15 -08:00
440e6d5df7 Merge pull request #18714 from jecarey/16756-docker_cli_pull_test
Use of checkers in docker_cli_pull_test.go
Upstream-commit: 51fa287368205e1f043d632e5930b7cce08a2419
Component: engine
2015-12-30 10:00:41 -08:00
fe3c5302af Merge pull request #18991 from qq690388648/master
replace the os.Stdout with stdout to adapt platform
Upstream-commit: f962aac1ecd2d30f7ffafbfae7bcd4f14300b402
Component: engine
2015-12-30 09:55:02 -08:00
2821f3dd6b Merge pull request #18764 from donovan/fix-networkingcontainers-ip-addresses
fix incorrect ip addresses in networkingcontainers
Upstream-commit: 3b605b5926cff095452f2c2dca374bd132e23fac
Component: engine
2015-12-30 17:49:08 +01:00
f44591d6b9 Merge pull request #18987 from tianon/armhf
Rename Dockerfile.arm to Dockerfile.armhf to more clearly reflect the specific subversion of ARM it targets
Upstream-commit: 3be1a80f1ab2c07322cf54e4bce42914b797c3b1
Component: engine
2015-12-30 08:21:52 -08:00
a51c7fe652 Merge pull request #18994 from thaJeztah/add-new-impact-labels
add new impact/distribution label
Upstream-commit: 1dd4a2a966cb51b0797a07166a84aea7282ce99d
Component: engine
2015-12-30 08:19:07 -08:00
eb2413b744 Merge pull request #18952 from coolljt0725/fix_stats_update
Fix docker stats show wrong memory limit when do docker update
Upstream-commit: 708f98f5f9e0a8e957c689a15ca380b8e52f6269
Component: engine
2015-12-30 08:17:42 -08:00