schiwagoa/ufw-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix a bug about finding instance name

Browse Source
This commit is contained in:
Chai Feng 2018-10-03 15:44:08 +08:00
parent 52ca7eda4d
commit 589832c221
No known key found for this signature in database
GPG Key ID: 2DCD9A24E523FFD2
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ufw-docker
View File

@ -107,8 +107,8 @@ function ufw-docker--instance-name() {
local INSTANCE_ID="$1" local INSTANCE_ID="$1"
{ {
{ {
echo -n "$INSTANCE_ID" | grep "^${GREP_REGEXP_INSTANCE_NAME}\$" &>/dev/null && docker inspect --format='{{.Name}}' "$INSTANCE_ID" 2>/dev/null | sed -e 's,^/,,' |
docker inspect --format='{{.Name}}' "$INSTANCE_ID" 2>/dev/null | sed -e 's,^/,,'; grep "^${GREP_REGEXP_INSTANCE_NAME}\$" &>/dev/null
} || echo -n "$INSTANCE_ID"; } || echo -n "$INSTANCE_ID";
} | remove_blank_lines } | remove_blank_lines
} }
@ -151,7 +151,7 @@ function ufw-docker--service-allow() {
if ! docker service inspect "$service_name" \ if ! docker service inspect "$service_name" \
--format '{{range .Endpoint.Spec.Ports}}{{.TargetPort}}/{{.Protocol}}{{end}}' | --format '{{range .Endpoint.Spec.Ports}}{{.TargetPort}}/{{.Protocol}}{{end}}' |
grep -E "^${port}/${proto}\$"; then grep -E "^${port}/${proto}\$" &>/dev/null; then
die "Service $service_name does not publish port $service_port." die "Service $service_name does not publish port $service_port."
return 1 return 1
fi fi