Commit Graph

2910 Commits

Author SHA1 Message Date
Sebastiaan van Stijn 0be550dcf0 Jenkinsfile: update python 3.6 -> 3.7
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-03 15:49:27 +02:00
Sebastiaan van Stijn 38fe3983ba Jenkinsfile: update API version matrix; set default to v1.40
- Added new entry for Docker 19.03
- Removed obsolete engine versions that reached EOL (both
  as Community Edition and Enterprise Edition)
- Set the fallback/default API version to v1.40, which
  corresponds with Docker 19.03 (current release)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-03 15:49:27 +02:00
Frank Sachsenheim c88205c5ce Amends the docs concerning multiple label filters
Closes #2338

Signed-off-by: Frank Sachsenheim <funkyfuture@riseup.net>
2019-10-03 15:49:27 +02:00
Sebastiaan van Stijn 63760b1922 test/Dockerfile: allow using a mirror for the apt repository
With this change applied, the default debian package repository can be
replaced with a mirror;

```
make APT_MIRROR=cdn-fastly.deb.debian.org build-py3

...

Step 5/19 : RUN apt-get update && apt-get -y install     gnupg2     pass     curl
 ---> Running in 01c1101a0bd0
Get:1 http://cdn-fastly.deb.debian.org/debian buster InRelease [118 kB]
Get:2 http://cdn-fastly.deb.debian.org/debian-security buster/updates InRelease [39.1 kB]
Get:3 http://cdn-fastly.deb.debian.org/debian buster-updates InRelease [46.8 kB]
Get:4 http://cdn-fastly.deb.debian.org/debian buster/main amd64 Packages [7897 kB]
Get:5 http://cdn-fastly.deb.debian.org/debian-security buster/updates/main amd64 Packages [22.8 kB]
```

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-03 15:49:27 +02:00
Matt Fluet 06c606300c Correct INDEX_URL logic in build.py _set_auth_headers
Signed-off-by: Matt Fluet <matt.fluet@appian.com>
2019-10-03 15:49:27 +02:00
Sebastiaan van Stijn c238315c64 pytest: update to v4.2.1 - use xunit2 for compatibility with Jenkins
- pytest-dev/pytest#3547: `--junitxml` can emit XML compatible with Jenkins
  xUnit. `junit_family` INI option accepts `legacy|xunit1`, which produces
  old style output, and `xunit2` that conforms more strictly to
  https://github.com/jenkinsci/xunit-plugin/blob/xunit-2.3.2/src/main/resources/org/jenkinsci/plugins/xunit/types/model/xsd/junit-10.xsd

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-03 15:49:27 +02:00
Sebastiaan van Stijn 57c2193f6d pytest: set junitxml suite name to "docker-py"
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-03 15:49:26 +02:00
Ryan McCullagh 2d327bf743 Fix typo in comment. networks => network
Signed-off-by: Ryan McCullagh <ryan@amezmo.com>
2019-10-03 15:49:26 +02:00
Matt Fluet cce0954089 Fix for empty auth keys in config.json
Signed-off-by: Matt Fluet <matt.fluet@appian.com>
2019-10-03 15:49:26 +02:00
Sebastiaan van Stijn 73ad8b8f19 Update alpine version to 3.10, and rename BUSYBOX variable
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-03 15:49:26 +02:00
Sebastiaan van Stijn 23635d43ab Adjust `--platform` tests for changes in docker engine
These tests started failing on recent versions of the engine because the error string changed,
and due to a regression, the status code for one endpoint changed from a 400 to a 500.

On Docker 18.03:

The `docker build` case properly returns a 400, and "invalid platform" as error string;

```bash
docker build --platform=foobar -<<EOF
FROM busybox
EOF

Sending build context to Docker daemon  2.048kB
Error response from daemon: invalid platform: invalid platform os "foobar"
```

