1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Commit graph

36775 commits

Author SHA1 Message Date
John Howard
20b11792e8 LCOW: Fix FROM scratch
Signed-off-by: John Howard <jhoward@microsoft.com>
2019-05-14 15:55:59 -07:00
Derek McGowan
e516af6e56
Merge pull request from ehazlett/apply-diff-rwlayer
ApplyDiff to RWLayer
2019-04-30 19:22:28 -07:00
Yong Tang
9a2c263743
Merge pull request from robin-thoni/labels-regex
Use a regex to match labels
2019-04-29 12:25:21 -07:00
Vincent Demeester
8a4070a044
Merge pull request from thaJeztah/update_authors
Update AUTHORS and mailmap
2019-04-29 07:31:05 +02:00
Yong Tang
0c07dad66a
Merge pull request from thaJeztah/add_missing_import_aliases
Add "import" statement to generated API types
2019-04-28 10:45:59 -07:00
Yong Tang
c8b7dad9e9
Merge pull request from kevpar/etw-arm-fix
Revendor go-winio
2019-04-28 10:43:53 -07:00
Sebastiaan van Stijn
2467cb4eda
Update AUTHORS and mailmap
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-27 16:50:47 -07:00
Tibor Vass
32daacb40d
Merge pull request from thaJeztah/improve_e2e_image
Improve Dockerfile.e2e
2019-04-26 20:53:54 -07:00
Brian Goff
51f27b1def
Merge pull request from AkihiroSuda/fix-rootless-issues-alternative-to-39024
dockerd: fix rootless detection (alternative to )
2019-04-26 09:15:30 -07:00
Sebastiaan van Stijn
8921b59d5d
Merge pull request from aaronhnatiw/master
Updates daemon's remove link method to use more verbose error output.
2019-04-25 21:00:33 -07:00
Kir Kolyshkin
1ada1c8391 TestIpcModeOlderClient: skip if client < 1.40
This test case requires not just daemon >= 1.40, but also
client API >= 1.40. In case older client is used, we'll
get failure from the very first check:

> ipcmode_linux_test.go:313: assertion failed: shareable (string) != private (string)

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2019-04-25 19:19:44 -07:00
Sebastiaan van Stijn
709dc20120
Merge pull request from AkihiroSuda/lxc-user-nic
rootless: optional support for lxc-user-nic SUID binary
2019-04-25 16:28:46 -07:00
Aaron Hnatiw
b6d2d12e42 Updates daemon's remove link method to use more verbose error output.
Signed-off-by: Aaron Hnatiw <aaron@griddio.com>
2019-04-25 13:08:08 -04:00
Evan Hazlett
794e8111b6 add ApplyDiff to RWLayer
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2019-04-25 11:25:22 -04:00
Akihiro Suda
63a66b0eb0 rootless: optional support for lxc-user-nic SUID binary
lxc-user-nic can eliminate slirp overhead but needs /etc/lxc/lxc-usernet to be configured for the current user.

To use lxc-user-nic, $DOCKERD_ROOTLESS_ROOTLESSKIT_NET=lxc-user-nic also needs to be set.

This commit also bumps up RootlessKit from v0.3.0 to v0.4.0:
70e0502f32...e92d5e772e

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2019-04-25 23:54:30 +09:00
Akihiro Suda
3518383ed9 dockerd: fix rootless detection (alternative to )
The `--rootless` flag had a couple of issues:
* : euid=0, $USER="root" but no access to cgroup ("rootful" Docker in rootless Docker)
* : euid=0 but $USER="docker" (rootful boot2docker)

To fix , XDG dirs are ignored as in rootful Docker, unless the
dockerd is directly running under RootlessKit namespaces.

RootlessKit detection is implemented by checking whether `$ROOTLESSKIT_STATE_DIR` is set.

To fix , the non-robust `$USER` check is now completely removed.

The entire logic can be illustrated as follows:

```
withRootlessKit := getenv("ROOTLESSKIT_STATE_DIR")
rootlessMode := withRootlessKit || cliFlag("--rootless")
honorXDG := withRootlessKit
useRootlessKitDockerProxy := withRootlessKit
removeCgroupSpec := rootlessMode
adjustOOMScoreAdj := rootlessMode
```

Close 
Fix  

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2019-04-25 16:47:01 +09:00
Sebastiaan van Stijn
83ac2b4c13
Skip TestImagesFilterMultiReference on API < v1.40
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-24 17:52:21 -07:00
Sebastiaan van Stijn
05bd9958f2
Skip TestUUIDGeneration on API < v1.40
Older versions did not use an UUID as ID

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-24 17:52:13 -07:00
Sebastiaan van Stijn
d080a866cc
Skip TestPingCacheHeaders on API < v1.40
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-24 17:52:10 -07:00
Sebastiaan van Stijn
0e7b46aafe
Skip TestBuildWithEmptyDockerfile on API < v1.40
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-24 17:52:07 -07:00
Sebastiaan van Stijn
566eea13e6
Fix TestVolumesCreateAndList when running against a shared daemon
The daemon may already have other volumes, so filter out those
when running the test.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-24 17:52:03 -07:00
Sebastiaan van Stijn
2b5880c2eb
Remove TestContainerAPICreateWithHostName
TestNISDomainname in the integration suite covers this

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-24 17:52:00 -07:00
Sebastiaan van Stijn
c91c3776ea
Skip TestNISDomainname on API < 1.40
Older versions of the daemon would concatenate hostname and
domainname, so hostname "foobar" and domainname "baz.cyphar.com"
would produce `foobar.baz.cyphar.com` as hostname.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-24 17:51:57 -07:00
Sebastiaan van Stijn
b73e3407e3
Dockerfile.e2e: builder: change output directory to simplify copy
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-24 17:51:54 -07:00
Sebastiaan van Stijn
3ededb850f
Dockerfile.e2e: move "contrib" to a separate build-stage
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-24 17:51:50 -07:00
Sebastiaan van Stijn
e7784a6c7e
Dockerfile.e2e: move dockercli to a separate build-stage
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-24 17:51:47 -07:00
Sebastiaan van Stijn
045beed6c8
Dockerfile.e2e: use /build to be consistent with main Dockerfile
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-24 17:51:42 -07:00
Sebastiaan van Stijn
63aefbfbca
Dockerfile.e2e: re-order steps for caching
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-24 17:51:39 -07:00
Sebastiaan van Stijn
5554bd1a7b
Dockerfile.e2e: move frozen-images to a separate stage
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-24 17:51:36 -07:00
Sebastiaan van Stijn
20262688df
Dockerfile.e2e: use alpine 3.9
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-24 17:51:31 -07:00
Tibor Vass
3cd54c28fd
Merge pull request from thaJeztah/fix_e2e_image
Dockerfile.e2e fix TestBuildPreserveOwnership
2019-04-24 17:25:05 -07:00
Akihiro Suda
ac48309ac4
Merge pull request from thaJeztah/bump_go_units
bump docker/go-units v0.4.0
2019-04-24 19:01:23 +09:00
Sebastiaan van Stijn
e64afff964
Merge pull request from tonistiigi/update-buildkit
vendor: update buildkit to 8818c67c
2019-04-24 10:09:06 +02:00
Sebastiaan van Stijn
79b5b19439
Merge pull request from lsilvs/master
Add Satoshi Nakamoto to names generator
2019-04-24 08:29:39 +02:00
Tonis Tiigi
a3fdd5bf7e vendor: update buildkit to 8818c67c
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2019-04-23 19:02:06 -07:00
Sebastiaan van Stijn
2bfa24b393
Merge pull request from thaJeztah/bump_libnetwork
bump libnetwork 9ff9b57c344df5cd47443ad9e65702ec85c5aeb0
2019-04-23 23:27:07 +02:00
Sebastiaan van Stijn
7f2c564b23
bump libnetwork 9ff9b57c344df5cd47443ad9e65702ec85c5aeb0
full diff: 48f846327b...9ff9b57c34

