Sebastiaan van Stijn
c8b9c21ef9
Merge pull request #1178 from cyli/fix-swarm-ca-command
...
Propagate the provided external CA certificate to the external CA object in swarm
2018-07-10 01:31:32 +02:00
Brian Goff
b91953f507
Merge pull request #1196 from adshmh/use-sort-slice-for-sorting-cli-compose
...
refactored commands to use sort.Slice
2018-07-09 07:18:11 -07:00
Arash Deshmeh
71d650ee17
refactored cli/compose and cli/command/trust to use sort.Slice and removed custom types used for sorting
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
2018-07-08 15:08:17 -04:00
Sebastiaan van Stijn
2b221d8f1c
Merge pull request #1194 from adshmh/use-sort-slice-for-sorting-output
...
use sort.Slice for sorting commands' output
2018-07-07 18:13:12 +02:00
Arash Deshmeh
ceed42217d
refactored all commands under cli/command/ to use sort.Slice instead of declaring custom types for sorting
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
2018-07-06 15:49:32 -04:00
Vincent Demeester
2634562119
Merge pull request #1102 from sfluor/1074-fix-mapping-a-range-of-host-ports-to-a-single-container-port
...
Fix mapping a range of host ports to a single container port
2018-07-06 14:41:00 +02:00
Brian Goff
8160759013
Merge pull request #1166 from adshmh/add-sort-to-plugin-list
...
Sort plugin names in a natural order
2018-07-05 16:34:25 -07:00
Peter Kehl
249c8652a2
For docker/docker.github.io/issues/6987
...
Signed-off-by: Peter Kehl <peter.kehl@gmail.com>
2018-07-05 14:12:47 -07:00
Arash Deshmeh
26151d910a
The output of plugin list command is sorted by plugin name
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
2018-07-05 12:35:53 -04:00
Sami Tabet
29612ccefe
Adding support of the long syntax publish notation
...
Signed-off-by: Sami Tabet <salph.tabet@gmail.com>
2018-07-05 00:33:13 +02:00
Silvin
f285fe67e9
Merge pull request #1163 from thaJeztah/bump_engine
...
bump docker and dependencies
2018-07-04 16:17:12 +02:00
Sebastiaan van Stijn
5f6d5c7328
Bump docker and dependencies
...
Updates docker/docker to 1436dc8f8d0f6f60b6e335fbd918d6b22ee6574d,
matching 18.06.0-rc1
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-07-04 01:14:40 +00:00
Sebastiaan van Stijn
bded5beb78
Merge pull request #1186 from tiborvass/buildkit-envvar-zero
...
build: use strconv.ParseBool to parse DOCKER_BUILDKIT to allow value "0"
2018-07-04 01:28:03 +02:00
Tibor Vass
721000e6c9
build: use strconv.ParseBool to parse DOCKER_BUILDKIT to allow value "0"
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2018-07-03 23:14:06 +00:00
Tibor Vass
7b255e653a
Merge pull request #1176 from tiborvass/buildkit-iidfile
...
build: --iidfile support with buildkit
2018-07-03 15:36:23 -07:00
Tibor Vass
c7e85c09d2
build: --iidfile support with buildkit
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2018-07-03 19:11:11 +00:00
Tõnis Tiigi
69e1743e3d
Merge pull request #1156 from dmcgowan/fix-manifest-list-size
...
Fix manifest lists to always use correct size
2018-07-03 11:27:19 -07:00
Ying Li
4243440e1f
Propagate the provided external CA certificate to the external CA object
...
in swarm.
Also, fix some CLI command confusions:
1. If the --external-ca flag is provided, require a --ca-cert flag as well, otherwise
the external CA is set but the CA certificate is actually rotated to an internal
cert
2. If a --ca-cert flag is provided, require a --ca-key or --external-ca flag be
provided as well, otherwise either the server will say that the request is
invalid, or if there was previously an external CA corresponding to the cert, it
will succeed. While that works, it's better to require the user to explicitly
set all the parameters of the new desired root CA.
This also changes the `swarm update` function to set the external CA's CACert field,
which while not strictly necessary, makes the CA list more explicit.
Signed-off-by: Ying Li <ying.li@docker.com>
2018-07-02 17:14:21 -07:00
Vincent Demeester
f5393c904a
Merge pull request #1175 from vdemeester/bump-k8s
...
Bump kubernetes dependencies to 1.8.14
2018-07-02 17:12:35 +02:00
Vincent Demeester
b59c41b2a7
Bump kubernetes dependencies to 1.8.14
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-07-02 16:32:07 +02:00
Sebastiaan van Stijn
95a9b4d5fe
Merge pull request #1172 from vdemeester/no-need-to-check-files
...
Remove composefiles length check on k8s RunDeploy
2018-07-02 15:06:50 +02:00
Vincent Demeester
847e0c22d4
Remove composefiles lenght check on k8s RunDeploy..
...
The compose file(s) are already loaded at that point.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-07-02 15:00:19 +02:00
Sebastiaan van Stijn
a2b4d30cd0
Merge pull request #1171 from silvin-lubecki/fix-doc-typo
...
Fix Format example typo"
2018-07-02 14:47:39 +02:00
Silvin Lubecki
d0ddf91539
Fixing issue #1167 "Format example typo"
...
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
2018-07-02 14:21:10 +02:00
Silvin
18091ea7e2
Merge pull request #1170 from vdemeester/omit-silvin
...
Add omitempty on compose config top-level types
2018-07-02 14:16:53 +02:00
Vincent Demeester
f05ab2b1fb
Add omitempty on compose config top-level types
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-07-02 12:04:09 +02:00
Vincent Demeester
981c099b96
Merge pull request #1169 from silvin-lubecki/schema-vendoring
...
Add a doc.go file so the compose/schema/data directory can be vendore…
2018-07-02 10:47:25 +02:00
Sebastiaan van Stijn
1c69e83034
Merge pull request #1168 from vdemeester/update-testing
...
Update TESTING.md to replace testify by gotest.tools
2018-07-02 10:34:28 +02:00
Silvin Lubecki
3a8ef767f8
Add a doc.go file so the compose/schema/data directory can be vendored in another project, without being pruned.
...
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
2018-07-02 10:08:25 +02:00
Vincent Demeester
9e36ff4491
Merge pull request #1160 from euank/simpler-pass
...
config/credentials: don't run 'pass' to detect it
2018-07-02 09:40:47 +02:00
Vincent Demeester
057bf6f4d1
Update TESTING.md to replace testify by gotest.tools
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-07-02 09:24:28 +02:00
Tom Klingenberg
b91fd12996
add test for zero length variable name
...
parsing an environment file should give an error in case a zero-length
variable name (definition w/o a variable name) is encountered.
previously these lines went through unnoticed not informing the user about
a potential configuration error.
Signed-off-by: Tom Klingenberg <tklingenberg@lastflood.net>
2018-07-02 07:52:02 +02:00
Tom Klingenberg
96c026eb30
import environment variables that are present
...
previously docker did import environment variables if they were present
but created them if they were not when it was asked via a --env-file
cli option to import but not create them.
fix is to only import the variable into the environment if it is present.
additionally do not import variable names of zero-length (which are lines
w/ a potential variable definition w/o a variable name).
refs:
- https://github.com/docker/for-linux/issues/284
Signed-off-by: Tom Klingenberg <tklingenberg@lastflood.net>
2018-07-02 07:37:12 +02:00
Tom Klingenberg
1e89745704
add test for undefined variable environment file import
...
test to show current behavior is wrong at parsing an environment file
defining an undefined variable - it must not be defined!
NOTE: this test assume the $HOME variable is always set (see POSIX, this
normally is the case, e.g. the test suite remains stable).
Signed-off-by: Tom Klingenberg <tklingenberg@lastflood.net>
2018-07-02 07:33:44 +02:00
Sebastiaan van Stijn
34ba66b0c5
Merge pull request #1157 from AzureCR/master
...
Updated the go-winio library to release 0.4.8 that has the fix for Windows Container
2018-06-29 21:11:53 +02:00
Euan Kemp
056015c3d8
config/credentials: don't run 'pass' to detect it
...
'CheckInitialized' in the credential-helper library actually invokes
`pass`, which isn't desirable (see #699 ).
This moves the check to be simpler, and then pass will only be invoked
when it's needed (such as for `docker login` or when pulling from a
private registry).
This logic could also reasonably live in the credential-helper library,
but it's simple enough it seems fine in either location.
Signed-off-by: Euan Kemp <euank@euank.com>
2018-06-29 11:38:39 -07:00
Tejaswini Duggaraju
c98c4080a3
Updated the go-winio library to release 0.4.8 that has the fix for Windows containers
...
Signed-off-by: Tejaswini Duggaraju <naduggar@microsoft.com>
2018-06-29 10:49:52 -07:00
Sebastiaan van Stijn
da59ccb601
Merge pull request #1145 from Vimal-Raghubir/590-Add-missing-option
...
Add: Add missing option
2018-06-29 17:16:25 +02:00
Vincent Demeester
9faf728089
Merge pull request #1155 from adshmh/add-unit-tests-to-plugin-list
...
added unit tests to cover plugin list command
2018-06-29 15:49:30 +02:00
Sebastiaan van Stijn
7c7c299eee
Merge pull request #1152 from vdemeester/extract-converter
...
Extract StackConverter from the StackClient
2018-06-29 13:36:55 +02:00
Sebastiaan van Stijn
3991b2fae3
Merge pull request #1158 from albers/completion-dockerd--default-address-pool
...
Add bash completion for `dockerd --default-address-pool`
2018-06-29 11:48:43 +02:00
Sebastiaan van Stijn
fe7ec42566
Merge pull request #1159 from albers/completion-events-exec_die
...
Add bash completion for `exec_die` event
2018-06-29 11:47:58 +02:00
Harald Albers
8443982188
Add bash completion for `exec_die` event
...
Signed-off-by: Harald Albers <github@albersweb.de>
2018-06-29 11:20:23 +02:00
Harald Albers
0e6d9dfe85
Add bash completion for `dockerd --default-address-pool`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2018-06-29 11:11:24 +02:00
Derek McGowan
1fd2d66df8
Fix manifest lists to always use correct size
...
Stores complete OCI descriptor instead of digest and platform
fields. This includes the size which was getting lost by not
storing the original manifest bytes.
Attempt to support existing cached files, if not output
the filename with the incorrect content.
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-06-28 18:17:38 -07:00
Arash Deshmeh
c26121df5c
added unit tests to cover plugin list command
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
2018-06-28 16:51:54 -04:00
Vincent Demeester
ea65e9043c
Merge pull request #1154 from thaJeztah/bump_version_18.07_dev
...
Bump version to 18.07.0-dev
2018-06-28 16:24:08 +02:00
Sebastiaan van Stijn
f1fa1f3f15
Bump version to 18.07.0-dev
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-06-28 15:44:15 +02:00
Vincent Demeester
293553944d
Merge pull request #1151 from vdemeester/update-docker-credential-helper-pass
...
Update docker-credential-helpers dependency
2018-06-28 14:57:05 +02:00
Vincent Demeester
d9741fc96b
Update docker-credential-helpers dependency
...
This is mainly for the `pass` helper ; `pass` shouldn't be called
every docker command anymore ;).
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-06-28 14:44:53 +02:00