Commit Graph

21804 Commits

Author SHA1 Message Date
fa7d79e4ed add docs
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 831af89991edd442ef4eeb29fd01da576b04bcfc
Component: engine
2015-12-03 16:30:52 -08:00
6ac4c29a4e hacky workaround for dockerinit static binary needing libseccomp.a for debs and rpms
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: ec6d3392f1efc49d0609370e70a749a00555508c
Component: engine
2015-12-03 16:30:51 -08:00
bfb7e82f4d update packagers.md and kernel config check
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: cde9e8bc83182f0d100c4eda6acb5d4cbc995aac
Component: engine
2015-12-03 16:30:50 -08:00
a19fea4fba update bash completion for seccomp
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: ae76f7e23e0b9d7aceb711077a7ffc1f0e57de9c
Component: engine
2015-12-03 16:30:49 -08:00
58deeedf40 update hack/vendor.sh scripts and run vendor
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: ed5853de40b5e5c5df070a1f90f1fdde3ac56b20
Component: engine
2015-12-03 16:30:48 -08:00
4f88ba8722 inital seccomp support
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 6707f4b9b638b367a1dde6f8684a5b9817a882f0
Component: engine
2015-12-03 16:30:44 -08:00
174151a454 update debs/rpms for seccomp
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 255004ef335d5e6cc4ec0f51ecff676e9d84643b
Component: engine
2015-12-03 16:20:05 -08:00
bb9f4fa0e8 dockerfile update for seccomp
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: d616a097638bc73a652bcf5f7b25465c25bfaa83
Component: engine
2015-12-03 16:20:03 -08:00
4ee82987ec Adjust TestDockerCmdWithTimeout timeout to improve reliability
I saw a failure of TestDockerCmdWithTimeout. This test starts a command
that produces output after 10 ms, but uses a 5 ms timeout, so normally
the command will be killed before the output. The time intervals are so
small that the timeout may not reliably trigger before the output, which
can cause the test to fail.

This commit changes the test to only fail if the process is still alive
after 10 seconds. This means the test will confirm that the timeouts are
happening, but not attempt to gauge that the timeouts are happening
within milliseconds of when they are expected (which can't be done
reliably).

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 13d768b8ee05d3158c62d761e4ebe657cd7a8c25
Component: engine
2015-12-03 14:42:32 -08:00
287778e637 Merge pull request #18402 from Microsoft/jjh/timeout
Windows CI Fix: Timeout change
Upstream-commit: 2856a3048238d7a746d57028e48ea2489555e6e5
Component: engine
2015-12-03 14:33:09 -08:00
5fc75a60ac Merge pull request #18347 from tiborvass/container_package
Move Container to its own package (carry of 17969)
Upstream-commit: 168b490062aed36bf95426d9d66dcf5703842016
Component: engine
2015-12-03 14:10:16 -08:00
1c47f9b984 Add test for inspect with a sha256 prefix
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 61d6240069cda31559523b98cecb6b340a9d45fd
Component: engine
2015-12-03 14:06:30 -08:00
d286ab94c3 vendor: bump distribution to 568bf038af6d65b376165d02886b1c7fcaef1f61
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 53cd579b6e4617bc13ad0f6e43a74dba9d0a8bb2
Component: engine
2015-12-03 13:36:31 -08:00
0b8eb4aacf Merge pull request #18374 from calavera/volume_inspect_exit
Return error code when `volume inspect` fails with a template.
Upstream-commit: 29c69ce2a9158899257aa3e015b4db098f662bdd
Component: engine
2015-12-03 13:31:47 -08:00
9f99937185 Merge pull request #17481 from vdemeester/17446-network-inspect-format
Add format flag to network inspect
Upstream-commit: 4d849619d48f9ad9ad7b8c7d5bc1481dae3230e4
Component: engine
2015-12-03 16:16:04 -05:00
bceb4f3dff Disable timeout for systemd
With content addressability update starting upgraded
daemon for the first time can take a long time if
graph dir was not prepared with a migration tool before.
This avoids systemd timeouts while the migration is
taking place.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: eff5e6498fa424587c339b5ae54e28f003775e4b
Component: engine
2015-12-03 13:15:31 -08:00
ec460c332e Windows CI Fix: Timeout change
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 2097e7fceec5c58352f78e8667000c8b5cb85231
Component: engine
2015-12-03 12:45:56 -08:00
55ae612250 Merge pull request #18397 from Microsoft/jjh/fix-windows-ci
Fix broken Windows CI
Upstream-commit: 94d5459a0ca3b40d0ae34747a862d06bf20fd221
Component: engine
2015-12-03 12:41:19 -08:00
5dc61e1652 cleanup people in maintainers file
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: b97110dda7770f99d9d0fc3df304b1c88ce50189
Component: engine
2015-12-03 12:14:37 -08:00
a263d7120f Add token pass-thru for AuthConfig
This change allows API clients to retrieve an authentication token from
a registry, and then pass that token directly to the API.