-  (windows) Pick a random host port if the user does not specify a host port

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-23 18:37:36 +02:00
Sebastiaan van Stijn
c782aef653
bump docker/go-units v0.4.0
relevant changes:

-  Fix handling of unlimited (-1) ulimit values
-  Revert 46 minute threshold

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-23 16:56:57 +02:00
Vincent Demeester
0320a312d2
Merge pull request from SvenDowideit/loose-spelling
I can lose a screw if its on too loose
2019-04-23 13:00:47 +02:00
Lucas Silvestre
4bfd23b7ee
Add Satoshi Nakamoto to names generator
Signed-off-by: Lucas Silvestre <lukas.silvestre@gmail.com>
2019-04-23 10:32:53 +02:00
Sven Dowideit
29ad9379f4 I can lose a screw if its on too loose
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2019-04-23 11:36:31 +10:00
Kevin Parsons
e1f0f77bf4 Revendor go-winio
This is needed to provide fixes for ETW on ARM. The updated ETW package will
no-op on ARM, rather than crashing. Further changes are needed to Go itself to
allow ETW on ARM to work properly.

Signed-off-by: Kevin Parsons <kevpar@microsoft.com>
2019-04-22 14:23:53 -07:00
Sebastiaan van Stijn
aac801ac75
Merge pull request from cpuguy83/cross_toolchains_all_the_things
Make CC toolchains available for other targets
2019-04-20 22:34:05 +02:00
Sebastiaan van Stijn
28d7dba41d
Merge pull request from thaJeztah/improve_version_negotiation
Add client.WithAPIVersionNegotiation() option
2019-04-20 13:34:22 +02:00
Sebastiaan van Stijn
8202330984
Merge pull request from seemethere/allow_version_overwrite
Add ability to override the version in make.ps1
2019-04-20 00:40:11 +02:00
corbin-coleman
edc639e99f Add ability to override the version in make.ps1
Checks for environment variable VERSION if it exists then it sets dockerVersion to VERSION

Signed-off-by: corbin-coleman <corbin.coleman@docker.com>
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
2019-04-19 18:39:57 +00:00
Sebastiaan van Stijn
48fd0e921c
Dockerfile.e2e fix TestBuildPreserveOwnership
The Dockerfile missed some fixtures, which caused this test
fail when running from this image.

I also noticed some other fixtures missing in integration-cli,
where the image had symlinks to some certificates, but the
original files were not included;

```
|-- integration-cli
    |-- fixtures
    |   |-- auth
    |   |   `-- docker-credential-shell-test
    |   |-- credentialspecs
    |   |   `-- valid.json
    |   |-- https
    |   |   |-- ca.pem -> ../../../integration/testdata/https/ca.pem
    |   |   |-- client-cert.pem -> ../../../integration/testdata/https/client-cert.pem
    |   |   |-- client-key.pem -> ../../../integration/testdata/https/client-key.pem
    |   |   |-- client-rogue-cert.pem
    |   |   |-- client-rogue-key.pem
    |   |   |-- server-cert.pem -> ../../../integration/testdata/https/server-cert.pem
    |   |   |-- server-key.pem -> ../../../integration/testdata/https/server-key.pem
    |   |   |-- server-rogue-cert.pem
    |   |   `-- server-rogue-key.pem
```

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-19 16:09:01 +02:00
Akihiro Suda
94e228b227
Merge pull request from thaJeztah/bump_pkg_errors
bump pkg/errors v0.8.1
2019-04-19 13:52:02 +09:00
Brian Goff
7ccc4f70de
Merge pull request from Microsoft/jjh/lcowrs5plus
LCOW: (Experimental) Require RS5+ builds
2019-04-18 21:10:25 -07:00
Yong Tang
97c25f6814
Merge pull request from thaJeztah/bump_fluentd
Bump fluent/fluent-logger-golang v1.4.0
2019-04-18 19:00:02 -07:00