diff --git a/image/Dockerfile b/image/Dockerfile index 6d69a54..7a69b86 100644 --- a/image/Dockerfile +++ b/image/Dockerfile @@ -34,6 +34,7 @@ RUN apk --no-cache add \ && rm -f keepalived.tar.gz \ && rm -rf /container/keepalived-sources \ && apk --no-cache del \ + curl \ gcc \ ipset-dev \ iptables-dev \ diff --git a/image/service/keepalived/finish.sh b/image/service/keepalived/finish.sh index 3276d22..24ecdfd 100755 --- a/image/service/keepalived/finish.sh +++ b/image/service/keepalived/finish.sh @@ -7,9 +7,9 @@ log-helper level eq trace && set -x # try to delete virtual ips from interface for vip in $(complex-bash-env iterate KEEPALIVED_VIRTUAL_IPS) do - IP=$(echo ${!vip} | awk '{print $1}'} + IP=$(echo ${!vip} | awk '{print $1}') IP_INFO=$(ip addr list | grep ${IP}) || continue - IP_V6=$(echo "${IP_INFO}" | grep "inet6") + IP_V6=$(echo "${IP_INFO}" | grep "inet6") || true # ipv4 if [ -z "${IP_V6}" ]; then diff --git a/image/service/keepalived/process.sh b/image/service/keepalived/process.sh index 7e634b7..4d759d3 100755 --- a/image/service/keepalived/process.sh +++ b/image/service/keepalived/process.sh @@ -8,7 +8,7 @@ echo -n "Waiting config file /usr/local/etc/keepalived/keepalived.conf" while [ ! -e "/usr/local/etc/keepalived/keepalived.conf" ] do echo -n "." - sleep + sleep 0.1 done echo "ok" diff --git a/image/service/keepalived/startup.sh b/image/service/keepalived/startup.sh index 8470897..4fae6e3 100755 --- a/image/service/keepalived/startup.sh +++ b/image/service/keepalived/startup.sh @@ -43,9 +43,9 @@ fi # try to delete virtual ips from interface for vip in $(complex-bash-env iterate KEEPALIVED_VIRTUAL_IPS) do - IP=$(echo ${!vip} | awk '{print $1}'} + IP=$(echo ${!vip} | awk '{print $1}') IP_INFO=$(ip addr list | grep ${IP}) || continue - IP_V6=$(echo "${IP_INFO}" | grep "inet6") + IP_V6=$(echo "${IP_INFO}" | grep "inet6") || true # ipv4 if [ -z "${IP_V6}" ]; then