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

3905 commits

Author SHA1 Message Date
Darren Stahl
45fe59931a Windows: Enable more create tests 
Signed-off-by: Darren Stahl <darst@microsoft.com>
 2016-10-10 10:34:03 -07:00
Vincent Demeester
b3cc3d7bf9 Merge pull request #23389 from Microsoft/jjh/credentialspec 
Windows: Support credential specs
 2016-10-07 18:32:44 +02:00
Vincent Demeester
e42ec6d7cb Merge pull request #27171 from tonistiigi/improve-attach-closed 
Improve TestAttachClosedOnContainerStop
 2016-10-07 11:26:33 +02:00
Vincent Demeester
91312f71aa Merge pull request #26882 from runcom/proxy-path 
Specify userland proxy path
 2016-10-07 09:44:39 +02:00
Darren Stahl
6482410c9d Enabled more test on Windows, API and Build 
Signed-off-by: Darren Stahl <darst@microsoft.com>
 2016-10-06 17:18:42 -07:00
Justin Cormack
5ee2c2a647 Merge pull request #27160 from mlaventure/update-containerd 
Update containerd and runc
 2016-10-06 19:36:31 +02:00
John Howard
e85867cb68 Windows: Support credential specs 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-10-06 09:32:22 -07:00
Antonio Murdaca
dd2e1947dc
daemon: add --userland-proxy-path flag 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-10-06 17:31:53 +02:00
Darren Stahl
443d7313f5 Enable more build tests on Windows 
Signed-off-by: Darren Stahl <darst@microsoft.com>
 2016-10-06 00:53:30 -07:00
Tonis Tiigi
9d8f01b4f5 Improve TestAttachClosedOnContainerStop 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-10-05 15:52:09 -07:00
Kenfe-Mickael Laventure
7e12c3bb99 Update containerd and runc 
containerd: 837e8c5e1cad013ed57f5c2090c8591c10cbbdae
runc: 02f8fa7863dd3f82909a73e2061897828460d52f

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-10-05 14:47:15 -07:00
Alexander Morozov
ba9fb73280 Merge pull request #27037 from Microsoft/jjh/apistatsdatarace 
Fix datarace in ApiStatsNetworkStatsVersioning
 2016-10-05 13:06:40 -07:00
John Howard
825e3a66a4 Fix datarace in ApiStatsnetworkStatsVersioning 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-10-05 10:12:46 -07:00
Doug Davis
105bc63295 Require continuation char to be last char in a line 
While look at #27039 I noticed that we allow for whitespace after
the continuation char (\\) which is wrong. It needs to be the very
last char in the line.

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2016-10-04 09:38:00 -07:00
Vincent Demeester
694ba71e36 Merge pull request #26989 from aboch/none 
Respect --bridge=none
 2016-10-04 16:25:39 +02:00
Michael Crosby
e22d4b9654 Merge pull request #27078 from darrenstahlmsft/InteractiveRestartTest 
Increase timeout in TestRunInteractiveWithRestartPolicy
 2016-10-03 11:22:33 -07:00
Alessandro Boch
a0af884d3a Respect --bridge=none 
- Do not create the default "bridge" network
- Get rid of the docker0 bridge

Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-10-03 11:08:34 -07:00
Brian Goff
7e29b33546 Merge pull request #26967 from AkihiroSuda/rename-tests 
[nit] integration-cli: obey Go's naming convention
 2016-10-03 09:52:04 -04:00
Vincent Demeester
420e22fad4 Merge pull request #27060 from yongtang/27021-inspect-show-env 
Disable HTML escaping for JSON strings in `docker inspect`
 2016-10-02 14:32:56 +02:00
Michael Crosby
18338427ed Merge pull request #26968 from darrenstahlmsft/TestEventsFix 
Limit conccurent container creates in TestEventsLimit to 8
 2016-09-30 16:29:01 -07:00
Darren Stahl
6eac29490f Increase timeout in TestRunInteractiveWithRestartPolicy 
Signed-off-by: Darren Stahl <darst@microsoft.com>
 2016-09-30 15:30:18 -07:00
Darren Stahl
728a265190 Limit conccurent container creates in TestEventsLimit to 8 
Signed-off-by: Darren Stahl <darst@microsoft.com>
 2016-09-30 14:44:05 -07:00
Michael Crosby
6eef2b2ada Merge pull request #26997 from tonistiigi/exec-env 
Fix missing hostname and links in exec env
 2016-09-30 09:51:02 -07:00