Example usage:

    REPO_USER=dhiltgen
    read -s PASSWORD
    REPO=privateorg/repo
    AUTH_URL=https://auth.docker.io/token
    TOKEN=$(curl -s -u "${REPO_USER}:${PASSWORD}" "${AUTH_URL}?scope=repository:${REPO}:pull&service=registry.docker.io" |
        jq -r ".token")

    HEADER=$(echo "{\"registrytoken\":\"${TOKEN}\"}"|base64 -w 0 )
    curl -s -D - -H "X-Registry-Auth: ${HEADER}" -X POST "http://localhost:2376/images/create?fromImage=${REPO}"

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
Upstream-commit: 8dce8e9901501863a80caf47d71713d4d36925a3
Component: engine
2015-12-03 11:40:27 -08:00
44348463e0 Move DisconnectFromNetwork back to daemon/
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 5bb4d0d9ea6a6c85a3f9a4a147fd7db0101eb725
Component: engine
2015-12-03 20:10:27 +01:00
fb9a8a9552 Merge pull request #18394 from thaJeztah/carry-17869-add-volume-driver
[Carry 17869] Add docs and man page entry for --volume-driver
Upstream-commit: 2f9b541b8991a371dfa800fbef0ccaea61601f59
Component: engine
2015-12-03 20:06:18 +01:00
13f897ae0e Move docker system information to a dedicated router and backend.
Because I like the name `system` better than `local` :)

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 867f432985d6b4a46c2f66225d70a4ffdb28d8a3
Component: engine
2015-12-03 13:38:56 -05:00
33e1a90c6b Return error code when volume inspect fails with a template.
Following `docker inspect` conventions:

- Keep partial info in a buffer to not print incomplete template outputs.
- Break execution when template parsing or decoding fail.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: b9d30280f6eb2f817b1315c22953a133f1b66e69
Component: engine
2015-12-03 13:22:55 -05:00
33cb231c55 Fix broken Windows CI
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: c10311bc9a981f1fdea88ba5f488225eaeea2b69
Component: engine
2015-12-03 10:12:11 -08:00
329ce171d3 Use /docker as cgroup parent instead of docker
It means that containers will be created under root cgroup and not under
daemon cgroup.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 4b55765c11b3ae3bc02385ad17fe2a3c419e71bc
Component: engine
2015-12-03 08:42:45 -08:00
a103145fec Merge pull request #18391 from runcom/remove-daemon-config-func
daemon: remove private func config()
Upstream-commit: d9755df2b3b224a7c9895279fde17e9d4f826c10
Component: engine
2015-12-03 11:42:31 -05:00
d010c48ce4 Move Container to its own package.
So other packages don't need to import the daemon package when they
want to use this struct.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 6bb0d1816acd8d4f7a542a6aac047da2b874f476
Component: engine
2015-12-03 17:39:49 +01:00
0082efd193 Merge pull request #18266 from calavera/events_pub_sub
Event PubSub topics + linear filtering.
Upstream-commit: 33ab2bb52c130380e038013d68fdd8ad3c663360
Component: engine
2015-12-03 17:11:40 +01:00
c9f2f55bc6 Remove CLI specific information for API error messages. Issue #17147
Signed-off-by: Karol Duleba <mr.fuxi@gmail.com>
Upstream-commit: 74900edbf867e6ffe4e824a8c6383eb34a658341
Component: engine
2015-12-03 15:23:07 +00:00
476079ebd7 Address review comments.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: a2120e5ba3337f70a63fd64ea773e50ce5af31ca
Component: engine
2015-12-03 16:07:54 +01:00
c7c45c24a8 Add docs and man page entry for --volume-driver
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Upstream-commit: fe3ec3f77fd71d8544bc640b3d91f563f7d68013
Component: engine
2015-12-03 16:02:20 +01:00
cb3375532e Update the "Manually network" section with detailed info in container-basics
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: a9473772972aefca9b88754c8e4dc98fdee71e92
Component: engine
2015-12-03 22:32:02 +08:00
8c2653fb9a fix Put without Get in aufs
this Patch is ported from 3916561619d45a3d8ca17dfa467149824111023a