```
DEBU[2019-07-15T12:17:22.745511870Z] Calling GET /_ping
DEBU[2019-07-15T12:17:22.748224796Z] Calling POST /session
DEBU[2019-07-15T12:17:22.748692282Z] Calling POST /v1.37/build?buildargs=%7B%7D&cachefrom=%5B%5D&cgroupparent=&cpuperiod=0&cpuquota=0&cpusetcpus=&cpusetmems=&cpushares=0&dockerfile=Dockerfile&labels=%7B%7D&memory=0&memswap=0&networkmode=default&platform=foobar&rm=1&session=d7b6ceba9d8d0aed67a805528554feb5285781fe888a4bf4e0c15cb09bffd614&shmsize=0&target=&ulimits=null
```

The `docker pull --platform=foobar hello-world:latest` case incorrectly returns a 500

```
DEBU[2019-07-15T12:16:08.744827612Z] Calling POST /v1.37/images/create?fromImage=hello-world&platform=foobar&tag=latest
DEBU[2019-07-15T12:16:08.745594874Z] FIXME: Got an API for which error does not match any expected type!!!: invalid platform: invalid platform os "foobar"  error_type="*errors.errorString" module=api
ERRO[2019-07-15T12:16:08.745916686Z] Handler for POST /v1.37/images/create returned error: invalid platform: invalid platform os "foobar"
DEBU[2019-07-15T12:16:08.746191172Z] FIXME: Got an API for which error does not match any expected type!!!: invalid platform: invalid platform os "foobar"  error_type="*errors.errorString" module=api
```

On Docker 18.09;

```bash
docker build --platform=foobar -<<EOF
FROM busybox
EOF

Error response from daemon: "foobar": unknown operating system or architecture: invalid argument
```

Which incorrectly returns a 500 status;

```
DEBU[2019-07-15T11:59:20.687268380Z] Calling POST /v1.39/build?buildargs=%7B%7D&cachefrom=%5B%5D&cgroupparent=&cpuperiod=0&cpuquota=0&cpusetcpus=&cpusetmems=&cpushares=0&dockerfile=Dockerfile&labels=%7B%7D&memory=0&memswap=0&networkmode=default&platform=foobar&rm=1&session=jko7kejjvs93judyfnq7shoda&shmsize=0&target=&ulimits=null&version=1
DEBU[2019-07-15T11:59:20.687282279Z] Calling POST /session
INFO[2019-07-15T11:59:20.687761392Z] parsed scheme: ""                             module=grpc
INFO[2019-07-15T11:59:20.687833668Z] scheme "" not registered, fallback to default scheme  module=grpc
INFO[2019-07-15T11:59:20.688017578Z] ccResolverWrapper: sending new addresses to cc: [{ 0  <nil>}]  module=grpc
INFO[2019-07-15T11:59:20.688270160Z] ClientConn switching balancer to "pick_first"  module=grpc
INFO[2019-07-15T11:59:20.688353083Z] pickfirstBalancer: HandleSubConnStateChange: 0xc4209b0630, CONNECTING  module=grpc
INFO[2019-07-15T11:59:20.688985698Z] pickfirstBalancer: HandleSubConnStateChange: 0xc4209b0630, READY  module=grpc
DEBU[2019-07-15T11:59:20.812700550Z] client is session enabled
DEBU[2019-07-15T11:59:20.813139288Z] FIXME: Got an API for which error does not match any expected type!!!: invalid argument
github.com/docker/docker/vendor/github.com/containerd/containerd/errdefs.init
	/go/src/github.com/docker/docker/vendor/github.com/containerd/containerd/errdefs/errors.go:40
github.com/docker/docker/vendor/github.com/containerd/containerd/content.init
	<autogenerated>:1
github.com/docker/docker/builder/builder-next.init
	<autogenerated>:1
github.com/docker/docker/api/server/backend/build.init
	<autogenerated>:1
main.init
	<autogenerated>:1
runtime.main
	/usr/local/go/src/runtime/proc.go:186
runtime.goexit
	/usr/local/go/src/runtime/asm_amd64.s:2361  error_type="*errors.fundamental" module=api
ERRO[2019-07-15T11:59:20.813210677Z] Handler for POST /v1.39/build returned error: "foobar": unknown operating system or architecture: invalid argument
DEBU[2019-07-15T11:59:20.813276737Z] FIXME: Got an API for which error does not match any expected type!!!: invalid argument
github.com/docker/docker/vendor/github.com/containerd/containerd/errdefs.init
	/go/src/github.com/docker/docker/vendor/github.com/containerd/containerd/errdefs/errors.go:40
github.com/docker/docker/vendor/github.com/containerd/containerd/content.init
	<autogenerated>:1
github.com/docker/docker/builder/builder-next.init
	<autogenerated>:1
github.com/docker/docker/api/server/backend/build.init
	<autogenerated>:1
main.init
	<autogenerated>:1
runtime.main
	/usr/local/go/src/runtime/proc.go:186
runtime.goexit
	/usr/local/go/src/runtime/asm_amd64.s:2361  error_type="*errors.fundamental" module=api
```

