6ff2c18564
Merge pull request #6 from vieux/update_VERSION
...
update VERSION file
2017-05-31 15:03:04 -07:00
818749ed63
update version
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
2017-05-31 11:00:44 -07:00
81dbbfda23
Merge component 'cli' from git@github.com:docker/cli master
2017-05-31 16:43:39 +00:00
5c0019b6e8
Merge pull request #129 from dnephin/remove-gox
...
Remove gox, add support for s390x
Upstream-commit: 6c59636498
2017-05-30 14:05:58 -07:00
ee28c840c7
Remove gox, add support for s390x
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: b7b7d784d8
2017-05-30 16:01:21 -04:00
5146944e21
Merge pull request #118 from cpuguy83/no_prune_volume
...
Don't prune volumes on `docker system prune`
Upstream-commit: f3cb13c550
2017-05-30 10:21:15 -07:00
f001f628d8
Merge pull request #135 from johnstep/fix_stack_service_configs
...
Include stack service configs in service specs
Upstream-commit: ebd5191c0e
2017-05-30 13:17:49 -04:00
a89e29d68b
Don't prune volumes on docker system prune
...
Volumes tend to carry important data and pruning them on `docker system
prune` can easily cause unwanted data loss.
Let's play it safe and not prune volumes on `system prune` by default,
and instead provide an option.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 37fd6128dc
2017-05-30 12:50:30 -04:00
7caa2a586e
Merge pull request #134 from johnstep/remove_stack_configs
...
Remove stack configs on stack removal
Upstream-commit: f573976486
2017-05-30 11:53:54 -04:00
94d3fb628e
Include stack service configs in service specs
...
Signed-off-by: John Stephens <johnstep@docker.com >
Upstream-commit: b7cac96f69
2017-05-26 21:41:04 -07:00
8870137e27
Remove stack configs on stack removal
...
Signed-off-by: John Stephens <johnstep@docker.com >
Upstream-commit: f05cd11ee2
2017-05-26 18:17:43 -07:00
a582df93a3
Merge pull request #126 from marcusmartins/handle_empty_registry_info
...
Handle a Docker daemon without registry info
Upstream-commit: 1b8b63be5c
2017-05-26 15:32:09 -07:00
a9dda5c374
Handle a Docker daemon without registry info
...
The current implementation of the ElectAuthServer doesn't handle well when the
default Registry server is not included in the response from the daemon Info
endpoint.
That leads to the storage and usage of the credentials for the default registry
(`https://index.docker.io/v1/ `) under an empty string on the client config file.
Sample config file after a login via a Docker Daemon without Registry
information:
```json
{
"auths": {
"": {
"auth": "***"
}
}
}
```
That can lead to duplication of the password for the default registry and
authentication failures against the default registry if a pull/push is performed
without first authenticating via the misbehaving daemon.
Also, changes the output of the warning message from stdout to sdterr as
per dnephin suggestion.
Signed-off-by: Marcus Martins <marcus@docker.com >
Upstream-commit: 862649707e
2017-05-26 14:46:39 -07:00
cbcb1aca45
Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master
2017-05-25 05:58:35 +00:00
680164099a
pass in git commit override when building deb
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
Upstream-commit: 3c70b56937c415c6bf3516aeaa5231c6d7d3145d
Component: packaging
2017-05-25 05:57:29 +00:00
a88dc6ffda
override ver and git commit when building all deb pkgs
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
Upstream-commit: 4397990e00863254d78c44fbe904a70272b5b340
Component: packaging
2017-05-25 05:22:42 +00:00
cefc7ca79a
Merge component 'cli' from git@github.com:docker/cli master
2017-05-24 23:00:04 +00:00
a32935ea52
Merge pull request #127 from andrewhsu/gitcommit
...
allow override of git hash when building binary
Upstream-commit: 11e7d35f9c
2017-05-24 15:57:02 -07:00
9cdca5ef2e
pass in optional GITCOMMIT override
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
Upstream-commit: 446af3a9b7
2017-05-24 22:45:42 +00:00
6a563fa217
Merge pull request #2 from seemethere/fix_hash_files_target
...
Make the hash_files target non interactive
Upstream-commit: 1e779c6848a4f796d8b2a12b64c7a85183180b19
Component: packaging
2017-05-24 10:15:43 -07:00
92d664086d
Make the hash_files target non interactive
...
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
Upstream-commit: 097516fc76a2c9acf798dc523326904520ff1fc7
Component: packaging
2017-05-24 10:11:40 -07:00
d1013c3e75
Merge pull request #102 from keloyang/attach-block
...
Recheck the container's state to avoid attach block.
Upstream-commit: 61c0b9f78d
2017-05-24 12:09:38 +01:00
79087a0823
Merge pull request #109 from vdemeester/codecov-in-circle
...
Add test-coverage & codecov target and update circleci
Upstream-commit: e47cc91ac9
2017-05-23 11:59:05 -04:00
783c8c542c
just docker ce
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
2017-05-23 04:49:57 +00:00
5e0e51d4b4
added issues section
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
2017-05-23 04:37:33 +00:00
d097d03226
Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master
2017-05-23 03:30:17 +00:00
b602250a48
more doc cleanup
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
Upstream-commit: dafbbb4fa4fbaade4ae0a6abcba39bbfcd8f755d
Component: packaging
2017-05-23 03:19:52 +00:00
afb05b3e5d
Merge pull request #119 from andrewhsu/ver
...
allow version number to be set in builds
Upstream-commit: 28eb46de56
2017-05-22 18:16:41 -07:00
a27d8b8afb
Merge pull request #1 from seemethere/add_file_hashing
...
Add file hashing for static files
Upstream-commit: 48d4119a0bdb61639214a971360490e8a4fbe025
Component: packaging
2017-05-22 15:41:10 -07:00
fe481b52a5
Move the hashing of files to its own target
...
So we can use it at will
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
Upstream-commit: 533a843393bd7c3674074ec9af73c8e666fc7484
Component: packaging
2017-05-22 15:11:53 -07:00
b3cf695357
Add file hashing for static files
...
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
Upstream-commit: a1b7f6f3407546ff41ed2e0d16d7e1b2a8ac0ef4
Component: packaging
2017-05-22 14:43:24 -07:00
1d9c61db3a
allow version number to be set in builds
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
Upstream-commit: 3dfe334a7a
2017-05-22 13:22:42 -07:00
b936f95f25
Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master
2017-05-22 19:51:06 +00:00
141bcdee33
specific version numbers for ubuntu
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
Upstream-commit: c4e3bb1768ff6f6285e65ca88436aa7de5b89bc8
Component: packaging
2017-05-22 19:48:10 +00:00
3faf0eaaca
Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master
2017-05-20 06:07:04 +00:00
ca31069c30
added clean target to the makefile
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
2017-05-20 06:06:29 +00:00
2c17301752
pass the top-level version to packaging targets
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
2017-05-20 06:03:35 +00:00
3e531d5fd4
change default target to call for static binaries
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
2017-05-20 06:02:06 +00:00
a36b59a609
fix static package generation
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
Upstream-commit: 3513248c56fc917a0b37ff140ca7981d7af933ef
Component: packaging
2017-05-20 06:00:56 +00:00
b3f06aaffe
Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master
2017-05-20 05:12:23 +00:00
61ed131a71
initial commit
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
Upstream-commit: f64fc552cdfc4b4f2efb384054970fb0bfc1bd25
Component: packaging
2017-05-20 05:11:06 +00:00
969598bdd6
Initial commit
...
Upstream-commit: 3b31275fd8206e35f73e37d91ccaea19446eb79c
Component: packaging
2017-05-19 20:08:25 -07:00
b89892dc70
added more words to readme
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
2017-05-20 00:22:54 +00:00
1959f587f4
Recheck the container's state to avoid attach block.
...
If use docker attach command to attach to a stop container, it will return
"You cannot attach to a stopped container" error, it's ok, but when
attach to a running container, it(docker attach) use inspect to check
the container's state, if it pass the state check on the client side,
and then the container is stopped, docker attach command still attach to
the container and not exit.
Signed-off-by: Shukui Yang <yangshukui@huawei.com >
Upstream-commit: f9dc3337f9
2017-05-20 08:02:06 +08:00
3335862e61
Merge component 'engine' from git@github.com:moby/moby master
2017-05-19 23:48:32 +00:00
ee4c982801
Merge component 'cli' from git@github.com:docker/cli master
2017-05-19 23:24:51 +00:00
37d72b0858
initial commit
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
2017-05-19 23:20:37 +00:00
56595bb8e6
initial readme
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
2017-05-19 16:10:50 -07:00
f039c950a8
Upload coverage report from outside of test container.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: f6d148c632
2017-05-19 17:37:38 -04:00
56d05cc358
Add test-coverage & codecov target and update circleci
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: d79d903864
2017-05-19 17:22:37 -04:00
