Merge branch '1.0'
Conflicts: weave
This commit is contained in:
commit
2bb84ae28b
1 file changed
+1
-1
@@ -932,7 +932,7 @@ docker_client_args() {
|
|||||||
# TODO: Handle relative paths for args
|
# TODO: Handle relative paths for args
|
||||||
# TODO: Handle args with spaces
|
# TODO: Handle args with spaces
|
||||||
tls_arg() {
|
tls_arg() {
|
||||||
PROXY_VOLUMES="$PROXY_VOLUMES -v $2:/home/weave/tls/$3.pem"
|
PROXY_VOLUMES="$PROXY_VOLUMES -v $2:/home/weave/tls/$3.pem:ro"
|
||||||
PROXY_ARGS="$PROXY_ARGS $1 /home/weave/tls/$3.pem"
|
PROXY_ARGS="$PROXY_ARGS $1 /home/weave/tls/$3.pem"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user