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

36297 commits

This branch
This branch
All branches
Author SHA1 Message Date
Yong Tang
0cde75e2ea
Merge pull request #38398 from RaviTezu/replace_gotty_with_aec 
replace gotty with aec, since gotty hasn't been updated since very lo…
 2019-01-26 16:45:15 -08:00
Yong Tang
6351619e2c
Merge pull request #38606 from thaJeztah/move_client_opts 
Move client opts, and deprecated client constructors to separate files
 2019-01-26 15:41:46 -08:00
Sebastiaan van Stijn
27c7178933
Merge pull request #38629 from thaJeztah/bump_golang_1.11.5 
Bump Golang 1.11.5 (CVE-2019-6486)
 2019-01-24 21:47:17 +01:00
Sebastiaan van Stijn
20b34412dc
Bump Golang 1.11.5 (CVE-2019-6486) 
See the milestone for details;
https://github.com/golang/go/issues?q=milestone%3AGo1.11.5+label%3ACherryPickApproved

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-01-24 00:49:27 +01:00
Vincent Demeester
de86ba27fb
Merge pull request #38598 from yongtang/serviceRunningTasksCount 
Move serviceRunningTasksCount to integration/internal/swarm
 2019-01-23 17:41:40 +01:00
Yong Tang
89ce20fa25
Merge pull request #38603 from thaJeztah/remove_deprecated_daemonhost 
integration-cli: remove deprecated daemonHost() utility
 2019-01-23 08:38:30 -08:00
Sebastiaan van Stijn
528ca931e6
Merge pull request #38621 from fntlnz/fix/reviewing-merge-label 
REVIEWING.md: Fix status 4 merge label
 2019-01-23 09:56:38 +01:00
Lorenzo Fontana
c133553154
REVIEWING.md: Fix status 4 merge label 
Signed-off-by: Lorenzo Fontana <lo@linux.com>
 2019-01-23 02:23:30 +01:00
Lorenzo Fontana
0ecba1523d
Merge pull request #38422 from debayande/even-more-names-redux 
Makes a few modifications to the name generator.
 2019-01-23 02:09:52 +01:00
Yong Tang
8d7889e510
Merge pull request #38605 from thaJeztah/explicit_nilerror_check 
Use assert.NilError() instead of assert.Assert()
 2019-01-21 12:41:53 -08:00
Sebastiaan van Stijn
69d9ff3455
Move deprecated client constructors to a separate file 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-01-21 15:27:52 +01:00
Sebastiaan van Stijn
01eb35bfb3
Move client-opts to a separate file 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-01-21 14:52:46 +01:00
Sebastiaan van Stijn
3449b12cc7
Use assert.NilError() instead of assert.Assert() 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-01-21 13:16:02 +01:00
Sebastiaan van Stijn
3105ca26dc
integration-cli: remove deprecated daemonHost() utility 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-01-21 12:07:36 +01:00
Yong Tang
e485a60e2b Move serviceRunningTasksCount to integration/internal/swarm 
This fix moves multiple places of serviceRunningTasksCount
to one location in integration/internal/swarm, so that
code duplication could be removed.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2019-01-19 18:54:32 +00:00
RaviTeja Pothana
1990a3e409 replace gotty with aec, since gotty hasn't been updated since very long time and aec can drop in for gotty 
Signed-off-by: RaviTeja Pothana <ravi-teja@live.com>
 2019-01-16 22:10:39 +05:30
Brian Goff
5ec31380a5
Merge pull request #38481 from thaJeztah/run_volume_tests_remotely 
Run volume-tests again remote daemons as well
 2019-01-15 14:09:18 -08:00
Brian Goff
64fd09bd29
Merge pull request #38553 from thaJeztah/faster_api_node_drain_pause 
Slightly speed up TestAPISwarmNodeDrainPause
 2019-01-15 13:49:28 -08:00
Sebastiaan van Stijn
bba833928c
Merge pull request #38487 from LinuxMercedes/error-on-empty-dockerfile 
Error on empty dockerfile
 2019-01-15 21:41:12 +01:00
Brian Goff
0dc531243d
Merge pull request #38554 from thaJeztah/check_for_errors 
Add missing error-check in TestAPISwarmManagerRestore
 2019-01-15 09:25:44 -08:00
Vincent Demeester
5ebb679598
Merge pull request #38544 from thaJeztah/dont_sprintf 
testing: pkg/signal; remove redundant fmt.Sprintf()
 2019-01-15 15:28:07 +01:00
Vincent Demeester
cd60e8a752
Merge pull request #38547 from yongtang/waitAndAssert 
Replace waitAndAssert in config_test.go with poll.WaitOn
 2019-01-15 15:27:19 +01:00
Sebastiaan van Stijn
e21f50cbf0
Merge pull request #38572 from yongtang/assert.NilError 
Replace t.Fatal(err) with assert.NilError(t, err)
 2019-01-15 15:16:57 +01:00
