toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
36,558 Commits 3 Branches 295 Tags
13934b618c8183d9bc0daf3a6bd9d1af05238886
Commit Graph
36558 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Boaz Shuster 13934b618c Add container environment variables correctly to the health check 
The health check process doesn't have all the environment
varialbes in the container or has them set incorrectly.

This patch should fix that problem.

Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
(cherry picked from commit 5836d86ac4d617e837d94010aa60384648ab59ea)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
 2017-06-09 13:09:40 -07:00
Andrew Hsu 402dd4a9ea Merge pull request #38 from andrewhsu/rc2 
bump VERSION files to 17.06.0-ce-rc2
v17.06.0-ce-rc2 		2017-06-06 16:05:18 -07:00
Andrew Hsu eb1565bba1 Merge pull request #40 from mlaventure/17.06-rc2-changelog 
Update 17.06 CHANGELOG with rc2 changes
 2017-06-06 15:19:15 -07:00
Andrew Hsu de513d091d Merge pull request #41 from andrewhsu/update-pack 
update with latest changes from docker-ce-packaging
 2017-06-06 15:16:36 -07:00
Kenfe-Mickael Laventure 1d4b51cccb Update 17.06 CHANGELOG with rc2 changes 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-06-06 14:50:01 -07:00
Eli Uriegas b5411da4de Make the hash_files target non interactive 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit 097516fc76a2c9acf798dc523326904520ff1fc7)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2017-06-06 21:26:55 +00:00
Eli Uriegas 7239874782 Add file hashing for static files 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit a1b7f6f3407546ff41ed2e0d16d7e1b2a8ac0ef4)

Conflicts:
components/packaging/static/Makefile
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2017-06-06 21:26:38 +00:00
Eli Uriegas 18355074d7 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>
(cherry picked from commit 533a843393bd7c3674074ec9af73c8e666fc7484)

Conflicts:
components/packaging/static/Makefile
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2017-06-06 21:24:53 +00:00
Andrew Hsu 1f94b6c7ec set $GOPATH/bin for s390x 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
(cherry picked from commit f6d30c3631abee04aa3586cba36960901f705fe2)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2017-06-06 21:21:03 +00:00
Andrew Hsu 737e92d753 no need for tty 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
(cherry picked from commit ade95a2b6f8a16aa7e6c387dc9c9dd48bba9a672)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2017-06-06 21:20:47 +00:00
Andrew Hsu 97b6afddfe bump VERSION files to 17.06.0-ce-rc2 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2017-06-06 16:54:24 +00:00
Andrew Hsu 00327e2c1c Merge pull request #37 from andrewhsu/gen-man 
generate man pages
 2017-06-06 02:16:57 -07:00
Andrew Hsu 0dbee88694 generate man pages 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
(cherry picked from commit e14fca86f8230e10d79a7bfae2873a98a16bb44d)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2017-06-06 09:01:36 +00:00
Andrew Hsu ce44edfbf8 Merge pull request #19 from aluzzardi/revendor-swarmkit 
[17.06] Re-vendor SwarmKit to 4b872cfac8ffc0cc7fff434902cc05dbc7612da5
 2017-06-06 00:37:05 -07:00
Andrea Luzzardi 0efdcc403e Re-vendor SwarmKit to 4b872cfac8ffc0cc7fff434902cc05dbc7612da5 
Includes:
- docker/swarmkit#2203
- docker/swarmkit#2210
- docker/swarmkit#2212

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Signed-off-by: Tibor Vass <tibor@docker.com>
 2017-06-06 05:55:35 +00:00
Andrew Hsu 8cf591e57d Merge pull request #21 from mavenugo/17.06 
Vendoring libnetwork b54433f6459b84eae77892d0d359c1bafb133529
 2017-06-05 22:25:27 -07:00
Andrew Hsu 5cfdad44b3 Merge pull request #36 from tiborvass/fix-manpages-script 
[cli] fix manpages script
 2017-06-05 22:19:24 -07:00
Tibor Vass 5bb86daf51 [cli] fix manpages script 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2017-06-06 05:05:14 +00:00
Andrew Hsu 9b8ffe709d Merge pull request #25 from mlaventure/chp-moby-33502 
Set OPOST on bsd
 2017-06-05 21:56:30 -07:00
Tibor Vass 8928dccaa6 Comment out vendoring for docker/docker in components/cli 
Because of cherry-pick from commit 17ec46a24316f59c808c112e3ca46d7c442a785a
into components/cli/vendor/github.com/docker/docker

Signed-off-by: Tibor Vass <tibor@docker.com>
 2017-06-06 03:45:20 +00:00
Tibor Vass 972de9a657 [vendor] Set OPOST on bsd 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
(cherry picked from commit 17ec46a24316f59c808c112e3ca46d7c442a785a)

Manually update pkg/term vendoring to match changes in moby

Signed-off-by: Tibor Vass <tibor@docker.com>
 2017-06-06 03:42:16 +00:00
Andrew Hsu 9dad38d70a Merge pull request #26 from mlaventure/chp-moby-33500 
Fix ONBUILD COPY
 2017-06-05 20:24:21 -07:00
Madhu Venugopal 699fcc1433 Vendoring libnetwork 
This is a 17.06 equivalent cherry-pick of
https://github.com/moby/moby/pull/33463

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2017-06-06 03:18:59 +00:00
Andrew Hsu 40d95168e1 Merge pull request #16 from mavenugo/cli-1706-stack 
Host and Bridge network support in docker stack deploy
 2017-06-05 19:22:40 -07:00
Andrew Hsu d236b522c5 Merge pull request #33 from andrewhsu/pkg-update 
update with latest from docker-ce-packaging
 2017-06-05 18:40:24 -07:00
