toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
32,298 Commits 3 Branches 295 Tags
68f498df1100ee618041a29c36c531e1f3420376
Commit Graph
32298 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Aaron Lehmann 68f498df11 Extend test coverage of secrets 
Actually look inside the container to see if the secret data is present
and correct. Test absolute paths, relative paths, and just a basename.
Test the scenario where a service references the same secret under
different targets.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 0da7bd0314a61919428fe036660b822b0bf22d35
Component: engine
 2017-05-10 10:23:10 -07:00
Aaron Lehmann a4b52b68b5 Use forked version of CLI for tests 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 47a17c211d54da80a26ebdd6eb59ffe1a004b997
Component: engine
 2017-05-10 10:23:10 -07:00
Aaron Lehmann 675654a603 Use "local" secret paths based on the secretID 
This prevents targets with the same basename from colliding.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 37ce91ddd60e50a8bcd7ac3a7ba858f94c28c51e
Component: engine
 2017-05-10 10:23:09 -07:00
Evan Hazlett 4764bfe1f6 support custom paths for secrets 
This adds support to specify custom container paths for secrets.

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: 67d282a5c95ca1d25cd4e9c688e89191f662d448
Component: engine
 2017-05-10 10:23:07 -07:00
Victor Vieux 307e8be5eb Merge pull request #33141 from vieux/update_builder 
fix builder report url
Upstream-commit: f4349a77fdaff6198fb6b14398747543b2a134a8
Component: engine
 2017-05-10 10:15:25 -07:00
Victor Vieux 220caf6377 fix report url 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: 890f02190211543001cab77958ba589cc39d75d2
Component: engine
 2017-05-10 10:14:18 -07:00
Victor Vieux 6194db61a4 Merge pull request #33129 from vieux/builder-report-2017-05-07 
Add dev report for may 8th
Upstream-commit: 4836b0ab8573dd1627ba0847792356bcb5c64334
Component: engine
 2017-05-10 09:25:24 -07:00
Victor Vieux f6fd5c02a5 Add dev report for may 8th 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: 1397a4981103c290e095eb9ef8ac822c80d8a758
Component: engine
 2017-05-10 09:11:07 -07:00
Brian Goff 6c60a4412d Merge pull request #33057 from dmcgowan/windows-download-descriptor 
Use diff ids from image configuration
Upstream-commit: 6efdac4291bfb2eec1360991596e93707287275c
Component: engine
 2017-05-10 11:36:19 -04:00
Vincent Demeester 781f9bd6c3 Merge pull request #33087 from Microsoft/jjh/blockreadonly 
Windows: Block read-only
Upstream-commit: 6e0e283387e78c912d7ae482d333d3b81e003bf8
Component: engine
 2017-05-10 17:21:33 +02:00
Sebastiaan van Stijn 77dd0ffa1e Merge pull request #33137 from albers/docs-report-link 
Fix link in dev report
Upstream-commit: 46f5d7e32543eb30e0db300844a1b19db971cf86
Component: engine
 2017-05-10 16:13:30 +02:00
Sebastiaan van Stijn 83279055ee Merge pull request #33045 from albers/completion--health-start-period 
Add bash completion for `--health-start-period`
Upstream-commit: 2a7a938da42d5e522c3bdd455c5eb936dcc8f0df
Component: engine
 2017-05-10 15:54:43 +02:00
Harald Albers 8a277c8d39 Fix link in dev report 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 94d3758487a45b31037a608fe070061aef5cd2df
Component: engine
 2017-05-10 15:36:43 +02:00
Brian Goff 4d8c6f2827 Merge pull request #31012 from cpuguy83/do_not_remove_containers_on_error 
Do not remove containers from memory on error
Upstream-commit: 815e8bb885c3d9f70ab763d9844e857590b40ad3
Component: engine
 2017-05-10 06:21:28 -04:00
Vincent Demeester f04e158c49 Merge pull request #33114 from dnephin/fix-builder-warn-on-unused-builtint 
Fix warning for unused build args
Upstream-commit: 22a03192fbf10f583003135421fcbc72c38f1ee4
Component: engine
 2017-05-10 09:38:07 +02:00
Madhu Venugopal 3cfa1e91a7 Merge pull request #33094 from darrenstahlmsft/RevendorGoWinio 
Update go-winio to v0.4.0 (go 1.8.x works on Windows)
Upstream-commit: 80bb6a46a33d0396b3a8b15dc8c0ad81e05682b6
Component: engine
 2017-05-09 22:46:31 -07:00
Tibor Vass 88971970c1 Merge pull request #33123 from johnstep/windows-respect-client-repo 
Update make.ps1 to respect client repo
Upstream-commit: c68612de0cb526bdcec20a9708c241284468942c
Component: engine
 2017-05-09 19:03:50 -07:00
