Tõnis Tiigi
a3eebaf509
Merge pull request #33090 from tonistiigi/fix-release-mounts
...
builder: Fix releasing implicit mounts
2017-05-10 14:46:58 -07:00
Sebastiaan van Stijn
28d428f4ec
Merge pull request #32061 from nishanttotla/engine-api-manifest
...
Adding Docker API endpoint to inspect image manifest
2017-05-10 23:43:30 +02:00
Brian Goff
e8c2a33b74
Merge pull request #33139 from stevvooe/remove-unused-functions
...
pkg/ioutils: remove unused functions
2017-05-10 16:48:14 -04:00
Brian Goff
a46f7bd5bd
Merge pull request #33128 from crosbymichael/update-containerd-2x
...
Update containerd for terminal updates
2017-05-10 16:45:11 -04:00
Brian Goff
08fdce7738
Merge pull request #32571 from ehazlett/secret-targets
...
Support Custom Secret Targets
2017-05-10 16:26:35 -04:00
Nishant Totla
4a812040eb
Adding example to /distribution/{name}/json endpoint swagger spec
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2017-05-10 11:20:03 -07:00
Aaron Lehmann
0da7bd0314
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>
2017-05-10 10:23:10 -07:00
Aaron Lehmann
47a17c211d
Use forked version of CLI for tests
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-05-10 10:23:10 -07:00
Aaron Lehmann
37ce91ddd6
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>
2017-05-10 10:23:09 -07:00
Evan Hazlett
67d282a5c9
support custom paths for secrets
...
This adds support to specify custom container paths for secrets.
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2017-05-10 10:23:07 -07:00
Victor Vieux
f4349a77fd
Merge pull request #33141 from vieux/update_builder
...
fix builder report url
2017-05-10 10:15:25 -07:00
Victor Vieux
890f021902
fix report url
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-05-10 10:14:18 -07:00
Victor Vieux
4836b0ab85
Merge pull request #33129 from vieux/builder-report-2017-05-07
...
Add dev report for may 8th
2017-05-10 09:25:24 -07:00
Victor Vieux
1397a49811
Add dev report for may 8th
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-05-10 09:11:07 -07:00
Brian Goff
6efdac4291
Merge pull request #33057 from dmcgowan/windows-download-descriptor
...
Use diff ids from image configuration
2017-05-10 11:36:19 -04:00
Stephen J Day
c546894aef
pkg/ioutils: remove unused functions
...
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-05-10 08:34:16 -07:00
Vincent Demeester
6e0e283387
Merge pull request #33087 from Microsoft/jjh/blockreadonly
...
Windows: Block read-only
2017-05-10 17:21:33 +02:00
Sebastiaan van Stijn
46f5d7e325
Merge pull request #33137 from albers/docs-report-link
...
Fix link in dev report
2017-05-10 16:13:30 +02:00
Sebastiaan van Stijn
2a7a938da4
Merge pull request #33045 from albers/completion--health-start-period
...
Add bash completion for `--health-start-period`
2017-05-10 15:54:43 +02:00
Harald Albers
94d3758487
Fix link in dev report
...
Signed-off-by: Harald Albers <github@albersweb.de>
2017-05-10 15:36:43 +02:00
Brian Goff
815e8bb885
Merge pull request #31012 from cpuguy83/do_not_remove_containers_on_error
...
Do not remove containers from memory on error
2017-05-10 06:21:28 -04:00
Vincent Demeester
22a03192fb
Merge pull request #33114 from dnephin/fix-builder-warn-on-unused-builtint
...
Fix warning for unused build args
2017-05-10 09:38:07 +02:00
Madhu Venugopal
80bb6a46a3
Merge pull request #33094 from darrenstahlmsft/RevendorGoWinio
...
Update go-winio to v0.4.0 (go 1.8.x works on Windows)
2017-05-09 22:46:31 -07:00
Tibor Vass
c68612de0c
Merge pull request #33123 from johnstep/windows-respect-client-repo
...
Update make.ps1 to respect client repo
2017-05-09 19:03:50 -07:00
Darren Stahl
24d4177859
Update go-winio to v0.4.0
...
Signed-off-by: Darren Stahl <darst@microsoft.com>
2017-05-09 17:49:55 -07:00
Nishant Totla
12e232ee35
/distribution/{name}/json returns full Descriptor object
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2017-05-09 17:25:27 -07:00
Michael Crosby
270a33b666
Add OPOST back to !cgo build for pkg/term
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-05-09 16:36:17 -07:00
Brian Goff
d1a7ea147c
Merge pull request #33089 from Microsoft/jjh/hccsshimv0.5.16
...
Revendor Microsoft\hcsshim @ v0.5.17
2017-05-09 19:21:20 -04:00
Michael Crosby
6a96049ddf
Update containerd for terminal updates
...
Fixes #33101
This syncs up the OPOST changes for mkraw on the tty
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-05-09 16:14:31 -07:00
Daniel Nephin
543dfde637
Merge pull request #32997 from dnephin/fix-builder-scratch-with-name
...
Fix a rare case where using FROM scratch as NAME would fail
2017-05-09 18:15:33 -04:00
Akihiro Suda
3d7af24f63
Merge pull request #32145 from ripcurld0/fix_32120
...
Disable HTML escaping for JSON in formatter
2017-05-10 06:54:56 +09:00
John Stephens
2bc6fffacb
Update make.ps1 to respect client repo
...
Signed-off-by: John Stephens <johnstep@docker.com>
2017-05-09 13:07:09 -07:00
Sebastiaan van Stijn
1a6f8a92b2
Merge pull request #32792 from rogaha/extra_prometheus_metrics
...
Add extra prometheus metrics
2017-05-09 21:48:34 +02:00
Tianon Gravi
500d267356
Merge pull request #33122 from stevedesmond-ca/patch-1
...
make install script clearer which packages to install for AUFS support
2017-05-09 12:33:58 -07:00
Steve Desmond
089c2e2131
make it clearer which packages to install for AUFS support
...
Signed-off-by: Steve Desmond <steve@vtsv.ca>
2017-05-09 15:02:33 -04:00
John Howard
1bb3f57c45
Revendor Microsoft\hcsshim @ v0.5.17
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2017-05-09 11:44:14 -07:00
Sebastiaan van Stijn
09ff5ce29c
Merge pull request #32909 from cpuguy83/32907_volume_unmount_on_cp
...
Add refcount for MountPoint
2017-05-09 20:15:41 +02:00
Brian Goff
9c537b95de
Merge pull request #33111 from cpuguy83/rerun_vendor
...
Re-run vndr
2017-05-09 13:32:28 -04:00
Sebastiaan van Stijn
781ff2bcff
Merge pull request #33110 from dnephin/remove-some-hack
...
Remove compose-bindata script, it should move to docker/cli
2017-05-09 19:29:56 +02:00
Sebastiaan van Stijn
3a2d68a8a0
Merge pull request #32930 from gjaskiewicz/master
...
gcplogging driver MRPB for VM set
2017-05-09 19:29:23 +02:00
Aaron Lehmann
9370b6ac2d
Merge pull request #33105 from YuPengZTE/devContentReader
...
check err
2017-05-09 09:44:35 -07:00
Daniel Nephin
72cc81ee8d
Fix warning for unused build args.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-05-09 11:25:33 -04:00
Sebastiaan van Stijn
a762ceace4
Merge pull request #32670 from perweij/fix-Dockerfile-instruction
...
Correcting test-instruction.
2017-05-09 17:20:42 +02:00
Brian Goff
5122abeb44
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>
2017-05-09 10:59:25 -04:00
Vincent Demeester
66bc8f128c
Merge pull request #32983 from allencloud/add-disk-usage-test-in-client
...
add disk usage test for client package
2017-05-09 16:44:43 +02:00
Daniel Nephin
47cceb7f2c
Remove compose-bindata script, it should move to docker/cli
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-05-09 10:38:36 -04:00
Sebastiaan van Stijn
7f968435f6
Merge pull request #33062 from ColinHebert/remove_cli_3.3
...
Remove compose 3.3 schema
2017-05-09 16:21:21 +02:00
Grzegorz Jaśkiewicz
d925e50470
gcplogging driver MRPB set
...
Signed-off-by: Grzegorz Jaśkiewicz <gj.jaskiewicz@gmail.com>
2017-05-09 14:24:43 +02:00
yupengzte
595901bd7e
check err
...
Signed-off-by: yupengzte <yu.peng36@zte.com.cn>
2017-05-09 19:24:21 +08:00
Roberto Gandolfo Hashioka
a28b173a78
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>
2017-05-09 01:04:40 -07:00