Eli Uriegas 111c39aff1 Change ARCH to be reflective 
Signed-off-by: Eli Uriegas <seemethere101@gmail.com>
(cherry picked from commit 930db40ec8424555612ce70781e94d5cb172aa4c)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2017-06-06 00:02:26 +00:00
Eli Uriegas c1c839c28b Rename deb dockerfiles to $(uname -m) equivalents 
Signed-off-by: Eli Uriegas <seemethere101@gmail.com>
(cherry picked from commit 3f7e423438733fb5f593f666d12714ae2f63fcc9)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2017-06-06 00:02:26 +00:00
Eli Uriegas f650eb38a6 Update GO_VERSION to 1.8.3 (#8) 
Signed-off-by: Eli Uriegas <seemethere101@gmail.com>(cherry picked from commit 121e1c478d94a9be5713e944dde113f8637d6e41)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2017-06-06 00:02:26 +00:00
Eli Uriegas aa3a4c2846 Add armhf dockerfiles for deb building (#4) 
Add armhf dockerfiles for deb building

Signed-off-by: Eli Uriegas <seemethere101@gmail.com>
(cherry picked from commit f0c8cea1b79b049743cd1503f7ac4a34c265f476)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2017-06-06 00:02:26 +00:00
Roberto Gandolfo Hashioka 6a52ceebf4 Add DISTRO/SUITE env. variables to the RPM dockerfiles 
Signed-off-by: Roberto Gandolfo Hashioka <roberto_hashioka@hotmail.com>
(cherry picked from commit c4a9e41495fac5e4aa72151b80200aa453f65e08)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2017-06-06 00:02:26 +00:00
Andrew Hsu c6dd1afaa6 Merge pull request #24 from tiborvass/man-yaml-scripts 
Add scripts and targets for manpages and yamldocs
 2017-06-05 16:06:46 -07:00
Tibor Vass f148100b07 Add scripts and targets for manpages and yamldocs 
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit ff615dbc4d)
 2017-06-05 22:51:19 +00:00
Andrew Hsu 8ce2c283f7 Merge pull request #23 from tiborvass/import-man-docs-completion 
Import man docs completion
 2017-06-05 15:40:42 -07:00
Andrew Hsu b2dacf38db Merge pull request #8 from mlaventure/chp-moby-33341 
Do not clear swarm directory at the begining of swarm init and swarm …
 2017-06-05 09:57:27 -07:00
Andrew Hsu 6c636490a3 Merge pull request #22 from mlaventure/chp-cli-136 
Fix stack compose bind-mount volumes for Windows
 2017-06-05 09:54:06 -07:00
Andrew Hsu c1f7e41e4e Merge pull request #12 from mlaventure/chp-cli-135 
Include stack service configs in service specs
 2017-06-05 09:46:58 -07:00
Andrew Hsu a148bf60af Merge pull request #11 from mlaventure/chp-cli-134 
Remove stack configs on stack removal
 2017-06-05 09:46:13 -07:00
Andrew Hsu 4910da9ddb Merge pull request #10 from mlaventure/chp-cli-126 
Handle a Docker daemon without registry info
 2017-06-05 09:45:31 -07:00
Daniel Nephin 9e9c4b52b9 Fix ONBUILD COPY 
the source was missing from the second dispatch

Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit 3f2604157790408acf5ad05c74cebe105f2b6979)
 2017-06-05 08:01:05 -07:00
Michael Crosby fff42c853a Set OPOST on bsd 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
(cherry picked from commit 17ec46a24316f59c808c112e3ca46d7c442a785a)
 2017-06-05 07:45:38 -07:00
Andrew Hsu 2bdf7010a1 Merge pull request #7 from mlaventure/chp-moby-33308 
remove RuntimeData from cluster and types
 2017-06-05 06:10:46 -07:00
Andrew Hsu 46f679cc1d Merge pull request #5 from mlaventure/chp-moby-33311 
Adding support for DNS search on RS1
 2017-06-05 06:09:52 -07:00
Andrew Hsu 3a237eae5f Merge pull request #4 from mlaventure/chp-moby-33376 
Ensure that a device mapper task is referenced until task is complete
 2017-06-05 06:09:13 -07:00
Andrew Hsu 8330e07f4a Merge pull request #3 from mlaventure/chp-moby-33365 
Update go-winio to v0.4.2
 2017-06-05 06:05:37 -07:00
Andrew Hsu 9a732dbff3 Merge pull request #2 from mlaventure/chp-moby-33422 
Don't unmount entire plugin manager tree on remove
 2017-06-05 05:37:07 -07:00
John Stephens 08cb13b09b Fix stack compose bind-mount volumes for Windows 
For stack compose files, use filepath.IsAbs instead of path.IsAbs, for
bind-mounted service volumes, because filepath.IsAbs handles Windows
paths, while path.IsAbs does not.

Signed-off-by: John Stephens <johnstep@docker.com>
(cherry picked from commit 9043d39dea)
 2017-06-02 12:01:27 -07:00
Andrew Hsu 09185931e1 Merge pull request #9 from mlaventure/chp-moby-33387 
Bump go to go1.8.3
 2017-06-02 10:38:59 -07:00
Andrew Hsu 8d44c9a703 Merge pull request #1 from mlaventure/chp-moby-33409 
prevent image prune panic
 2017-06-02 10:38:26 -07:00
Andrew Hsu 0334cfffff Merge pull request #20 from mlaventure/chp-moby-33474 
Use actual cli version for TestConfigHTTPHeader
 2017-06-02 10:33:44 -07:00
Daniel Nephin ae4b9d3f19 Remove old manpage generation dockerfiles and glide config. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: d2976d599f
Component: cli
 2017-06-02 12:00:23 -04:00