Same for the `docker pull --platform=foobar hello-world:latest` case:

```bash
docker pull --platform=foobar hello-world:latest
Error response from daemon: "foobar": unknown operating system or architecture: invalid argument
```

```
DEBU[2019-07-15T12:00:18.812995330Z] Calling POST /v1.39/images/create?fromImage=hello-world&platform=foobar&tag=latest
DEBU[2019-07-15T12:00:18.813229172Z] FIXME: Got an API for which error does not match any expected type!!!: invalid argument
github.com/docker/docker/vendor/github.com/containerd/containerd/errdefs.init
	/go/src/github.com/docker/docker/vendor/github.com/containerd/containerd/errdefs/errors.go:40
github.com/docker/docker/vendor/github.com/containerd/containerd/content.init
	<autogenerated>:1
github.com/docker/docker/builder/builder-next.init
	<autogenerated>:1
github.com/docker/docker/api/server/backend/build.init
	<autogenerated>:1
main.init
	<autogenerated>:1
runtime.main
	/usr/local/go/src/runtime/proc.go:186
runtime.goexit
	/usr/local/go/src/runtime/asm_amd64.s:2361  error_type="*errors.fundamental" module=api
ERRO[2019-07-15T12:00:18.813365546Z] Handler for POST /v1.39/images/create returned error: "foobar": unknown operating system or architecture: invalid argument
DEBU[2019-07-15T12:00:18.813461428Z] FIXME: Got an API for which error does not match any expected type!!!: invalid argument
github.com/docker/docker/vendor/github.com/containerd/containerd/errdefs.init
	/go/src/github.com/docker/docker/vendor/github.com/containerd/containerd/errdefs/errors.go:40
github.com/docker/docker/vendor/github.com/containerd/containerd/content.init
	<autogenerated>:1
github.com/docker/docker/builder/builder-next.init
	<autogenerated>:1
github.com/docker/docker/api/server/backend/build.init
	<autogenerated>:1
main.init
	<autogenerated>:1
runtime.main
	/usr/local/go/src/runtime/proc.go:186
runtime.goexit
	/usr/local/go/src/runtime/asm_amd64.s:2361  error_type="*errors.fundamental" module=api
```

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-03 15:49:26 +02:00
Sebastiaan van Stijn cd3a696603 xfail test_init_swarm_data_path_addr
This test can fail if `eth0` has multiple IP addresses;

   E   docker.errors.APIError: 400 Client Error: Bad Request ("interface eth0 has more than one IPv6 address (2001:db8:1::242:ac11:2 and fe80::42:acff:fe11:2)")

