Commit graph

33872 commits

Author SHA1 Message Date
Victor Vieux
5745a8531e
Merge pull request #35265 from cpuguy83/32609_defreference_voldriver_on_error
Fixup some issues with plugin refcounting
2017-11-07 09:47:07 -08:00
John Howard
2f22f64d55
Merge pull request #35419 from johnstep/handle-scratch-image-os
Set OS on scratch image and prevent panic if empty
2017-11-07 08:32:27 -08:00
Yong Tang
eec662bbee
Merge pull request #35326 from RenaudWasTaken/swarmkit-revendored
Revendored Swarmkit
2017-11-07 06:56:15 -08:00
John Stephens
a97817b673
Set OS on scratch image and prevent panic if empty
Signed-off-by: John Stephens <johnstep@docker.com>
2017-11-06 18:22:15 -08:00
Renaud Gaubert
734346a37e Added NodeGenericResource config tests
Signed-off-by: Renaud Gaubert <renaud.gaubert@gmail.com>
2017-11-06 21:47:26 +01:00
Renaud Gaubert
ebe14310b7 Updated GenericResource CLI
Signed-off-by: Renaud Gaubert <renaud.gaubert@gmail.com>
2017-11-06 21:47:26 +01:00
Brian Goff
b00b1b1c40
Merge pull request #35398 from thaJeztah/fix-api-version-for-until-option
Move "until" option to correct API version
2017-11-05 07:23:42 -05:00
Sebastiaan van Stijn
ee21669f53
Merge pull request #35394 from chris-crone/e2e-add-headers
Add missing headers for e2e test image build
2017-11-05 09:50:54 +01:00
Yong Tang
edaba571ba
Merge pull request #34162 from cpuguy83/move_logread_logic
Move jsonlog read logic
2017-11-04 13:53:36 -07:00
Yong Tang
48694a3f88
Merge pull request #35244 from joyce/joyce/todo-fixes
fix todo for printing error messages
2017-11-04 13:52:45 -07:00
Brian Goff
16f7cd6749 Move json log reading into log file object
This allows much of the read logic to be shared for other things,
especially for the new log driver proposed in
https://github.com/moby/moby/issues/33475

The only logic for reads in the json logger is around decoding log
messages, which gets passed into the log file object.

This also helps with implementing compression as it allows us to
simplify locking strategies.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2017-11-04 08:31:58 -04:00
Brian Goff
52d82b4fbc Refactor log file writer
Make the `*RotateFileWriter` specifically about writing
`logger.Message`'s, which is what it's used for.

This allows for future changes where the log writer can cache details
about log entries such as (e.g.) the timestamps included in a particular
log file, which can be used to optimize reads.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2017-11-04 08:15:20 -04:00
Sebastiaan van Stijn
2c1043c913
Merge pull request #35404 from tonistiigi/stream-ctx-fix
builder: fix long stream sync
2017-11-04 01:07:06 +01:00
Tonis Tiigi
c6703b722e builder: fix long stream sync
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-11-03 12:53:17 -07:00
Yong Tang
a8cefcf6af
Merge pull request #35399 from justincormack/mask-scsi
Add /proc/scsi to masked paths
2017-11-03 11:58:20 -07:00
Joyce
883ab41ce8 fix todo for printing error messages
Signed-off-by: Joyce <mail@joycejang.com>
2017-11-03 11:35:41 -07:00
Justin Cormack
a21ecdf3c8 Add /proc/scsi to masked paths
This is writeable, and can be used to remove devices. Containers do
not need to know about scsi devices.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-11-03 15:12:22 +00:00
Sebastiaan van Stijn
6f34bd6f96
Move "until" option to correct API version
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-11-03 16:11:07 +01:00
Sebastiaan van Stijn
68a4552529
Merge pull request #32914 from jamiehannaford/until-logging
Add --until flag for docker logs; closes #32807
2017-11-03 16:08:30 +01:00
Yong Tang
47a1786be2
Merge pull request #35368 from dnephin/remove-version-file
Remove version file
2017-11-03 07:58:37 -07:00
Renaud Gaubert
b3960fc1c4 Revendored swarmkit
Signed-off-by: Renaud Gaubert <renaud.gaubert@gmail.com>
2017-11-03 15:43:50 +01:00
Justin Cormack
f5c70c5b75
Merge pull request #35365 from Microsoft/jjh/removeduplicateoomscoreadj
Remove duplicate redundant setting of OOMScoreAdj in OCI spec
2017-11-03 13:59:51 +00:00
Sebastiaan van Stijn
7801be2eee
Merge pull request #35383 from thaJeztah/new-misty-handle
Update Misty's GitHub handle
2017-11-03 12:59:47 +01:00
Sebastiaan van Stijn
dfbf0f2e91
Merge pull request #35168 from justincormack/update-contributing
First pass updating CONTRIBUTING
2017-11-03 12:57:21 +01:00
Justin Cormack
cecd0de3a9 First pass updating CONTRIBUTING
This largely removes references to Docker where possible.

