fz0x1/ufw-docker
1
0
Fork 0
mirror of https://github.com/chaifeng/ufw-docker.git synced 2025-05-10 21:48:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

using env to find a service which is to be deleted

Browse source
This commit is contained in:
Chai Feng 2018-10-05 18:52:21 +08:00
parent 8116401b7c
commit 0c23335317
No known key found for this signature in database
GPG key ID: 2DCD9A24E523FFD2
1 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
ufw-docker
View file

@ -135,9 +135,8 @@ function ufw-docker--service() {
fi fi
shift || true shift || true
declare service_id_or_name="${1:?Missing swarm service name or service ID}" declare service_id_or_name="${1:?Missing swarm service name or service ID}"
declare service_name="$(docker service inspect "$service_id_or_name" --format '{{.Spec.Name}}')"
"ufw-docker--service-${service_action}" "${service_name}" "ufw-docker--service-${service_action}" "${service_id_or_name}"
;; ;;
allow) allow)
shift || true shift || true
@ -183,6 +182,8 @@ function ufw-docker--service-allow() {
fi fi
declare service_id="$(ufw-docker--get-service-id "${service_name}")" declare service_id="$(ufw-docker--get-service-id "${service_name}")"
[[ -z "$service_id:-" ]] && die "Could not find service \"$service_name\""
service_name="$(ufw-docker--get-service-name "${service_name}")" service_name="$(ufw-docker--get-service-name "${service_name}")"
exec 9< <(docker service inspect "$service_name" \ exec 9< <(docker service inspect "$service_name" \
@ -195,10 +196,7 @@ function ufw-docker--service-allow() {
done done
exec 9<&- exec 9<&-
if [[ -z "${service_env:-}" ]]; then [[ -z "${service_env:-}" ]] && die "Service $service_name does not publish port $service_port."
die "Service $service_name does not publish port $service_port."
return 1
fi
if ! docker service inspect "$ufw_docker_agent" &>/dev/null; then if ! docker service inspect "$ufw_docker_agent" &>/dev/null; then
err "Not found ufw-docker-agent service, creating ..." err "Not found ufw-docker-agent service, creating ..."
@ -222,9 +220,22 @@ function ufw-docker--service-allow() {
function ufw-docker--service-delete() { function ufw-docker--service-delete() {
declare service_name="$1" declare service_name="$1"
declare service_id="$(ufw-docker--get-service-id "${service_name}")" exec 8< <(docker service inspect "${ufw_docker_agent}" \
service_name="$(ufw-docker--get-service-name "${service_name}")" --format '{{range $k,$v := .Spec.TaskTemplate.ContainerSpec.Env}}{{ $v }}{{"\n"}}{{end}}' |
declare service_env="ufw_public_${service_id}=${service_name}/deny" sed -e '/^ufw_public_/!d' \
-e 's/^ufw_public_//' \
-e 's/=/ /')
while read -u 8 id value; do
if [[ "$id" = "$service_name" ]] || [[ "$value" = "${service_name}"/* ]]; then
declare service_id="$id"
service_name="${value%%/*}"
declare service_env="ufw_public_${service_id}=${service_name}/deny"
break;
fi
done
exec 8<&-
[[ -z "${service_env:-}" ]] && die "Could not find service \"$service_name\""
docker service update --update-parallelism=0 \ docker service update --update-parallelism=0 \
--env-add ufw_docker_agent_image="${ufw_docker_agent_image}" \ --env-add ufw_docker_agent_image="${ufw_docker_agent_image}" \