Which is not a failiure, but depends on the environment that
the test is run in.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-03 15:49:26 +02:00
Sebastiaan van Stijn 38d18a2d1f Update credentials-helpers to v0.6.3
full diff:
https://github.com/docker/docker-credential-helpers/compare/v0.6.2...v0.6.3

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-03 15:49:26 +02:00
Francis Laniel a316e6a927 Add documentation to argument 'mem_reservation'.
The documentation was added for function ContainerCollection::run and
ContainerApiMixin::create_host_config.

Signed-off-by: Francis Laniel <francis.laniel@lip6.fr>

Add documentation to argument 'mem_reservation'.

The documentation was added for function ContainerCollection::run and
ContainerApiMixin::create_host_config.

Signed-off-by: Francis Laniel <francis.laniel@lip6.fr>
2019-10-03 15:49:26 +02:00
Sebastiaan van Stijn ea4fbd7ddf Update to python 3.7 (buster) and use build-args
The build arg can be used to either test different versions, but
also makes it easier to "grep" when upgrading versions.

The output format of `gpg2 --list-secret-keys` changed in the version
installed on Buster, so `grep` was replaced with `awk` to address
the new output format;

Debian Jessie:

    gpg2 --no-auto-check-trustdb --list-secret-keys
    /root/.gnupg/secring.gpg
    ------------------------
    sec   1024D/A7B21401 2018-04-25
    uid                  Sakuya Izayoi <sakuya@gensokyo.jp>
    ssb   1024g/C235E4CE 2018-04-25