The HOWTO guides are still Docker docs and refer to Docker not
moby, so the next step is to rework these as Moby docs and put
them in `docs/` in this repo.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-11-03 11:54:55 +00:00
Sebastiaan van Stijn
7d8affa3ef
Merge pull request #35344 from rhatdan/readonly-/dev
/dev should not be readonly with --readonly flag
2017-11-03 12:54:51 +01:00
Akihiro Suda
47b3209f68
Merge pull request #35388 from tonistiigi/rlock-fix
cluster: avoid recursive readlock on swarm info
2017-11-03 18:09:16 +09:00
Christopher Crone
37553a6963 e2e: Add missing headers for build
Signed-off-by: Christopher Crone <christopher.crone@docker.com>
2017-11-03 10:09:06 +01:00
Akihiro Suda
4063bbd088
Merge pull request #35389 from thaJeztah/improve-containerd-version-parsing
Use containerd API to get version
2017-11-03 18:06:22 +09:00
Sebastiaan van Stijn
a9182202f7
Merge pull request #35382 from thaJeztah/fix-api-version
Fix API version
2017-11-03 09:52:55 +01:00
Yong Tang
f5a2f3b40c
Merge pull request #35375 from cpuguy83/update_dockerpy
Update docker-py commit
2017-11-02 18:42:18 -07:00
Sebastiaan van Stijn
fec2b144fe
Use containerd API to get version
The `docker info` code was shelling out to obtain the
version of containerd (using the `--version` flag).

Parsing the output of this version string is error-prone,
and not needed, as the containerd API can return the
version.

This patch adds a `Version()` method to the containerd Client
interface, and uses this to get the containerd version.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-11-03 01:46:58 +01:00
Tonis Tiigi
ee1be71e9d cluster: avoid recursive readlock on swarm info
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-11-02 16:34:00 -07:00
Brian Goff
073dd7ab39 temporarily move docker-py tests for faster feedback
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2017-11-02 18:05:38 -04:00
Brian Goff
16d83571f5 Update docker-py commit
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2017-11-02 18:02:52 -04:00
Victor Vieux
462d79165f
Merge pull request #34224 from estesp/no-chown-nwfiles-outside-metadata
Only chown network files within container metadata
2017-11-02 15:00:42 -07:00
Sebastiaan van Stijn
30b4b5640e
Update Misty's GitHub handle
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-11-02 16:46:37 +01:00
Daniel J Walsh
5f3bd2473e /dev should not be readonly with --readonly flag
/dev is mounted on a tmpfs inside of a container.  Processes inside of containers
some times need to create devices nodes, or to setup a socket that listens on /dev/log
Allowing these containers to run with the --readonly flag makes sense.  Making a tmpfs
readonly does not add any security to the container, since there is plenty of places
where the container can write tmpfs content.

I have no idea why /dev was excluded.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2017-11-02 10:28:51 -04:00
Yong Tang
4bc5a57652
Merge pull request #35371 from thaJeztah/remove-version-matrix
Remove Docker/API version matrix
2017-11-02 06:10:20 -07:00
Sebastiaan van Stijn
7f8dbe4a86
Fix API version
Commit 3ba1dda191 bumped
the API version, but forgot to actually bump the version
in code.

This patch fixes the version to match those changes :-)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-11-02 13:08:27 +01:00
Akihiro Suda
76531ccdeb
Merge pull request #35373 from yongtang/11012017-solaris
Remove solaris build tag and `contrib/mkimage/solaris`
2017-11-02 16:39:02 +09:00
Yong Tang
4785f1a7ab Remove solaris build tag and `contrib/mkimage/solaris
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2017-11-02 00:01:46 +00:00
Sebastiaan van Stijn
deae428632
Merge pull request #35369 from thaJeztah/fix-api-changes
Move Isolation API changes to the correct version
2017-11-02 00:38:19 +01:00
Yong Tang
64e1d4a1f0
Merge pull request #35363 from yongtang/11012017-Dockerfile.solaris
Remove Dockerfile.solaris reference
2017-11-01 16:36:00 -07:00
Sebastiaan van Stijn
3fb228ba50
Remove Docker/API version matrix
The Swagger file contained a version matrix to
find which API version is used by which version
of Docker.

Given that Docker is a downstream of the Moby project,
we should not be maintaining such a matrix in this
repository.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-11-01 22:29:26 +01:00
Sebastiaan van Stijn
4533a16fa9
Move Isolation API changes to the correct version
Commit d91c5f42eb added
support for "Isolation" mode for services, but didn't
get merged before API 1.34.

This patch moves the description in the API version
history to the correct API version (1.35), and does
a slight rewording of the functionality.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-11-01 22:13:10 +01:00
Brian Goff
d91c5f42eb
Merge pull request #34424 from simonferquel/swarm-service-isolation
Added support for swarm service isolation mode
2017-11-01 16:41:10 -04:00
Daniel Nephin
1e1ad008db Remove version file
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-11-01 16:25:03 -04:00
Brian Goff
d1d69524c2
Merge pull request #35364 from dnephin/remove-w2l-scripts
Remove W2L scripts
2017-11-01 15:56:04 -04:00
Daniel Nephin
a17bfb78e8
Merge pull request #35360 from thaJeztah/fix-autogen-warning
Fix .go-autogen warnings
2017-11-01 15:12:09 -04:00