0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
48972 commits 14 branches 412 tags 338 MiB
Commit graph

1374 commits

Author SHA1 Message Date
Sebastiaan van Stijn
c7b488fbc8
API: properly handle invalid JSON to return a 400 status 
The API did not treat invalid JSON payloads as a 400 error, as a result
returning a 500 error;

Before this change, an invalid JSON body would return a 500 error;

```bash
curl -v \
  --unix-socket /var/run/docker.sock \
  -X POST \
  "http://localhost/v1.30/networks/create" \
  -H "Content-Type: application/json" \
  -d '{invalid json'
```

```
> POST /v1.30/networks/create HTTP/1.1
> Host: localhost
> User-Agent: curl/7.52.1
> Accept: */*
> Content-Type: application/json
> Content-Length: 13
>
* upload completely sent off: 13 out of 13 bytes
< HTTP/1.1 500 Internal Server Error
< Api-Version: 1.40
< Content-Type: application/json
< Docker-Experimental: false
< Ostype: linux
< Server: Docker/dev (linux)
< Date: Mon, 05 Nov 2018 11:55:20 GMT
< Content-Length: 79
<
{"message":"invalid character 'i' looking for beginning of object key string"}
```

Empty request:

```bash
curl -v \
  --unix-socket /var/run/docker.sock \
  -X POST \
  "http://localhost/v1.30/networks/create" \
  -H "Content-Type: application/json"
```

```
> POST /v1.30/networks/create HTTP/1.1
> Host: localhost
> User-Agent: curl/7.54.0
> Accept: */*
> Content-Type: application/json
>
< HTTP/1.1 500 Internal Server Error
< Api-Version: 1.38
< Content-Length: 18
< Content-Type: application/json
< Date: Mon, 05 Nov 2018 12:00:18 GMT
< Docker-Experimental: true
< Ostype: linux
< Server: Docker/18.06.1-ce (linux)
<
{"message":"EOF"}
```

After this change, a 400 is returned;

```bash
curl -v \
  --unix-socket /var/run/docker.sock \
  -X POST \
  "http://localhost/v1.30/networks/create" \
  -H "Content-Type: application/json" \
  -d '{invalid json'
```

```
> POST /v1.30/networks/create HTTP/1.1
> Host: localhost
> User-Agent: curl/7.52.1
> Accept: */*
> Content-Type: application/json
> Content-Length: 13
>
* upload completely sent off: 13 out of 13 bytes
< HTTP/1.1 400 Bad Request
< Api-Version: 1.40
< Content-Type: application/json
< Docker-Experimental: false
< Ostype: linux
< Server: Docker/dev (linux)
< Date: Mon, 05 Nov 2018 11:57:15 GMT
< Content-Length: 79
<
{"message":"invalid character 'i' looking for beginning of object key string"}
```

Empty request:

```bash
curl -v \
  --unix-socket /var/run/docker.sock \
  -X POST \
  "http://localhost/v1.30/networks/create" \
  -H "Content-Type: application/json"
```

```
> POST /v1.30/networks/create HTTP/1.1
> Host: localhost
> User-Agent: curl/7.52.1
> Accept: */*
> Content-Type: application/json
>
< HTTP/1.1 400 Bad Request
< Api-Version: 1.40
< Content-Type: application/json
< Docker-Experimental: false
< Ostype: linux
< Server: Docker/dev (linux)
< Date: Mon, 05 Nov 2018 11:59:22 GMT
< Content-Length: 49
<
{"message":"got EOF while reading request body"}
```

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-11-06 21:30:44 +01:00
Akihiro Suda
596cdffb9f mount: add BindOptions.NonRecursive (API v1.40) 
This allows non-recursive bind-mount, i.e. mount(2) with "bind" rather than "rbind".

Swarm-mode will be supported in a separate PR because of mutual vendoring.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2018-11-06 17:51:58 +09:00
Sebastiaan van Stijn
cb9d2cb71b
Move support for sysctl options in services to API v1.40 
This feature was added in 14da20f5e7,
and was merged after API v1.39 shipped as part of the Docker 18.09
release candidates.

This commit moves the feature to the correct API version.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-10-26 15:39:36 +02:00
Tibor Vass
d6ac2b0db0 builder: treat unset keep-storage as 0 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2018-10-08 23:58:54 +00:00
Drew Erny
14da20f5e7 Add support for sysctl options in services 
Adds support for sysctl options in docker services.

* Adds API plumbing for creating services with sysctl options set.
* Adds swagger.yaml documentation for new API field.
* Updates the API version history document.
* Changes executor package to make use of the Sysctls field on objects
* Includes integration test to verify that new behavior works.

Essentially, everything needed to support the equivalent of docker run's
`--sysctl` option except the CLI.

Includes a vendoring of swarmkit for proto changes to support the new
behavior.

Signed-off-by: Drew Erny <drew.erny@docker.com>
 2018-09-20 10:51:56 -05:00