Debian Buster:

    gpg2 --no-auto-check-trustdb --list-secret-keys
    /root/.gnupg/pubring.kbx
    ------------------------
    sec   dsa1024 2018-04-25 [SCA]
          9781B87DAB042E6FD51388A5464ED987A7B21401
    uid           [ultimate] Sakuya Izayoi <sakuya@gensokyo.jp>
    ssb   elg1024 2018-04-25 [E]

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-03 15:49:26 +02:00
Djordje Lukic 546bc63244 Bump dev
Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
2019-10-03 15:49:26 +02:00
Sebastiaan van Stijn f3961244a0 Update credentials-helpers to v0.6.2
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-03 15:49:26 +02:00
Michael Crosby c2ed66552b Remove exec detach test
Forking off an exec process and detaching isn't a supported method

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-10-03 15:49:26 +02:00
Djordje Lukic 1308cfb78d
Merge pull request #2365 from docker/4.0.2-release
4.0.2 release
2019-06-20 13:23:27 +02:00
Djordje Lukic 805f5f4b38 Bump 4.0.2
Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
2019-06-20 12:58:37 +02:00
Djordje Lukic a821502b9e Bump websocket-client -> 0.56.0
Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
2019-06-20 12:58:37 +02:00
Kajetan Champlewski 1f38d270e0 Clean up healtcheck.py docs
Signed-off-by: Kajetan Champlewski <contact@kajetan.ch>
2019-06-20 12:58:37 +02:00
Kajetan Champlewski 241aaaab23 Handle str in setter for test.
Signed-off-by: Kajetan Champlewski <contact@kajetan.ch>
2019-06-20 12:58:37 +02:00
Kajetan Champlewski c5ca2ef85e Fix documentation for inspect_secret referring to removal.
Signed-off-by: Kajetan Champlewski <contact@kajetan.ch>
2019-06-20 12:58:37 +02:00
Joffrey F 1ef822afee dev version
Signed-off-by: Joffrey F <joffrey@docker.com>
2019-06-20 12:58:37 +02:00
Joffrey F ead0bb9e08
Merge pull request #2348 from docker/4.0.1-release
4.0.1 release
2019-05-18 20:18:03 -07:00
Joffrey F 307e2b3eda Changelog 4.0.1
Signed-off-by: Joffrey F <joffrey@docker.com>
2019-05-18 20:05:20 -07:00
Joffrey F 4d08f2c33d Bump 4.0.1
Signed-off-by: Joffrey F <joffrey@docker.com>
2019-05-18 19:54:35 -07:00
Joffrey F fc0285c09b Version bump
Signed-off-by: Joffrey F <joffrey@docker.com>
2019-05-18 19:54:35 -07:00
Simon Gurcke df182fd42d Change os.errno to errno for py3.7 compatibility
Signed-off-by: Simon Gurcke <simon@gurcke.de>
2019-05-18 19:54:35 -07:00
Joffrey F 4a8a86eed4 Add readthedocs config
Signed-off-by: Joffrey F <joffrey@docker.com>
2019-05-18 19:54:35 -07:00
Batuhan Taşkaya 80f68c81cd reference swarm page correctly
Signed-off-by: Batuhan Taşkaya <btaskaya33@gmail.com>
2019-05-18 19:54:35 -07:00
Joffrey F 5d42ab81c3
Merge pull request #2331 from docker/4.0.0-release
4.0.0 release
2019-05-18 18:35:54 -07:00
Ulysses Souza 5de5af1155 Bump urllib3 -> 1.24.3
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-05-18 18:15:27 -07:00
Joffrey F 36a09df21c Merge branch 'release' into 4.0.0-release
Signed-off-by: Joffrey F <joffrey@docker.com>
2019-05-13 22:46:05 -07:00
Joffrey F 589e76ea3c Update changelog for 4.0.0
Signed-off-by: Joffrey F <joffrey@docker.com>
2019-05-13 22:44:49 -07:00
Joffrey F f6781575c1 Bump version 4.0.0
Signed-off-by: Joffrey F <joffrey@docker.com>
2019-05-13 22:44:48 -07:00
Ulysses Souza d863f72939 Bump 3.7.2
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-05-13 22:44:48 -07:00
Ulysses Souza 12d73c6d38 Xfail test_attach_stream_and_cancel on TLS
This test is quite flaky on ssl integration test

Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-05-13 22:44:33 -07:00
Joffrey F 23c5c001c6
Merge pull request #2329 from docker/end_3.4_support
End Python 3.4 support
2019-05-05 16:37:45 -07:00
Joffrey F e2c1c9caac
Merge pull request #2332 from docker/use_proxy_config_default
Change use_config_proxy default value to True to match CLI behavior
2019-05-02 13:11:07 -07:00
Joffrey F 7f56f7057c Don't add superfluous arguments
Signed-off-by: Joffrey F <f.joffrey@gmail.com>
2019-05-02 12:46:56 -07:00
Joffrey F 87ee18aa39 Change use_config_proxy default value to True to match CLI behavior
Signed-off-by: Joffrey F <joffrey@docker.com>
2019-05-01 20:52:01 -07:00
Joffrey F 836194c64f
Merge pull request #2295 from hannseman/swarm-rotate-token
Add support for rotate_manager_unlock_key
2019-05-01 20:36:45 -07:00
Joffrey F bdc954b009 Stop supporting EOL Python 3.4
Signed-off-by: Joffrey F <joffrey@docker.com>
2019-05-01 19:51:29 -07:00
Joffrey F 1aae20d13a Remove obsolete win32-requirements file
Signed-off-by: Joffrey F <joffrey@docker.com>
2019-05-01 19:44:23 -07:00
Joffrey F 75e0ad017c
Merge pull request #2328 from docker/modernize_test_deps
Update some test dependencies / default values with newer versions
2019-05-01 02:48:05 -07:00
Hannes Ljungberg 532c62ee51 Add support for rotate_manager_unlock_key
Signed-off-by: Hannes Ljungberg <hannes@5monkeys.se>
2019-05-01 11:45:20 +02:00
Joffrey F eba8345c37 Update some test dependencies / default values with newer versions
Signed-off-by: Joffrey F <joffrey@docker.com>
2019-05-01 02:36:19 -07:00
Joffrey F 4d62dd0a64
Merge pull request #2296 from hannseman/swarm-init-response
Return node id on swarm init
2019-05-01 02:29:30 -07:00