Vincent Demeester
b5be9f63eb
Merge pull request #38567 from thaJeztah/use_the_skip 
TestCgroupDriverSystemdMemoryLimit: use skip.If()
 2019-01-15 09:10:57 +01:00
Vincent Demeester
38015177d8
Merge pull request #38557 from thaJeztah/remove_duplicated_code 
Integration tests: remove some duplicated code, and preserve context
 2019-01-15 09:03:45 +01:00
Vincent Demeester
a827f17306
Merge pull request #38552 from thaJeztah/improve_test_events_filter_labels 
Make TestEventsFilterLabels less flaky
 2019-01-15 09:01:38 +01:00
Yong Tang
508e5f7b70
Merge pull request #37974 from thaJeztah/add_more_component_versions 
Add containerd, runc, and docker-init versions to /version
 2019-01-14 21:09:00 -08:00
Yong Tang
834801a4e5
Merge pull request #38568 from thaJeztah/fix_ping_test 
Fix ping-tests using wrong status-code
 2019-01-14 21:01:34 -08:00
Yong Tang
52475f8dd5 Replace t.Fatal(err) with assert.NilError(t, err) 
So that they are consistent with integration tests style

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2019-01-15 04:58:30 +00:00
Yong Tang
a0674481ee
Merge pull request #38566 from thaJeztah/fix_task_logs_swagger 
Swagger: fix "task logs" outside of "tasks" section
 2019-01-14 20:08:13 -08:00
Yong Tang
68e266ee3a Replace waitAndAssert in config_test.go with poll.WaitOn 
This fix replaces waitAndAssert in config_test.go with poll.WaitOn
so that the testing is consistent with all other tests in integration.

Also, config_test.go uses to wait and sleep for 2 * (1 minutes) to get the task
info. This fix combined those two sleep and wait for 1 mins. Think 1 min
is enough for config test.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2019-01-15 03:54:52 +00:00
linuxmercedes
18c7e8b927 Test: dockerfiles with no instructions are detected 
Signed-off-by: Natasha Jarus <linuxmercedes@gmail.com>
 2019-01-14 20:01:00 -06:00
linuxmercedes
64466b0cd9 Convert parse errors to more informative format 
- Wrap parse errors in errdefs.InvalidParameters
- Include dockerfile in error names

Signed-off-by: Natasha Jarus <linuxmercedes@gmail.com>
 2019-01-14 20:01:00 -06:00
Natasha Jarus
d104a750f9 Update buildkit version -- improved parse errors 
See https://github.com/moby/buildkit/pull/771

Signed-off-by: Natasha Jarus <linuxmercedes@gmail.com>
 2019-01-14 20:01:00 -06:00
Akihiro Suda
8472e04f79
Merge pull request #38555 from yongtang/assert.NilError 
Replace t.Fatal(err) with assert.NilError(err)
 2019-01-15 10:51:42 +09:00
Akihiro Suda
ef91b404ef
Merge pull request #38524 from thaJeztah/update_docker_py 
Update docker-py to 3.7.0
 2019-01-15 10:50:10 +09:00
Akihiro Suda
b8277edd9c
Merge pull request #38546 from thaJeztah/wait_a_second 
reduce flakiness of TestSwarmLockUnlockCluster and TestSwarmJoinPromoteLocked
 2019-01-15 10:49:23 +09:00
Sebastiaan van Stijn
2137b8ccf2
Add containerd, runc, and docker-init versions to /version 
This patch adds version information about the containerd,
runc, and docker-init components to the /version endpoint.

With this patch applied, running:

```
curl --unix-socket /var/run/docker.sock http://localhost/version | jq .
```

Will produce this response:

```json
{
  "Platform": {
    "Name": ""
  },
  "Components": [
    {
      "Name": "Engine",
      "Version": "dev",
      "Details": {
        "ApiVersion": "1.40",
        "Arch": "amd64",
        "BuildTime": "2018-11-08T10:23:42.000000000+00:00",
        "Experimental": "false",
        "GitCommit": "7d02782d2f",
        "GoVersion": "go1.11.2",
        "KernelVersion": "4.9.93-linuxkit-aufs",
        "MinAPIVersion": "1.12",
        "Os": "linux"
      }
    },
    {
      "Name": "containerd",
      "Version": "v1.1.4",
      "Details": {
        "GitCommit": "9f2e07b1fc1342d1c48fe4d7bbb94cb6d1bf278b"
      }
    },
    {
      "Name": "runc",
      "Version": "1.0.0-rc5+dev",
      "Details": {
        "GitCommit": "a00bf0190895aa465a5fbed0268888e2c8ddfe85"
      }
    },
    {
      "Name": "docker-init",
      "Version": "0.18.0",
      "Details": {
        "GitCommit": "fec3683"
      }
    }
  ],
  "Version": "dev",
  "ApiVersion": "1.40",
  "MinAPIVersion": "1.12",
  "GitCommit": "7d02782d2f",
  "GoVersion": "go1.11.2",
  "Os": "linux",
  "Arch": "amd64",
  "KernelVersion": "4.9.93-linuxkit-aufs",
  "BuildTime": "2018-11-08T10:23:42.000000000+00:00"
}
```