Sebastiaan van Stijn
3735ea7b76
Merge pull request #37741 from mooncak/fix_typos 
fix typos in experimental.go and buildargs.go
 2018-09-14 11:53:54 +02:00
Anda Xu
5d931705e3 always hornor client side to choose which builder to use with DOCKER_BUILDKIT env var regardless the server setup 
Signed-off-by: Anda Xu <anda.xu@docker.com>
 2018-09-11 17:19:51 -07:00
Sebastiaan van Stijn
f94eec2308
Merge pull request #37690 from KimMachineGun/modify-context-key 
api/server, dockerversion: modify context key
 2018-09-06 18:45:41 +01:00
Tibor Vass
6ba1e91877
Merge pull request #37651 from tiborvass/new-builder-prune 
builder: add prune options to the API
 2018-09-04 07:50:09 -07:00
Tibor Vass
8ff7847d1c builder: add prune options to the API 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2018-09-01 22:01:17 +00:00
mooncake
5160003b4d fix typos 
Signed-off-by: mooncake <xcoder@tenxcloud.com>
Signed-off-by: Bily Zhang <xcoder@tenxcloud.com>
 2018-09-01 21:26:38 +08:00
Anda Xu
58a75cebdd allow features option live reloadable 
Signed-off-by: Anda Xu <anda.xu@docker.com>
 2018-08-31 12:43:04 -07:00
KimMachineGun
1377a2ddee api/server, dockerversion: modify context key 
Signed-off-by: KimMachineGun <geon0250@gmail.com>
 2018-08-22 11:20:22 +09:00
Tibor Vass
c973cde760 Fix logic when enabling buildkit 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2018-08-21 23:49:08 +00:00
Andrew Hsu
01c9e7082e move /session api endpoint out of experimental 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2018-08-21 22:43:34 +00:00
Andrew Hsu
239047c2d3 remove experimental guard for buildkit 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2018-08-21 22:19:45 +00:00
Anda Xu
2be17666b4 add optional fields in daemon.json to enable buildkit 
Signed-off-by: Anda Xu <anda.xu@docker.com>
 2018-08-19 14:58:23 -07:00
Sebastiaan van Stijn
e6e8ab50fa
Do not return "<unknown>" in /info response 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-07-16 16:09:58 +02:00
Tonis Tiigi
ffa7233d15 builder: fix duplicate calls to mountable 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2018-07-10 15:21:29 -07:00
Tibor Vass
facad55744 api: Change Platform field back to string (temporary workaround) 
This partially reverts https://github.com/moby/moby/pull/37350

Although specs.Platform is desirable in the API, there is more work
to be done on helper functions, namely containerd's platforms.Parse
that assumes the default platform of the Go runtime.

That prevents a client to use the recommended Parse function to
retrieve a specs.Platform object.

With this change, no parsing is expected from the client.

Signed-off-by: Tibor Vass <tibor@docker.com>
 2018-07-03 22:33:42 +00:00
Tibor Vass
ca8022ec63 builder: return image ID in API when using buildkit 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2018-07-03 19:11:02 +00:00
Sebastiaan van Stijn
d912e9460e
Merge pull request #37156 from cpuguy83/networking_api_types_only 
Move network conversions out of API router
 2018-06-29 02:47:27 +02:00
Tibor Vass
1436dc8f8d
Merge pull request #37350 from tonistiigi/platform-support 
Fix platform struct passing
 2018-06-27 19:23:27 -07:00