Vincent Demeester
4fabc92cfc Merge pull request #26697 from allencloud/change-service-scale-logic 
validate service parameter in client side to avoid api call in `docker service scale`
 2016-09-30 18:37:35 +02:00
Akihiro Suda
7fb7a477d7 [nit] integration-cli: obey Go's naming convention 
No substantial code change.

 - Api         --> API
 - Cli         --> CLI
 - Http, Https --> HTTP, HTTPS
 - Id          --> ID
 - Uid,Gid,Pid --> UID,PID,PID
 - Ipam        --> IPAM
 - Tls         --> TLS (TestDaemonNoTlsCliTlsVerifyWithEnv --> TestDaemonTLSVerifyIssue13964)

Didn't touch in this commit:
 - Git: because it is officially "Git": https://git-scm.com/
 - Tar: because it is officially "Tar": https://www.gnu.org/software/tar/
 - Cpu, Nat, Mac, Ipc, Shm: for keeping a consistency with existing production code (not changable, for compatibility)

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2016-09-30 01:21:05 +00:00
Yong Tang
0fa20ad13b Disable HTML escaping for JSON strings in docker inspect 
This fix tries to address the issue raised in 27021 where
HTML strings like (`&, >, <, etc`) in environmental variables
are escaped for JSON output for `docker inspect`. For example,
`TEST_ENV="soanni&rtr"` has been escaped to `TEST_ENV="soanni\u0026rtr"`

This fix disabled HTML escaping with `SetEscapeHTML`, which is available
since golang 1.7.0. This changes will be applied to all JSON output
that utilize `httputils.WriteJSON`.

An integration test has been added to cover the changes.

This fix fixes 27021.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-09-29 18:16:36 -07:00
Tonis Tiigi
e981459609 Fix missing hostname and links in exec env 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-09-29 13:46:10 -07:00
Michael Crosby
1d669d82c1 Merge pull request #26994 from Microsoft/jjh/fix26461regression 
Windows: Don't set PATH/TERM on exec
 2016-09-29 13:34:12 -07:00
Vincent Demeester
b6ad6d98fd Merge pull request #24411 from vdemeester/24393-ps-filter-managed 
Add a new "is-task" ps filter
 2016-09-29 18:54:15 +02:00
Alexander Morozov
2de05de98d integration: wait for task running in TestServiceHealthRun 
Test can miss Starting state, so wait until its Running

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2016-09-29 07:44:00 -07:00
Andrew Hsu
64b5fe76cf integration test for missing arg error code 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2016-09-28 16:33:45 -07:00
John Howard
e880bbc48b Windows: Don't set PATH/TERM on exec 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-09-28 13:42:27 -07:00
Vincent Demeester
5280ba83e5
Add a new "is-task" ps filter 
This makes it easier to list containers that are part of a task
(swarm mode) and those who are not.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-09-28 12:45:30 +02:00
Vincent Demeester
b0e1b8fc79 Merge pull request #24850 from yongtang/24270-service-tasks-filter 
Fix partial/full filter issue in `service tasks --filter`
 2016-09-28 11:50:27 +02:00
Misty Stanley-Jones
bab64af2ad Merge pull request #26931 from thaJeztah/fix-aux-address-example 
Fix incorrect aux-address examples and test
 2016-09-27 17:06:01 -07:00
Vincent Demeester
b881148385 Merge pull request #26255 from Microsoft/jjh/xenon-test-infrastructure 
Add isolation to info - enables Hyper-V containers CI bring-up
 2016-09-27 18:46:51 +02:00
Sebastiaan van Stijn
fd7161bb30
Fix incorrect aux-address examples and test 
The (host)name for aux-addresses should
be unique, otherwise later values overwrite
earlier values.

Before this change, the example command
would send this API request;

    {
      "Attachable": false,
      "CheckDuplicate": true,
      "Driver": "overlay",
      "EnableIPv6": false,
      "IPAM": {
        "Config": [
          {
            "Gateway": "192.168.0.100",
            "IPRange": "192.168.1.0/24",
            "Subnet": "192.168.0.0/16"
          },
          {
            "AuxiliaryAddresses": {
              "a": "192.170.1.5",
              "b": "192.170.1.6"
            },
            "Gateway": "192.170.0.100",
            "Subnet": "192.170.0.0/16"
          }
        ],
        "Driver": "default",
        "Options": {
        }
      },
      "Internal": false,
      "Labels": {
      },
      "Name": "my-multihost-network",
      "Options": {
      }
    }