Signed-off-by: Liu Hua <sdu.liu@huawei.com>
Upstream-commit: 451f7517733087a8629fe20894b6c10a63bb155e
Component: engine
2015-12-03 22:22:25 +08:00
5e25f840c3 Fix Put without Get in devicemapper
Signed-off-by: Liu Hua <sdu.liu@huawei.com>
Upstream-commit: f7bdb973578a08a5012c741e4ebb262d2dd81165
Component: engine
2015-12-03 22:22:25 +08:00
0eb3ab8587 daemon: remove private func config()
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 3662f58083fbef56caf0eb4b2bab7d2a2a2672d5
Component: engine
2015-12-03 11:46:53 +01:00
50eaa45a45 Merge pull request #18375 from vbatts/tar-split_update
vendor: update tar-split to v0.9.11
Upstream-commit: 1475f567cbf002aad3db6ed829d9285a70febdb0
Component: engine
2015-12-02 20:25:07 -08:00
b67c72dbf8 Merge pull request #18231 from mqliang/resp
rename req to resp
Upstream-commit: 580534ba2e71782d65237170d4ad6356760042c7
Component: engine
2015-12-02 14:58:29 -08:00
d555e15f77 Add PubSub topics.
A TopicFunc is an interface to let the pubisher decide whether it needs
to send a message to a subscriber or not. It returns true if the
publisher must send the message and false otherwise.

Users of the pubsub package can create a subscriber with a topic
function by calling `pubsub.SubscribeTopic`.

Message delivery has also been modified to use concurrent channels per
subscriber. That way, topic verification and message delivery is not
o(N+M) anymore, based on the number of subscribers and topic verification
complexity.

Using pubsub topics, the API stops controlling the message delivery,
delegating that function to a topic generated with the filtering
provided by the user. The publisher sends every message to the
subscriber if there is no filter, but the api doesn't have to select
messages to return anymore.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 434d2e8745696255a204d9eefc6a2854ff74e5c2
Component: engine
2015-12-02 16:43:49 -05:00
72c9d02b1c Merge pull request #18301 from wenchma/doc_update_for_net
Add NETWORK_NAME_or_ID value for --net= option
Upstream-commit: ee3e07d3593f97466df6fc11c19f91c1aee76dd4
Component: engine
2015-12-02 22:36:01 +01:00
f437e2a3c8 Add format flag to network inspect
…for consistency as docker inspect and docker volume inspect supports it too

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 295c27388dd1e7cc4196fbb8ffe0646b33bacb5b
Component: engine
2015-12-02 22:32:10 +01:00
15181abee7 Merge pull request #18309 from WeiZhang555/time
Consolidate time format for API
Upstream-commit: 6deec021e5bbfd1942cfacb34c6593379e8b8c30
Component: engine
2015-12-02 22:28:28 +01:00
0176abff7d Update storage docs for content-addressability
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 909821f51455a856d9d205639341fac2e3e7f756
Component: engine
2015-12-02 13:06:02 -08:00
d55350cb73 Merge pull request #18376 from jfrazelle/fix-default-shm-size
fix default shm size in test
Upstream-commit: 61773e5cbf62badf41c6c9d110fca2e7b036a6ac
Component: engine
2015-12-02 12:54:07 -08:00
5811737ebb Merge pull request #18366 from thaJeztah/carry-17293-add-examples-in-search
Carry 17293 add examples in search
Upstream-commit: d410cd47518b323064994f80022927a45b4e22c2
Component: engine
2015-12-02 21:52:52 +01:00
d7c300489b fix default shm size in test
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 4354b348ad6f9a585c57d37147c2a893a2d873da
Component: engine
2015-12-02 12:43:51 -08:00
d4bbe1cfa0 vendor: update tar-split to v0.9.11
For optimizations.
https://github.com/docker/docker/issues/18370#issuecomment-161399901

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: 919104e6bb19b2e815236ee5cffa919c373f85e2
Component: engine
2015-12-02 15:34:12 -05:00
01641ba275 Merge pull request #18371 from sallyom/dontReturnNonError
don't return error if can't delete non-existing container
Upstream-commit: aa2ca5d93c2b30ba13ff67820a49d6f570323576
Component: engine
2015-12-02 11:59:50 -08:00
b43875ed4c Merge pull request #18369 from LK4D4/misleading_rm
daemon/delete.go: use less confusing naming of functions
Upstream-commit: f8364c013db9fe8483f2c44a513eaea473f54ebe
Component: engine
2015-12-02 11:57:18 -08:00
a7b1157339 Merge pull request #16277 from runcom/add-oom-score-adj
Add OomScoreAdj
Upstream-commit: 8f1f53f735e278bb23bb41d9387a75786d7ec1dc
Component: engine
2015-12-02 11:49:51 -08:00