Brian Goff
c0bc14e8dd Move network conversions out of API router 
This stuff doesn't belong here and is causing imports of libnetwork into
the router, which is not what we want.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2018-06-27 17:11:29 -07:00
Tonis Tiigi
f099771665 system: add back lcow validation function 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2018-06-27 15:24:26 -07:00
Tonis Tiigi
337ba71fc1 distribution: fix passing platform struct to puller 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2018-06-27 14:59:31 -07:00
Tonis Tiigi
81f862a1fe api: fix platform type 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2018-06-26 22:59:17 -07:00
Yuichiro Kaneko
dbd4c290b7 Update comments about InitRouter 
This is a follow-up of commit 408c7ad (PR: #32453)

Signed-off-by: Yuichiro Kaneko <spiketeika@gmail.com>
 2018-06-27 09:45:06 +09:00
Dennis Chen
7f334d3acf Initial support for OCI multi-platform image 
Add the OCI spec compatible image support in client side.

Signed-off-by: Dennis Chen <dennis.chen@arm.com>
 2018-06-26 11:39:29 -07:00
Vincent Demeester
3845728524
Update tests to use gotest.tools 👼 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2018-06-13 09:04:30 +02:00
Tonis Tiigi
ab4cbe2c3f builder: correct output buffering order 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2018-06-10 10:05:31 -07:00
Tonis Tiigi
577732f655 builder: more experimental/windows validation 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2018-06-10 10:05:30 -07:00
Tonis Tiigi
1a6262e9ef builder: notify output buffering on body close 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2018-06-10 10:05:30 -07:00
Tonis Tiigi
4cdb6853dc builder: move tagging to exporter 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2018-06-10 10:05:30 -07:00
Tonis Tiigi
157b0b30db builder: lint fixes 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2018-06-10 10:05:29 -07:00
Tonis Tiigi
a25846a675 builder: add support for separate upload-request 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2018-06-10 10:05:29 -07:00
Tonis Tiigi
f3ef8c93d6 builder: protect early progress writes 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2018-06-10 10:05:29 -07:00
Tonis Tiigi
92395261b0 builder: add support for building from tarball 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2018-06-10 10:05:28 -07:00
Tonis Tiigi
ed651e796c builder: fixes after rebase 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2018-06-10 10:05:28 -07:00
Tonis Tiigi
760ecf958b builder: expand prune to buildkit 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2018-06-10 10:05:27 -07:00
Tonis Tiigi
b225258496 builder: export build cache records 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2018-06-10 10:05:27 -07:00
Tonis Tiigi
0bddd4ccfe builder: add graceful cancellation endpoint 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2018-06-10 10:05:26 -07:00
Tonis Tiigi
22f7caee03 builder: experimental buildkit base 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2018-06-10 10:05:26 -07:00
Brian Goff
e4b6adc88e Extract volume interaction to a volumes service 
This cleans up some of the package API's used for interacting with
volumes, and simplifies management.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2018-05-25 14:21:07 -04:00
Sebastiaan van Stijn
f23c00d870
Various code-cleanup 
remove unnescessary import aliases, brackets, and so on.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-05-23 17:50:54 +02:00
Sebastiaan van Stijn
4f8c870d62
Fix some linting issues 
These showed locally when running `make validate`. CI doesn't seem to have the
same (possibly it's disabled in the configuration)

    builder/fscache/fscache.go:618::error: github.com/docker/docker/vendor/github.com/tonistiigi/fsutil.StatInfo composite literal uses unkeyed fields (vet)
    client/swarm_unlock_test.go:44::error: github.com/docker/docker/api/types/swarm.UnlockRequest composite literal uses unkeyed fields (vet)
    client/swarm_unlock_test.go:20::error: github.com/docker/docker/api/types/swarm.UnlockRequest composite literal uses unkeyed fields (vet)
    cmd/dockerd/daemon_unix.go:113::error: github.com/docker/docker/cmd/dockerd/hack.MalformedHostHeaderOverride composite literal uses unkeyed fields (vet)
    cmd/dockerd/daemon_unix.go:110::error: github.com/docker/docker/cmd/dockerd/hack.MalformedHostHeaderOverride composite literal uses unkeyed fields (vet)
    daemon/graphdriver/overlay/overlay.go:171::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)
    daemon/graphdriver/overlay/overlay.go:413::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)
    daemon/graphdriver/overlay2/overlay.go:203::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)
    daemon/graphdriver/overlay2/overlay.go:584::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)
    daemon/graphdriver/zfs/zfs.go:109::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)
    daemon/graphdriver/zfs/zfs.go:388::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)
    daemon/volumes_windows.go:27::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)
    integration/service/network_test.go:31::error: github.com/docker/docker/api/types/network.NetworkingConfig composite literal uses unkeyed fields (vet)
    api/server/server.go:129:10⚠️ should not use basic type string as key in context.WithValue (golint)
    integration/service/network_test.go:54::error: github.com/docker/docker/api/types/network.NetworkingConfig composite literal uses unkeyed fields (vet)
    libcontainerd/client_daemon_linux.go:61::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)
    libcontainerd/client_daemon_linux.go:74::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)
    pkg/archive/archive_windows.go:76::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)
    plugin/manager_linux.go:56::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-05-17 19:28:27 +02:00
Brian Goff
b16b125bb4 Fix swagger volume type generation 
This was broken by bf6a790f00

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2018-05-14 13:46:20 -04:00
Kir Kolyshkin
7d62e40f7e Switch from x/net/context -> context 
Since Go 1.7, context is a standard package. Since Go 1.9, everything
that is provided by "x/net/context" is a couple of type aliases to
types in "context".

Many vendored packages still use x/net/context, so vendor entry remains
for now.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
 2018-04-23 13:52:44 -07:00
Vincent Demeester
f4106b46db
Remove daemon dependency on api packages 
We are using interface in the api routers to not explicitely depend on
the daemon struct (`daemon.Daemon`), but somehow, we do depend on the
`daemon` package for the cluster functionalities.

This removes this dependency by defining the correct interfaces.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2018-04-20 11:06:40 +02:00
Brian Goff
9d46c4c138 Support cancellation in directory.Size() 
Makes sure that if the user cancels a request that the daemon stops
trying to traverse a directory.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2018-03-29 15:49:15 -04:00