When using a recent version of the CLI, that information is included in the
output of `docker version`:

```
Client: Docker Engine - Community
 Version:           18.09.0
 API version:       1.39
 Go version:        go1.10.4
 Git commit:        4d60db4
 Built:             Wed Nov  7 00:46:51 2018
 OS/Arch:           linux/amd64
 Experimental:      false

Server:
 Engine:
  Version:          dev
  API version:      1.40 (minimum version 1.12)
  Go version:       go1.11.2
  Git commit:       7d02782d2f
  Built:            Thu Nov  8 10:23:42 2018
  OS/Arch:          linux/amd64
  Experimental:     false
 containerd:
  Version:          v1.1.4
  GitCommit:        9f2e07b1fc1342d1c48fe4d7bbb94cb6d1bf278b
 runc:
  Version:          1.0.0-rc5+dev
  GitCommit:        a00bf0190895aa465a5fbed0268888e2c8ddfe85
 docker-init:
  Version:          0.18.0
  GitCommit:        fec3683
```

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-01-14 23:27:05 +01:00
Sebastiaan van Stijn
46b80550c1
Fix ping-tests using wrong status-code 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-01-14 21:58:55 +01:00
Sebastiaan van Stijn
c11be31710
TestCgroupDriverSystemdMemoryLimit: use skip.If() 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-01-14 17:11:36 +01:00
Sebastiaan van Stijn
5ccc0714f7
Swagger: fix "task logs" outside of "tasks" section 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-01-14 17:04:16 +01:00
Brian Goff
beef00cb26
Merge pull request #38558 from thaJeztah/pass_client_instead_of_daemon 
GetRunningTasks: pass client instead of daemon
 2019-01-14 03:50:15 -08:00
Sebastiaan van Stijn
a3f626d101
Merge pull request #38543 from thaJeztah/save_the_environment 
Fix: plugin-tests discarding current environment
 2019-01-14 10:36:11 +01:00
Sebastiaan van Stijn
56a68c15f8
Integration tests: remove some duplicated code, and preserve context 
This introduces `NoTasksForService` and `NoTasks` poller checks, that
can be used to check if no tasks are left in general, or for a specific
service.

Some redundant checks were also removed from some tests.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-01-14 04:53:27 +01:00
Sebastiaan van Stijn
60d93aab2e
Refactor TestInspectNetwork 
Clean up and refactor this test;

- make `serviceRunningTasksCount` to use a `desired-state` filter
- use subtests, and inline the `validNetworkVerbose` checks; also use
  asserts for the individual checks, so that any failure will log exactly
  what failed
- remove helper functions that are no longer needed

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-01-14 04:30:17 +01:00
Sebastiaan van Stijn
8172edf04c
GetRunningTasks: pass client instead of daemon 
Tests generally already have a client instance, so it
probably makes more sense to just pass it, and make
this utility a bit more flexible to use.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-01-14 02:30:40 +01:00
Sebastiaan van Stijn
0e15c02465
Make TestEventsFilterLabels less flaky 
This test sometimes failed because the number of events received did not
match the expected number:

    FAIL: docker_cli_events_test.go:316: DockerSuite.TestEventsFilterLabels

    docker_cli_events_test.go:334:
        c.Assert(len(events), checker.Equals, 3)
    ... obtained int = 2
    ... expected int = 3

This patch makes the test more stable, by:

- use a wider range between `--since` and `--until`. These options were set
  so that the client detaches after events were received, but the actual
  range should not matter. Changing the range will cause more events to be
  returned, but we're specifically looking for the container ID's, so this
  should not make a difference for the actual test.
- use `docker create` instead of `docker run` for the containers. the
  containers don't have to be running to trigger an event; using `create`
  speeds up the test.
- check the exit code of the `docker create` to verify the containers were
  succesfully created.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-01-14 00:29:13 +01:00
Yong Tang
32f6aeee8a Replace t.Fatal(err) with assert.NilError(err) 
so that they are consistent with other places

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2019-01-13 21:36:25 +00:00
Sebastiaan van Stijn
2e326eba70
Add missing error-check in TestAPISwarmManagerRestore 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-01-13 21:11:50 +01:00
Sebastiaan van Stijn
ebdc9a3afc
Slightly speed up TestAPISwarmNodeDrainPause 
Looks like we don't need that many replicas, to test the
behavior, so let's start a few less.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-01-13 21:08:20 +01:00