After this change, the request looks
like this (all aux-addresses preserved);

    {
      "Attachable": false,
      "CheckDuplicate": true,
      "Driver": "overlay",
      "EnableIPv6": false,
      "IPAM": {
        "Config": [
          {
            "AuxiliaryAddresses": {
              "my-router": "192.168.1.5",
              "my-switch": "192.168.1.6"
            },
            "Gateway": "192.168.0.100",
            "IPRange": "192.168.1.0/24",
            "Subnet": "192.168.0.0/16"
          },
          {
            "AuxiliaryAddresses": {
              "my-printer": "192.170.1.5",
              "my-nas": "192.170.1.6"
            },
            "Gateway": "192.170.0.100",
            "Subnet": "192.170.0.0/16"
          }
        ],
        "Driver": "default",
        "Options": {
        }
      },
      "Internal": false,
      "Labels": {
      },
      "Name": "my-multihost-network",
      "Options": {
      }
    }

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-27 01:12:29 +02:00
Yong Tang
f676fc93c3 Fix partial/full filter issue in service tasks --filter 
This fix tries to address the issue related to 24108 and 24790, and
also the case from 24620#issuecomment-233715656

The reason for the failure case in the above mentioned issues is that
currently Task names are actually indexed by Service Name
(`e.ServiceAnnotations.Name`)

To fix it, a pull request in swarmkit (swarmkit/pull/1193) has been
opened separately.

This fix adds the integration tests for the above mentioned issues.
Swarmkit revendoring is needed to completely fix the issues.

This fix fixes 24108.
This fix fixes 24790.
This fix is related to 24620.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-09-26 16:01:20 -07:00
Aaron Lehmann
33466024e7 Merge pull request #26219 from dmcgowan/optimize-token-server-error-test 
Update token server error test to not fail on retries
 2016-09-26 23:17:09 +01:00
Victor Vieux
f67096c20b Merge pull request #26744 from LK4D4/attach_before_start 
libcontainerd: attach streams before create
 2016-09-26 13:08:05 -07:00
Sebastiaan van Stijn
a4dd51a660 Merge pull request #23886 from AkihiroSuda/stackcli 
add `docker stack ls`
 2016-09-26 21:19:04 +02:00
Arnaud Porterie
7944480dd0 Merge pull request #26839 from tonistiigi/build-cache 
Implement build cache based on history array
 2016-09-26 17:31:49 +00:00
allencloud
5ba203e73a validate service parameter in client side to avoid api call 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-09-26 17:18:02 +08:00
Yong Tang
de4871165b Improve error message for removing pre-defined (e.g., ingress) network 
This fix tries to address the issue raised in 24538

where the error message is unclear when removing pre-defined networks:
```
docker network rm ingress
Error response from daemon: rpc error: code = 7 desc = 4vlxuzpk8bxdsxpyvkxluol5g is a pre-defined network and cannot be removed
```

This fix improve the error message so that if network's name is specified
in the `RemoveNetwork`, then error message will contain the name and the ID
(instead of just an ID):
```
docker network rm ingress
Error response from daemon: rpc error: code = 7 desc = ingress (4vlxuzpk8bxdsxpyvkxluol5g) is a pre-defined network and cannot be removed
```

An integration test has been added to cover the changes.

This fix fixes 24538.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-09-24 11:59:26 -07:00
John Howard
c4e1697274 Add isolation to info 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-09-23 12:13:29 -07:00
Tonis Tiigi
4b8e680bcc Add integration test for build —cache-from 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-09-23 11:30:34 -07:00
Phil Estes
57f0164fd2 Merge pull request #26834 from thaJeztah/deprecate-docker-daemon 
Deprecate "daemon" subcommand
 2016-09-23 08:51:18 -04:00
Vincent Demeester
72f556a9ff Merge pull request #26516 from yongtang/26453-build-bad-syntax 
Check bad syntax on dockerfile before building.
 2016-09-23 12:24:20 +02:00
Sebastiaan van Stijn
bf58dd82c3
Deprecate "daemon" subcommand 
The daemon is in a separate (dockerd) binary
since docker 1.12, so should no longer be
used.

This marks the command as deprecated, and
adds it to the deprecated features list.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-23 00:26:27 +02:00
Akihiro Suda
5ce08ddfca add docker stack ls 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2016-09-22 19:31:39 +00:00