Darren Stahl d781af028f Update go-winio to v0.4.0 
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 24d41778595722d2d318eba45d9e723aaa918b20
Component: engine
 2017-05-09 17:49:55 -07:00
Brian Goff b4be63f0ee Merge pull request #33089 from Microsoft/jjh/hccsshimv0.5.16 
Revendor Microsoft\hcsshim @ v0.5.17
Upstream-commit: d1a7ea147c92c296dea9ff9de077afafd9222eb0
Component: engine
 2017-05-09 19:21:20 -04:00
Daniel Nephin 89b14a8486 Merge pull request #32997 from dnephin/fix-builder-scratch-with-name 
Fix a rare case where using FROM scratch as NAME would fail
Upstream-commit: 543dfde6370e2d9b959fe1f8bcf0e51125d75af2
Component: engine
 2017-05-09 18:15:33 -04:00
Akihiro Suda 88c1779859 Merge pull request #32145 from ripcurld0/fix_32120 
Disable HTML escaping for JSON in formatter
Upstream-commit: 3d7af24f63281570edf7f6b254cfd568e5e19aec
Component: engine
 2017-05-10 06:54:56 +09:00
John Stephens d8ca5cea6c Update make.ps1 to respect client repo 
Signed-off-by: John Stephens <johnstep@docker.com>
Upstream-commit: 2bc6fffacbec76a49d2e43ddf06e9f80c4651e8d
Component: engine
 2017-05-09 13:07:09 -07:00
Sebastiaan van Stijn 6044c2ae89 Merge pull request #32792 from rogaha/extra_prometheus_metrics 
Add extra prometheus metrics
Upstream-commit: 1a6f8a92b2c5912058828d560f52281ba0424472
Component: engine
 2017-05-09 21:48:34 +02:00
Tianon Gravi fed1e12870 Merge pull request #33122 from stevedesmond-ca/patch-1 
make install script clearer which packages to install for AUFS support
Upstream-commit: 500d2673560766052dff052ab0b543f62e759856
Component: engine
 2017-05-09 12:33:58 -07:00
Steve Desmond e62db10e7c make it clearer which packages to install for AUFS support 
Signed-off-by: Steve Desmond <steve@vtsv.ca>
Upstream-commit: 089c2e2131ac65d73a25499ee6746b07d0f63b6c
Component: engine
 2017-05-09 15:02:33 -04:00
John Howard cce43bed79 Revendor Microsoft\hcsshim @ v0.5.17 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 1bb3f57c45274e48f675a4548adc030deedda74c
Component: engine
 2017-05-09 11:44:14 -07:00
Sebastiaan van Stijn 25ad1db09f Merge pull request #32909 from cpuguy83/32907_volume_unmount_on_cp 
Add refcount for MountPoint
Upstream-commit: 09ff5ce29c82b6c97123b24855e1ef11e860b47a
Component: engine
 2017-05-09 20:15:41 +02:00
Brian Goff 9f46bc72fd Merge pull request #33111 from cpuguy83/rerun_vendor 
Re-run vndr
Upstream-commit: 9c537b95de9a556908c7decc8fccd87f19d455a7
Component: engine
 2017-05-09 13:32:28 -04:00
Sebastiaan van Stijn 05b49d64e0 Merge pull request #33110 from dnephin/remove-some-hack 
Remove compose-bindata script, it should move to docker/cli
Upstream-commit: 781ff2bcffd3997c16465a852dfedbda128457b0
Component: engine
 2017-05-09 19:29:56 +02:00
Sebastiaan van Stijn 0116db53b1 Merge pull request #32930 from gjaskiewicz/master 
gcplogging driver MRPB for VM set
Upstream-commit: 3a2d68a8a0191f968014f86500006543ad09897c
Component: engine
 2017-05-09 19:29:23 +02:00
Aaron Lehmann d96165077e Merge pull request #33105 from YuPengZTE/devContentReader 
check err
Upstream-commit: 9370b6ac2d5de32cbebc063cdb74716b050b9064
Component: engine
 2017-05-09 09:44:35 -07:00
Daniel Nephin 3a59c54458 Fix warning for unused build args. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 72cc81ee8dcfca5503f3a02289f8f3d4a08582ad
Component: engine
 2017-05-09 11:25:33 -04:00
Sebastiaan van Stijn 8a093adb5c Merge pull request #32670 from perweij/fix-Dockerfile-instruction 
Correcting test-instruction.
Upstream-commit: a762ceace4e8c1c7ce4fb582789af9d8074be3e1
Component: engine
 2017-05-09 17:20:42 +02:00
Brian Goff 600b71450c Re-run vndr 
Now that the CLI is gone there are lots of packages that need to be
pruned from vendor.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 5122abeb4416c742255cb85d364d7d25d7f5ce32
Component: engine
 2017-05-09 10:59:25 -04:00
