Vincent Demeester
9e142cadc9
Import DisplayablePorts from moby/moby source
...
This has nothing to do in the `api` package for moby as it's just a
cli display function.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-06-23 20:12:30 +02:00
Vincent Demeester
ca8e991469
Merge pull request #232 from dnephin/fix-circle-git
...
Use an image with git and ssh for circleCI
2017-06-23 09:37:18 +02:00
Sebastiaan van Stijn
aefbc9d8f7
Merge pull request #202 from ripcurld0/fix_32235_moby
...
Unmarshal a number as a Number in RawInspectFallback
2017-06-22 23:12:50 -07:00
Daniel Nephin
74c1388f66
Use an image with git and ssh for circleCI
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-06-22 19:51:36 -04:00
Vincent Demeester
ae2c3ffb40
Merge pull request #226 from mstanleyjones/typo-fix-auth
...
Fix small typo
2017-06-22 10:01:24 +02:00
Vincent Demeester
53ac8bbed8
Merge pull request #228 from seemethere/wrap_pwd
...
Fix mounts for directories with weird chars
2017-06-22 09:59:41 +02:00
Eli Uriegas
1119e992f2
Fix mounts for directories with weird chars
...
Fixes:
`make -f docker.Makefile binary`
When directories have characters like `&&` they must be wrapped in
quotes or else the docker run command will fail.
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
2017-06-21 17:47:40 -07:00
Misty Stanley-Jones
ede69a38c2
Fix small typo
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2017-06-21 11:06:26 -07:00
Daniel Nephin
edfc89f4de
Merge pull request #152 from dnephin/improve-volume-parse
...
Improve volume spec parsing
2017-06-21 11:45:20 -04:00
Vincent Demeester
4b1055aaa6
Merge pull request #222 from thaJeztah/carry-moby-33290
...
Explain `stack deploy` with multiple Compose files
2017-06-21 17:36:20 +02:00
Daniel Nephin
732261f774
Use compose volume spec parser for container volume flag
...
Restore testcases for Volume spec parsing.
And correctly interpret the parsed volume.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-06-21 11:16:04 -04:00
Daniel Nephin
db6ff357a7
Some improvements to compose volume spec parsing
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-06-21 11:13:52 -04:00
Boaz Shuster
9a2f2d769d
Unmarshal a number as a Number in RawInspectFallback
...
Running `docker inspect --format "{{.ID}} {{.Size}}" alpine` prints
sha256:651aa95985aa4a17a38ffcf71f598ec461924ca96865facc2c5782ef2d2be07f 3983636
While `docker inspect --format "{{.Id}} {{.Size}}" alpine` prints
sha256:651aa95985aa4a17a38ffcf71f598ec461924ca96865facc2c5782ef2d2be07f 3.983636e+06
This happens because "Id" is not a field of types.ImageInspect and thus
tryRawInspectFallback is called and converts the raw response into `interface{}`
using a JSON decoder. However, by default that decoder converts numbers into
`float64` unless `UseNumber` is set.
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
2017-06-21 13:10:14 +03:00
Vincent Demeester
9f00ec085f
Merge pull request #164 from mstanleyjones/clarify-attach
...
Clarify ability to attach multiple times
2017-06-21 10:59:34 +02:00
Vincent Demeester
93562e94a9
Merge pull request #196 from dnephin/use-circleci-workflow
...
Use CircleCI workflows
2017-06-21 10:06:31 +02:00
Vincent Demeester
d5d0ec56c1
Merge pull request #214 from adshmh/add-unit-tests-to-stack-package
...
add unit tests to stack package
2017-06-21 10:00:08 +02:00
Sebastiaan van Stijn
e07fbfda7e
Merge pull request #216 from thaJeztah/fix-markdown
...
Fix Markdown formatting of experimental "stacks"
2017-06-20 21:31:07 -07:00
Sebastiaan van Stijn
36fa4af30b
Explain `stack deploy` with multiple Compose files
...
The Docker Compose docs suggest using a separate override
configuration file for production-specific settings, but
it is not obvious how to feed this to `docker stack deploy`,
which only supports a single Compose file as input. Thus,
we now describe how to do this by merging the configuration
files with `docker-compose config`.
Signed-off-by: Denis Washington <denis@denisw.de>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-06-20 21:23:21 -07:00
Brian Goff
2bfac7fcda
Merge pull request #176 from dnephin/new-lint
...
New linters
2017-06-20 16:47:45 -07:00
Brian Goff
760f847bc8
Merge pull request #195 from Zebrilee/fix-issue-114
...
fix the issue `--help` doesn't work if daemon is not available
2017-06-20 16:38:36 -07:00
Brian Goff
6f6ccbd6bc
Merge pull request #93 from dave-tucker/proxyConfig
...
Allow Proxy Configuration in config.json
2017-06-20 16:15:19 -07:00
Sebastiaan van Stijn
c5301ca35d
Fix Markdown formatting of experimental "stacks"
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-06-20 15:15:08 -07:00
Arash Deshmeh
535af2d868
add unit tests to stack package
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
2017-06-20 14:31:00 -04:00
Dave Tucker
35f1e301b5
Allow Proxy Configuration in config.json
...
This commit modifies config.json to allow for any proxies allowed in
build-args to be configured. These values will then be used
by default as build-args in docker build.
Signed-off-by: Dave Tucker <dt@docker.com>
2017-06-20 09:51:41 +01:00
Aaron Lehmann
5dd30732a2
Merge pull request #124 from darrenstahlmsft/revendorGowinio
...
Update go-winio to v0.4.1
2017-06-16 15:21:55 -07:00
Brian Goff
f767b9a118
Merge pull request #199 from adshmh/remove-logging-from-command-formatter-package-tests
...
removed logging from command/formatter package tests
2017-06-16 14:08:39 -04:00
zebrilee
cca30cb1d9
comment the return of setHelpFunc in order to show --help even if the daemon is not running. Then add a if statement in isSupported function to check if the daemon is running
...
Signed-off-by: zebrilee <zebrilee@gmail.com>
revert change on docker.go, set HasExperimental to true in cli.go
Signed-off-by: zebrilee <zebrilee@gmail.com>
2017-06-16 10:24:26 +02:00
Daniel Nephin
75aebdd463
Try out circleci workflow
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-06-15 12:38:40 -07:00
Arash Deshmeh
7f71d0d979
removed logging from command/formatter package tests
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
2017-06-15 14:14:59 -04:00
Vincent Demeester
eb7452cf3a
Merge pull request #198 from thaJeztah/add-exec-example
...
Added usage example for -e for exec
2017-06-15 18:18:48 +02:00
Sebastiaan van Stijn
23a0e3b7b7
Merge pull request #194 from dnephin/run-docs-gen-in-ci
...
Run docs and man generation in CI
2017-06-15 17:46:56 +02:00
Sebastiaan van Stijn
c848d9b22d
Added usage example for -e for exec
...
Signed-off-by: Vishnu Narayanan <iamwishnu@gmail.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-06-15 17:24:41 +02:00
Daniel Nephin
4881ef507f
Use a fork of gometalinter
...
Until https://github.com/alecthomas/gometalinter/pull/289 is merged.
This reduces the runtime of the linter by 50x
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-06-14 17:30:45 -07:00
Daniel Nephin
3724fb7f37
Add gosimple lint
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-06-14 16:55:08 -07:00
Daniel Nephin
3e3934c19f
Add unparam linter
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-06-14 16:55:08 -07:00
Daniel Nephin
3bf0317fea
Add unconvert linter
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-06-14 16:54:27 -07:00
Daniel Nephin
a712993e93
Add misspell lint
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-06-14 16:54:27 -07:00
Daniel Nephin
01e1e58ada
Add unused linter.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-06-14 16:54:27 -07:00
Daniel Nephin
343d836a95
Run docs and man generation in CI
...
Also cleanup the scripts a bit to be more consistent, and fail on errors.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-06-14 14:59:48 -07:00
Sebastiaan van Stijn
4c224a7786
Merge pull request #191 from php-coder/improve_user_directive_doc
...
docs/reference/builder.md: mention that USER directive also allows to specify a user group
2017-06-14 22:03:38 +02:00
Daniel Nephin
759e59e4a4
Merge pull request #182 from vdemeester/180-fix-stack-rm-config-endpoint
...
Do not call the config endpoint if API is lower than 1.30
2017-06-14 14:31:01 -04:00
Aaron Lehmann
45c2c4c18f
Merge pull request #193 from dnephin/why-cover-so-slow
...
Speed up testing with coverage
2017-06-14 11:29:42 -07:00
Daniel Nephin
63eff6548b
Merge pull request #192 from adshmh/remove-logging-from-service-inspect-test
...
remove logging from service/inspect test case to clean up the output of running tests
2017-06-14 14:23:40 -04:00
Daniel Nephin
3a9ba545bc
Speed up testing with coverage
...
By running a 'go test -i' on all the packages first the overall runtime is significantly
decreased.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-06-14 10:57:36 -07:00
Arash Deshmeh
751278abe6
removed logging from service/inspect test to clean up the output of running tests
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
2017-06-14 12:38:31 -04:00
Slava Semushin
a84463d8d5
docs/reference/builder.md: mention that USER directive also allows to specify the user group.
...
Signed-off-by: Slava Semushin <semushin@redhat.com>
2017-06-14 15:49:37 +02:00
Vincent Demeester
d209929aab
Merge pull request #187 from dnephin/small-cleanup-to-image-remove
...
Fix some problems with image force remove
2017-06-14 09:59:32 +02:00
Vincent Demeester
4ffefe4a1f
Merge pull request #115 from jsoref/spelling
...
Spelling
2017-06-14 09:58:55 +02:00
Vincent Demeester
2128b3f112
Do not call the config endpoint if API is lower than 1.30
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-06-14 09:56:53 +02:00
Brian Goff
3be666387a
Merge pull request #189 from tiborvass/update-docs
...
Update docs, completion, man
2017-06-13 23:04:09 -05:00