Vincent Demeester 064c831d96 Merge pull request #32983 from allencloud/add-disk-usage-test-in-client 
add disk usage test for client package
Upstream-commit: 66bc8f128ca6718f70b1e8d468196457ca6b98bd
Component: engine
 2017-05-09 16:44:43 +02:00
Daniel Nephin 4999ae4553 Remove compose-bindata script, it should move to docker/cli 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 47cceb7f2c475e1798e8f339dfd4ad988eeaef42
Component: engine
 2017-05-09 10:38:36 -04:00
Sebastiaan van Stijn b7a6083d94 Merge pull request #33062 from ColinHebert/remove_cli_3.3 
Remove compose 3.3 schema
Upstream-commit: 7f968435f6e412250b8e6d7211401e2c4b9a2859
Component: engine
 2017-05-09 16:21:21 +02:00
Grzegorz Jaśkiewicz ddcae36da7 gcplogging driver MRPB set 
Signed-off-by: Grzegorz Jaśkiewicz <gj.jaskiewicz@gmail.com>
Upstream-commit: d925e5047067c2014a3769d41bebd5c837e4cae3
Component: engine
 2017-05-09 14:24:43 +02:00
yupengzte adc143e6c5 check err 
Signed-off-by: yupengzte <yu.peng36@zte.com.cn>
Upstream-commit: 595901bd7ed629222dbcbf43724b2d2bca66464f
Component: engine
 2017-05-09 19:24:21 +08:00
Roberto Gandolfo Hashioka a7451e12cd Add extra prometheus metrics 
- buildsTriggered
 - buildsFailed
    - valid options:
        metricsDockerfileSyntaxError,
        metricsDockerfileEmptyError,
        metricsCommandNotSupportedError,
        metricsErrorProcessingCommandsError,
        metricsBuildTargetNotReachableError,
        metricsMissingOnbuildArgumentsError,
        metricsUnknownInstructionError,
        metricsBuildCanceled,
- engineInfo

Signed-off-by: Roberto Gandolfo Hashioka <roberto_hashioka@hotmail.com>
Upstream-commit: a28b173a780cd06db6d93197c54b00a7d616b3dc
Component: engine
 2017-05-09 01:04:40 -07:00
Vincent Demeester 434dcf82ed Merge pull request #32939 from jvmatl/master 
Improve documentation on the -e flag to the 'run' cli command. 
Upstream-commit: 85a7f4bbc7e3817f7ab0aaff270aad697e86068c
Component: engine
 2017-05-09 09:50:21 +02:00
Vincent Demeester d16e6f29c5 Merge pull request #32877 from chchliang/unittest 
add testcase with api/errors/errors_test.go
Upstream-commit: 6b3801858c7aec2c2170a9c9a9a8651d071b1549
Component: engine
 2017-05-09 09:42:08 +02:00
Vincent Demeester 7c11016102 Merge pull request #33083 from albers/completion-stack-deploy--prune 
bash completion for `stack deploy --prune`
Upstream-commit: 040a1d79a2fd2b023f095a705661dfcfbb657f3d
Component: engine
 2017-05-09 09:36:12 +02:00
Boaz Shuster 07ecdb31c7 Disable HTML escaping for JSON in formatter 
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
Upstream-commit: 5766317e33f088c438eff52124c516f18e764b99
Component: engine
 2017-05-09 10:16:10 +03:00
Tibor Vass cf964b3db2 Merge pull request #33059 from nishanttotla/vendor-swarmkit 
Vendor swarmkit f420c4b9e1535170fc229db97ee8ac32374020b1
Upstream-commit: 4b846a125b1618e19b389bcdf88b57bef0a05817
Component: engine
 2017-05-08 14:27:51 -07:00
Tonis Tiigi ead01af4bc Add builder dev-report for 2017-05-07 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 63c16a443a9d5728dec19ae5de4abb61bdb9441c
Component: engine
 2017-05-08 11:36:37 -07:00
Brian Goff 652bcc7bd2 Merge pull request #33092 from tonistiigi/remove-install-binary-client 
hack: Remove install-binary-client
Upstream-commit: daa8b262fe44f5e9567477f55e026cca907e9589
Component: engine
 2017-05-08 14:32:13 -04:00
Tonis Tiigi d4514d6239 hack: Remove install-binary-client 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 973bce210039085416229c05c97c23feb5db9866
Component: engine
 2017-05-08 10:50:31 -07:00
Sebastiaan van Stijn dea94ff28a Merge pull request #33085 from thaJeztah/docs-improve-pipe-description 
fix confusing description of stdout/stdin pipe
Upstream-commit: dda41118b0b09b0377bf4957051b8f6dcd89ed14
Component: engine
 2017-05-08 18:55:04 +02:00
John Howard 23f95e7a60 Windows: Block read-only 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 6f7dc65847c45e85e48bb42387114000d2334844
Component: engine
 2017-05-08 09:29:37 -07:00