From 76b4efa3fc20c25f01845aac7511a376660e54ad Mon Sep 17 00:00:00 2001
From: ofreax <bertrand.gouny@gmail.com>
Date: Sat, 12 Dec 2015 13:48:53 +0100
Subject: [PATCH 02/18] Upgrade baseimage: light-baseimage:0.2.0

---
 CHANGELOG.md     | 3 +++
 Makefile         | 2 +-
 image/Dockerfile | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3056057..94d9c28 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 0.2.0
+  - Upgrade baseimage: light-baseimage:0.2.0
+
 ## 0.1.9
   - Upgrade baseimage: light-baseimage:0.1.5
 
diff --git a/Makefile b/Makefile
index ecf1acf..7fd92a4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 NAME = osixia/keepalived
-VERSION = 0.1.9
+VERSION = 0.2.0
 
 .PHONY: all build test tag_latest release
 
diff --git a/image/Dockerfile b/image/Dockerfile
index cfd144f..bee6009 100644
--- a/image/Dockerfile
+++ b/image/Dockerfile
@@ -1,4 +1,4 @@
-FROM osixia/light-baseimage:0.1.5
+FROM osixia/light-baseimage:0.2.0
 MAINTAINER Bertrand Gouny <bertrand.gouny@osixia.net>
 
 # Keepalived version

From baa3f9649c06100abfb6214e97e0e25fe33475bd Mon Sep 17 00:00:00 2001
From: ofreax <bertrand.gouny@gmail.com>
Date: Mon, 14 Dec 2015 19:26:21 +0100
Subject: [PATCH 03/18] Makefile with build no cacheMakefile with build no
 cache

---
 CHANGELOG.md | 1 +
 Makefile     | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 94d9c28..4b5b6f8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## 0.2.0
   - Upgrade baseimage: light-baseimage:0.2.0
+  - Makefile with build no cache
 
 ## 0.1.9
   - Upgrade baseimage: light-baseimage:0.1.5
diff --git a/Makefile b/Makefile
index 7fd92a4..5e42fb7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,16 @@
 NAME = osixia/keepalived
 VERSION = 0.2.0
 
-.PHONY: all build test tag_latest release
+.PHONY: all build build-nocache test tag_latest release
 
 all: build
 
 build:
 	docker build -t $(NAME):$(VERSION) --rm image
 
+build-nocache:
+	docker build -t $(NAME):$(VERSION) --no-cache --rm image
+
 test:
 	env NAME=$(NAME) VERSION=$(VERSION) bats test/test.bats
 

From b0905af741871ec5ae33dff3ee238e31fa3a8a6c Mon Sep 17 00:00:00 2001
From: ofreax <bertrand.gouny@gmail.com>
Date: Mon, 14 Dec 2015 22:33:16 +0100
Subject: [PATCH 04/18] sed with follow-symlinks

---
 image/service/keepalived/container-start.sh | 22 ++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/image/service/keepalived/container-start.sh b/image/service/keepalived/container-start.sh
index d6e60e6..acad528 100755
--- a/image/service/keepalived/container-start.sh
+++ b/image/service/keepalived/container-start.sh
@@ -10,14 +10,14 @@ if [ ! -e "$FIRST_START_DONE" ]; then
   #
   # bootstrap config
   #
-  sed -i "s|{{ keepalived_interface }}|$KEEPALIVED_INTERFACE|g" /etc/keepalived/keepalived.conf
-  sed -i "s|{{ keepalived_priority }}|$KEEPALIVED_PRIORITY|g" /etc/keepalived/keepalived.conf
-  sed -i "s|{{ keepalived_password }}|$KEEPALIVED_PASSWORD|g" /etc/keepalived/keepalived.conf
+  sed -i --follow-symlinks --follow-symlinks "s|{{ keepalived_interface }}|$KEEPALIVED_INTERFACE|g" /etc/keepalived/keepalived.conf
+  sed -i --follow-symlinks --follow-symlinks "s|{{ keepalived_priority }}|$KEEPALIVED_PRIORITY|g" /etc/keepalived/keepalived.conf
+  sed -i --follow-symlinks --follow-symlinks "s|{{ keepalived_password }}|$KEEPALIVED_PASSWORD|g" /etc/keepalived/keepalived.conf
 
   if [ -n "$KEEPALIVED_NOTIFY" ]; then
-    sed -i "s|{{ keepalived_notify }}|notify \"$KEEPALIVED_NOTIFY\"|g" /etc/keepalived/keepalived.conf
+    sed -i --follow-symlinks --follow-symlinks "s|{{ keepalived_notify }}|notify \"$KEEPALIVED_NOTIFY\"|g" /etc/keepalived/keepalived.conf
   else
-    sed -i "/{{ keepalived_notify }}/d" /etc/keepalived/keepalived.conf
+    sed -i --follow-symlinks --follow-symlinks "/{{ keepalived_notify }}/d" /etc/keepalived/keepalived.conf
   fi
 
   # unicast peers
@@ -27,13 +27,13 @@ if [ ! -e "$FIRST_START_DONE" ]; then
     # it's just a peer
     # stored in a variable
     if [ -n "${!peer}" ]; then
-      sed -i "s|{{ keepalived_unicast_peers }}|${!peer}\n    {{ keepalived_unicast_peers }}|g" /etc/keepalived/keepalived.conf
+      sed -i --follow-symlinks --follow-symlinks "s|{{ keepalived_unicast_peers }}|${!peer}\n    {{ keepalived_unicast_peers }}|g" /etc/keepalived/keepalived.conf
     # directly
     else
-      sed -i "s|{{ keepalived_unicast_peers }}|${peer}\n    {{ keepalived_unicast_peers }}|g" /etc/keepalived/keepalived.conf
+      sed -i --follow-symlinks --follow-symlinks "s|{{ keepalived_unicast_peers }}|${peer}\n    {{ keepalived_unicast_peers }}|g" /etc/keepalived/keepalived.conf
     fi
   done
-  sed -i "/{{ keepalived_unicast_peers }}/d" /etc/keepalived/keepalived.conf
+  sed -i --follow-symlinks --follow-symlinks "/{{ keepalived_unicast_peers }}/d" /etc/keepalived/keepalived.conf
 
   # virtual ips
   KEEPALIVED_VIRTUAL_IPS=($KEEPALIVED_VIRTUAL_IPS)
@@ -42,13 +42,13 @@ if [ ! -e "$FIRST_START_DONE" ]; then
     # it's just a peer
     # stored in a variable
     if [ -n "${!vip}" ]; then
-      sed -i "s|{{ keepalived_virtual_ips }}|${!vip}\n    {{ keepalived_virtual_ips }}|g" /etc/keepalived/keepalived.conf
+      sed -i --follow-symlinks --follow-symlinks "s|{{ keepalived_virtual_ips }}|${!vip}\n    {{ keepalived_virtual_ips }}|g" /etc/keepalived/keepalived.conf
     # directly
     else
-      sed -i "s|{{ keepalived_virtual_ips }}|${vip}\n    {{ keepalived_virtual_ips }}|g" /etc/keepalived/keepalived.conf
+      sed -i --follow-symlinks --follow-symlinks "s|{{ keepalived_virtual_ips }}|${vip}\n    {{ keepalived_virtual_ips }}|g" /etc/keepalived/keepalived.conf
     fi
   done
-  sed -i "/{{ keepalived_virtual_ips }}/d" /etc/keepalived/keepalived.conf
+  sed -i --follow-symlinks --follow-symlinks "/{{ keepalived_virtual_ips }}/d" /etc/keepalived/keepalived.conf
 
   touch $FIRST_START_DONE
 fi

From b779b4d438250895d6173379982f80eb09db6013 Mon Sep 17 00:00:00 2001
From: Bertrand Gouny <bgouny@hipay.com>
Date: Mon, 21 Dec 2015 10:20:18 +0100
Subject: [PATCH 05/18] add chmod+x KEEPALIVED_NOTIFY file

---
 image/service/keepalived/container-start.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/image/service/keepalived/container-start.sh b/image/service/keepalived/container-start.sh
index acad528..2393458 100755
--- a/image/service/keepalived/container-start.sh
+++ b/image/service/keepalived/container-start.sh
@@ -16,6 +16,7 @@ if [ ! -e "$FIRST_START_DONE" ]; then
 
   if [ -n "$KEEPALIVED_NOTIFY" ]; then
     sed -i --follow-symlinks --follow-symlinks "s|{{ keepalived_notify }}|notify \"$KEEPALIVED_NOTIFY\"|g" /etc/keepalived/keepalived.conf
+    chmod +x $KEEPALIVED_NOTIFY
   else
     sed -i --follow-symlinks --follow-symlinks "/{{ keepalived_notify }}/d" /etc/keepalived/keepalived.conf
   fi

From 197ac3dee9321da154f58092ff3bc6e53ccc11f8 Mon Sep 17 00:00:00 2001
From: ofreax <bertrand.gouny@gmail.com>
Date: Mon, 21 Dec 2015 21:39:16 +0100
Subject: [PATCH 06/18] --no-install-recommends

---
 image/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/image/Dockerfile b/image/Dockerfile
index bee6009..d992813 100644
--- a/image/Dockerfile
+++ b/image/Dockerfile
@@ -10,7 +10,7 @@ CMD ["/container/tool/run"]
 
 # Install Keepalived
 RUN apt-get -y update \
-    && LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get install -y \
+    && LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
       curl \
       make \
       gcc \

From b6fdec0d09e3f9e998d3a44397172b0e26b513ee Mon Sep 17 00:00:00 2001
From: Bertrand Gouny <bgouny@hipay.com>
Date: Tue, 22 Dec 2015 17:40:24 +0100
Subject: [PATCH 07/18] fix sed

---
 image/service/keepalived/container-start.sh | 22 ++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/image/service/keepalived/container-start.sh b/image/service/keepalived/container-start.sh
index 2393458..1392fad 100755
--- a/image/service/keepalived/container-start.sh
+++ b/image/service/keepalived/container-start.sh
@@ -10,15 +10,15 @@ if [ ! -e "$FIRST_START_DONE" ]; then
   #
   # bootstrap config
   #
-  sed -i --follow-symlinks --follow-symlinks "s|{{ keepalived_interface }}|$KEEPALIVED_INTERFACE|g" /etc/keepalived/keepalived.conf
-  sed -i --follow-symlinks --follow-symlinks "s|{{ keepalived_priority }}|$KEEPALIVED_PRIORITY|g" /etc/keepalived/keepalived.conf
-  sed -i --follow-symlinks --follow-symlinks "s|{{ keepalived_password }}|$KEEPALIVED_PASSWORD|g" /etc/keepalived/keepalived.conf
+  sed -i --follow-symlinks "s|{{ keepalived_interface }}|$KEEPALIVED_INTERFACE|g" /etc/keepalived/keepalived.conf
+  sed -i --follow-symlinks "s|{{ keepalived_priority }}|$KEEPALIVED_PRIORITY|g" /etc/keepalived/keepalived.conf
+  sed -i --follow-symlinks "s|{{ keepalived_password }}|$KEEPALIVED_PASSWORD|g" /etc/keepalived/keepalived.conf
 
   if [ -n "$KEEPALIVED_NOTIFY" ]; then
-    sed -i --follow-symlinks --follow-symlinks "s|{{ keepalived_notify }}|notify \"$KEEPALIVED_NOTIFY\"|g" /etc/keepalived/keepalived.conf
+    sed -i --follow-symlinks "s|{{ keepalived_notify }}|notify \"$KEEPALIVED_NOTIFY\"|g" /etc/keepalived/keepalived.conf
     chmod +x $KEEPALIVED_NOTIFY
   else
-    sed -i --follow-symlinks --follow-symlinks "/{{ keepalived_notify }}/d" /etc/keepalived/keepalived.conf
+    sed -i --follow-symlinks "/{{ keepalived_notify }}/d" /etc/keepalived/keepalived.conf
   fi
 
   # unicast peers
@@ -28,13 +28,13 @@ if [ ! -e "$FIRST_START_DONE" ]; then
     # it's just a peer
     # stored in a variable
     if [ -n "${!peer}" ]; then
-      sed -i --follow-symlinks --follow-symlinks "s|{{ keepalived_unicast_peers }}|${!peer}\n    {{ keepalived_unicast_peers }}|g" /etc/keepalived/keepalived.conf
+      sed -i --follow-symlinks "s|{{ keepalived_unicast_peers }}|${!peer}\n    {{ keepalived_unicast_peers }}|g" /etc/keepalived/keepalived.conf
     # directly
     else
-      sed -i --follow-symlinks --follow-symlinks "s|{{ keepalived_unicast_peers }}|${peer}\n    {{ keepalived_unicast_peers }}|g" /etc/keepalived/keepalived.conf
+      sed -i --follow-symlinks "s|{{ keepalived_unicast_peers }}|${peer}\n    {{ keepalived_unicast_peers }}|g" /etc/keepalived/keepalived.conf
     fi
   done
-  sed -i --follow-symlinks --follow-symlinks "/{{ keepalived_unicast_peers }}/d" /etc/keepalived/keepalived.conf
+  sed -i --follow-symlinks "/{{ keepalived_unicast_peers }}/d" /etc/keepalived/keepalived.conf
 
   # virtual ips
   KEEPALIVED_VIRTUAL_IPS=($KEEPALIVED_VIRTUAL_IPS)
@@ -43,13 +43,13 @@ if [ ! -e "$FIRST_START_DONE" ]; then
     # it's just a peer
     # stored in a variable
     if [ -n "${!vip}" ]; then
-      sed -i --follow-symlinks --follow-symlinks "s|{{ keepalived_virtual_ips }}|${!vip}\n    {{ keepalived_virtual_ips }}|g" /etc/keepalived/keepalived.conf
+      sed -i --follow-symlinks "s|{{ keepalived_virtual_ips }}|${!vip}\n    {{ keepalived_virtual_ips }}|g" /etc/keepalived/keepalived.conf
     # directly
     else
-      sed -i --follow-symlinks --follow-symlinks "s|{{ keepalived_virtual_ips }}|${vip}\n    {{ keepalived_virtual_ips }}|g" /etc/keepalived/keepalived.conf
+      sed -i --follow-symlinks "s|{{ keepalived_virtual_ips }}|${vip}\n    {{ keepalived_virtual_ips }}|g" /etc/keepalived/keepalived.conf
     fi
   done
-  sed -i --follow-symlinks --follow-symlinks "/{{ keepalived_virtual_ips }}/d" /etc/keepalived/keepalived.conf
+  sed -i --follow-symlinks "/{{ keepalived_virtual_ips }}/d" /etc/keepalived/keepalived.conf
 
   touch $FIRST_START_DONE
 fi

From 577da2e6b8d9c87761f6a6a4dec072c06c2f9ff7 Mon Sep 17 00:00:00 2001
From: ofreax <bertrand.gouny@gmail.com>
Date: Mon, 28 Dec 2015 20:50:35 +0100
Subject: [PATCH 08/18] README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 6726b38..5b85b42 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ Environement variables defaults are set in **image/env.yaml**. You can modify en
   To convert yaml to python online : http://yaml-online-parser.appspot.com/
 
 
-- **KEEPALIVED_VIRTUAL_IPS** Add a read only user. Defaults to :
+- **KEEPALIVED_VIRTUAL_IPS** Keepalived virtual IPs. Defaults to :
 
       - 192.168.1.231
       - 192.168.1.232

From 030d80b0a42552188d909f46b780b0c4548bcf49 Mon Sep 17 00:00:00 2001
From: ofreax <bertrand.gouny@gmail.com>
Date: Sun, 17 Jan 2016 12:12:04 +0100
Subject: [PATCH 09/18] light-baseimage:0.2.1

---
 CHANGELOG.md                                  |  2 +-
 image/Dockerfile                              | 26 +++++++++----------
 image/{env.yaml => environment/default.yaml}  |  0
 image/service/keepalived/daemon.sh            |  2 --
 image/service/keepalived/process.sh           |  7 +++++
 .../{container-start.sh => startup.sh}        |  8 ++++--
 test/test_helper.bash                         | 12 +++------
 7 files changed, 30 insertions(+), 27 deletions(-)
 rename image/{env.yaml => environment/default.yaml} (100%)
 delete mode 100755 image/service/keepalived/daemon.sh
 create mode 100755 image/service/keepalived/process.sh
 rename image/service/keepalived/{container-start.sh => startup.sh} (85%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b5b6f8..8554740 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 # Changelog
 
 ## 0.2.0
-  - Upgrade baseimage: light-baseimage:0.2.0
+  - Upgrade baseimage: light-baseimage:0.2.1
   - Makefile with build no cache
 
 ## 0.1.9
diff --git a/image/Dockerfile b/image/Dockerfile
index d992813..248b64f 100644
--- a/image/Dockerfile
+++ b/image/Dockerfile
@@ -1,23 +1,21 @@
-FROM osixia/light-baseimage:0.2.0
+# Use osixia/light-baseimage
+# sources: https://github.com/osixia/docker-light-baseimage
+FROM osixia/light-baseimage:0.2.1
 MAINTAINER Bertrand Gouny <bertrand.gouny@osixia.net>
 
 # Keepalived version
 ENV KEEPALIVED_VERSION 1.2.19
 
-# Use baseimage's init system.
-# https://github.com/osixia/docker-light-baseimage/blob/stable/image/tool/run
-CMD ["/container/tool/run"]
-
-# Install Keepalived
+# Download, build and install Keepalived
 RUN apt-get -y update \
     && LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-      curl \
-      make \
-      gcc \
-      pkg-config \
-      libssl-dev \
-      libnl-3-dev \
-      libnl-genl-3-dev \
+       curl \
+       gcc \
+       libnl-3-dev \
+       libnl-genl-3-dev \
+       libssl-dev \
+       make \
+       pkg-config \
     && curl -o keepalived.tar.gz -SL http://keepalived.org/software/keepalived-${KEEPALIVED_VERSION}.tar.gz \
     && mkdir -p /container/keepalived-sources \
     && tar -xzf keepalived.tar.gz --strip 1 -C /container/keepalived-sources \
@@ -39,4 +37,4 @@ RUN /container/tool/install-service \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 # Add default env variables
-ADD env.yaml /container/environment/env.yaml
+ADD environment /container/environment/99-default
diff --git a/image/env.yaml b/image/environment/default.yaml
similarity index 100%
rename from image/env.yaml
rename to image/environment/default.yaml
diff --git a/image/service/keepalived/daemon.sh b/image/service/keepalived/daemon.sh
deleted file mode 100755
index 00750a1..0000000
--- a/image/service/keepalived/daemon.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash -e
-exec /usr/local/sbin/keepalived -f /etc/keepalived/keepalived.conf --dont-fork --log-console -D -d
diff --git a/image/service/keepalived/process.sh b/image/service/keepalived/process.sh
new file mode 100755
index 0000000..e549755
--- /dev/null
+++ b/image/service/keepalived/process.sh
@@ -0,0 +1,7 @@
+#!/bin/bash -e
+
+# set -x (bash debug) if log level is trace
+# https://github.com/osixia/docker-light-baseimage/blob/stable/image/tool/log-helper
+log-helper level eq trace && set -x
+
+exec /usr/local/sbin/keepalived -f /etc/keepalived/keepalived.conf --dont-fork --log-console -D -d
diff --git a/image/service/keepalived/container-start.sh b/image/service/keepalived/startup.sh
similarity index 85%
rename from image/service/keepalived/container-start.sh
rename to image/service/keepalived/startup.sh
index 1392fad..e5f37b9 100755
--- a/image/service/keepalived/container-start.sh
+++ b/image/service/keepalived/startup.sh
@@ -1,11 +1,15 @@
 #!/bin/bash -e
 
-FIRST_START_DONE="/etc/docker-keepalived-first-start-done"
+# set -x (bash debug) if log level is trace
+# https://github.com/osixia/docker-light-baseimage/blob/stable/image/tool/log-helper
+log-helper level eq trace && set -x
+
+FIRST_START_DONE="${CONTAINER_STATE_DIR}/docker-keepalived-first-start-done"
 
 # container first start
 if [ ! -e "$FIRST_START_DONE" ]; then
 
-  ln -s /container/service/keepalived/assets/keepalived.conf /etc/keepalived/keepalived.conf
+  ln -sf ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf /etc/keepalived/keepalived.conf
 
   #
   # bootstrap config
diff --git a/test/test_helper.bash b/test/test_helper.bash
index 21217c5..676eefe 100644
--- a/test/test_helper.bash
+++ b/test/test_helper.bash
@@ -83,19 +83,17 @@ is_service_running_by_cid() {
 }
 
 is_file_exists_by_cid() {
-  docker exec $1 cat "/etc/my_init_startup_files_completed" > /dev/null 2>&1
+  docker exec $1 cat $2 > /dev/null 2>&1
 }
 
 wait_service_by_cid() {
 
   cid=$1
 
-  sleep 1
-
   # first wait image init end
-  while ! is_file_exists_by_cid $cid /etc/my_init_startup_files_completed
+  while ! is_file_exists_by_cid $cid /container/run/state/startup-done
   do
-    sleep 1
+    sleep 0.5
   done
 
   for service in "${@:2}"
@@ -103,9 +101,7 @@ wait_service_by_cid() {
     # wait service
     while ! is_service_running_by_cid $cid $service
     do
-      sleep 1
+      sleep 0.5
     done
   done
-
-  sleep 5
 }

From 418919e3b0e6dab88d32a7a62cbae6987f8f5b4c Mon Sep 17 00:00:00 2001
From: ofreax <bertrand.gouny@gmail.com>
Date: Sun, 17 Jan 2016 12:24:24 +0100
Subject: [PATCH 10/18] light-baseimage:0.2.1

---
 image/service/keepalived/startup.sh | 24 ++++--------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/image/service/keepalived/startup.sh b/image/service/keepalived/startup.sh
index e5f37b9..795a1c6 100755
--- a/image/service/keepalived/startup.sh
+++ b/image/service/keepalived/startup.sh
@@ -26,32 +26,16 @@ if [ ! -e "$FIRST_START_DONE" ]; then
   fi
 
   # unicast peers
-  KEEPALIVED_UNICAST_PEERS=($KEEPALIVED_UNICAST_PEERS)
-  for peer in "${KEEPALIVED_UNICAST_PEERS[@]}"
+  for peer in $(complex-bash-env iterate "${KEEPALIVED_UNICAST_PEERS}")
   do
-    # it's just a peer
-    # stored in a variable
-    if [ -n "${!peer}" ]; then
-      sed -i --follow-symlinks "s|{{ keepalived_unicast_peers }}|${!peer}\n    {{ keepalived_unicast_peers }}|g" /etc/keepalived/keepalived.conf
-    # directly
-    else
-      sed -i --follow-symlinks "s|{{ keepalived_unicast_peers }}|${peer}\n    {{ keepalived_unicast_peers }}|g" /etc/keepalived/keepalived.conf
-    fi
+    sed -i --follow-symlinks "s|{{ keepalived_unicast_peers }}|${peer}\n    {{ keepalived_unicast_peers }}|g" /etc/keepalived/keepalived.conf
   done
   sed -i --follow-symlinks "/{{ keepalived_unicast_peers }}/d" /etc/keepalived/keepalived.conf
 
   # virtual ips
-  KEEPALIVED_VIRTUAL_IPS=($KEEPALIVED_VIRTUAL_IPS)
-  for vip in "${KEEPALIVED_VIRTUAL_IPS[@]}"
+  for vip in $(complex-bash-env iterate "${KEEPALIVED_VIRTUAL_IPS}")
   do
-    # it's just a peer
-    # stored in a variable
-    if [ -n "${!vip}" ]; then
-      sed -i --follow-symlinks "s|{{ keepalived_virtual_ips }}|${!vip}\n    {{ keepalived_virtual_ips }}|g" /etc/keepalived/keepalived.conf
-    # directly
-    else
-      sed -i --follow-symlinks "s|{{ keepalived_virtual_ips }}|${vip}\n    {{ keepalived_virtual_ips }}|g" /etc/keepalived/keepalived.conf
-    fi
+    sed -i --follow-symlinks "s|{{ keepalived_virtual_ips }}|${vip}\n    {{ keepalived_virtual_ips }}|g" /etc/keepalived/keepalived.conf
   done
   sed -i --follow-symlinks "/{{ keepalived_virtual_ips }}/d" /etc/keepalived/keepalived.conf
 

From 72151d1efe490e80a1b104e58242deb48b442148 Mon Sep 17 00:00:00 2001
From: ofreax <bertrand.gouny@gmail.com>
Date: Sun, 17 Jan 2016 12:36:32 +0100
Subject: [PATCH 11/18] docs

---
 README.md | 69 +++++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 60 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 5b85b42..76cbf88 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # osixia/keepalived
 
-[![](https://badge.imagelayers.io/osixia/keepalived:latest.svg)](https://imagelayers.io/?images=osixia/keepalived:latest 'Get your own badge on imagelayers.io')
+[![](https://badge.imagelayers.io/osixia/keepalived:latest.svg)](https://imagelayers.io/?images=osixia/keepalived:latest 'Get your own badge on imagelayers.io') | Latest release: 0.2.0 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/keepalived/) 
 
 A docker image to run Keepalived.
 > [keepalived.org](http://keepalived.org/)
@@ -9,11 +9,14 @@ A docker image to run Keepalived.
 
 This image require the kernel module ip_vs loaded on the host (`modprobe ip_vs`) and need to be run with : --cap-add=NET_ADMIN --net=host
 
-    docker run --cap-add=NET_ADMIN --net=host -d osixia/keepalived
+    docker run --cap-add=NET_ADMIN --net=host -d osixia/keepalived:0.2.0
 
 ## Environment Variables
 
-Environement variables defaults are set in **image/env.yaml**. You can modify environment variable values directly in this file and rebuild the image ([see manual build](#manual-build)). You can also override those values at run time with -e argument or by setting your own env.yaml file as a docker volume to `/container/environment/env.yaml`. See examples below.
+Environment variables defaults are set in **image/environment/default.yaml**
+
+See how to [set your own environment variables](#set-your-own-environment-variables)
+
 
 - **KEEPALIVED_INTERFACE**: Keepalived network interface. Defaults to `eth0`
 - **KEEPALIVED_PASSWORD**: Keepalived password. Defaults to `d0cker`
@@ -23,9 +26,9 @@ Environement variables defaults are set in **image/env.yaml**. You can modify en
       - 192.168.1.10
       - 192.168.1.11
 
-    If you want to set this variable at docker run command convert the yaml in python :
+  If you want to set this variable at docker run command add the tag `#PYTHON2BASH:` and convert the yaml in python:
 
-      docker run -e KEEPALIVED_UNICAST_PEERS="[192.168.1.10', '192.168.1.11']" -d osixia/phpldapadmin
+      docker run --env KEEPALIVED_UNICAST_PEERS="#PYTHON2BASH:['192.168.1.10', '192.168.1.11']" --detach osixia/keepalived:0.2.0
 
   To convert yaml to python online : http://yaml-online-parser.appspot.com/
 
@@ -35,7 +38,7 @@ Environement variables defaults are set in **image/env.yaml**. You can modify en
       - 192.168.1.231
       - 192.168.1.232
 
-    If you want to set this variable at docker run command convert the yaml in python, see above.
+  If you want to set this variable at docker run command convert the yaml in python, see above.
 
 - **KEEPALIVED_NOTIFY** Script to execute when node state change. Defaults to `/container/service/keepalived/assets/notify.sh`
 
@@ -51,7 +54,45 @@ Or by setting your own `env.yaml` file as a docker volume to `/container/environ
 	docker run -v /data/my-env.yaml:/container/environment/env.yaml \
 	-d osixia/keepalived
 
-## Manual build
+### Set your own environment variables
+
+#### Use command line argument
+Environment variables can be set by adding the --env argument in the command line, for example:
+
+    docker run --env KEEPALIVED_INTERFACE="eno1" --env KEEPALIVED_PASSWORD="password!" \
+    --env KEEPALIVED_PRIORITY="100" --detach osixia/keepalived:0.2.0
+
+
+#### Link environment file
+
+For example if your environment file is in :  /data/environment/my-env.yaml
+
+	docker run --volume /data/environment/my-env.yaml:/container/environment/01-custom/env.yaml \
+	--detach osixia/keepalived:0.2.0
+
+Take care to link your environment file to `/container/environment/XX-somedir` (with XX < 99 so they will be processed before default environment files) and not  directly to `/container/environment` because this directory contains predefined baseimage environment files to fix container environment (INITRD, LANG, LANGUAGE and LC_CTYPE).
+
+#### Make your own image or extend this image
+
+This is the best solution if you have a private registry. Please refer to the [Advanced User Guide](#advanced-user-guide) just below.
+
+## Advanced User Guide
+
+### Extend osixia/keepalived:0.2.0 image
+
+If you need to add your custom TLS certificate, bootstrap config or environment files the easiest way is to extends this image.
+
+Dockerfile example:
+
+    FROM osixia/osixia/keepalived:0.2.0
+    MAINTAINER Your Name <your@name.com>
+
+    ADD environment /container/environment/01-custom
+    ADD scripts.sh /container/service/keepalived/assets/notify.sh
+
+
+### Make your own keepalived image
+
 
 Clone this project :
 
@@ -61,7 +102,7 @@ Clone this project :
 Adapt Makefile, set your image NAME and VERSION, for example :
 
 	NAME = osixia/keepalived
-	VERSION = 0.1.6
+	VERSION = 0.2.0
 
 	becomes :
 	NAME = billy-the-king/keepalived
@@ -75,7 +116,7 @@ Run your image :
 
 	docker run -d billy-the-king/keepalived:0.1.0
 
-## Tests
+### Tests
 
 We use **Bats** (Bash Automated Testing System) to test this image:
 
@@ -84,3 +125,13 @@ We use **Bats** (Bash Automated Testing System) to test this image:
 Install Bats, and in this project directory run :
 
 	make test
+
+
+### Under the hood: osixia/light-baseimage
+
+This image is based on osixia/light-baseimage.
+More info: https://github.com/osixia/docker-light-baseimage
+
+## Changelog
+
+Please refer to: [CHANGELOG.md](CHANGELOG.md)

From 59869d4a53f11b32a302f6ba7003841ae72670c4 Mon Sep 17 00:00:00 2001
From: ofreax <bertrand.gouny@gmail.com>
Date: Sun, 17 Jan 2016 15:19:06 +0100
Subject: [PATCH 12/18] docs

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 76cbf88..19cbbd5 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,8 @@
 A docker image to run Keepalived.
 > [keepalived.org](http://keepalived.org/)
 
+/!\ this documentation is a work in progress.
+
 ## Quick start
 
 This image require the kernel module ip_vs loaded on the host (`modprobe ip_vs`) and need to be run with : --cap-add=NET_ADMIN --net=host

From 3e4256333934abce23b01e3f59688301a17a8db6 Mon Sep 17 00:00:00 2001
From: ofreax <bertrand.gouny@gmail.com>
Date: Mon, 18 Jan 2016 21:38:30 +0100
Subject: [PATCH 13/18] docs

---
 README.md                           | 39 +++++++++++++++++++++++++----
 image/service/keepalived/startup.sh | 25 +++++++++---------
 2 files changed, 47 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index 19cbbd5..3bdac20 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 A docker image to run Keepalived.
 > [keepalived.org](http://keepalived.org/)
 
-/!\ this documentation is a work in progress.
+
 
 ## Quick start
 
@@ -13,6 +13,32 @@ This image require the kernel module ip_vs loaded on the host (`modprobe ip_vs`)
 
     docker run --cap-add=NET_ADMIN --net=host -d osixia/keepalived:0.2.0
 
+## Beginner Guide
+
+### Use your own Keepalived config
+This image comes with a keepalived config file that can be easily customized via environment variables for a quick bootstrap,
+but setting your own keepalived.conf is possible. 2 options:
+
+- Link your config file at run time to `/container/service/keepalived/assets/keepalived.conf` :
+
+      docker run --volume /data/my-keepalived.conf:/container/service/keepalived/assets/keepalived.conf --detach osixia/keepalived:0.2.0
+
+- Add your config file by extending or cloning this image, please refer to the [Advanced User Guide](#advanced-user-guide)
+
+### Debug
+
+The container default log level is **info**.
+Available levels are: `none`, `error`, `warning`, `info`, `debug` and `trace`.
+
+Example command to run the container in `debug` mode:
+
+	docker run --detach osixia/keepalived:0.2.0 --loglevel debug
+
+See all command line options:
+
+	docker run osixia/keepalived:0.2.0 --help
+
+
 ## Environment Variables
 
 Environment variables defaults are set in **image/environment/default.yaml**
@@ -48,13 +74,13 @@ See how to [set your own environment variables](#set-your-own-environment-variab
 
 Environment variable can be set directly by adding the -e argument in the command line, for example :
 
-	docker run -e KEEPALIVED_INTERFACE="eno1" -e KEEPALIVED_PASSWORD="password!" \
-	-e KEEPALIVED_PRIORITY="100" -d osixia/keepalived
+	docker run --env KEEPALIVED_INTERFACE="eno1" --env KEEPALIVED_PASSWORD="password!" \
+	--env KEEPALIVED_PRIORITY="100" --detach osixia/keepalived
 
 Or by setting your own `env.yaml` file as a docker volume to `/container/environment/env.yaml`
 
-	docker run -v /data/my-env.yaml:/container/environment/env.yaml \
-	-d osixia/keepalived
+	docker run --volume /data/my-env.yaml:/container/environment/env.yaml \
+	--detach osixia/keepalived
 
 ### Set your own environment variables
 
@@ -89,6 +115,7 @@ Dockerfile example:
     FROM osixia/osixia/keepalived:0.2.0
     MAINTAINER Your Name <your@name.com>
 
+    ADD keepalived.conf /container/service/keepalived/assets/keepalived.conf
     ADD environment /container/environment/01-custom
     ADD scripts.sh /container/service/keepalived/assets/notify.sh
 
@@ -110,6 +137,8 @@ Adapt Makefile, set your image NAME and VERSION, for example :
 	NAME = billy-the-king/keepalived
 	VERSION = 0.1.0
 
+Add your custom scripts, environment files, config ...
+
 Build your image :
 
 	make build
diff --git a/image/service/keepalived/startup.sh b/image/service/keepalived/startup.sh
index 795a1c6..ef86a34 100755
--- a/image/service/keepalived/startup.sh
+++ b/image/service/keepalived/startup.sh
@@ -5,41 +5,42 @@
 log-helper level eq trace && set -x
 
 FIRST_START_DONE="${CONTAINER_STATE_DIR}/docker-keepalived-first-start-done"
-
 # container first start
 if [ ! -e "$FIRST_START_DONE" ]; then
 
-  ln -sf ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf /etc/keepalived/keepalived.conf
-
   #
   # bootstrap config
   #
-  sed -i --follow-symlinks "s|{{ keepalived_interface }}|$KEEPALIVED_INTERFACE|g" /etc/keepalived/keepalived.conf
-  sed -i --follow-symlinks "s|{{ keepalived_priority }}|$KEEPALIVED_PRIORITY|g" /etc/keepalived/keepalived.conf
-  sed -i --follow-symlinks "s|{{ keepalived_password }}|$KEEPALIVED_PASSWORD|g" /etc/keepalived/keepalived.conf
+  sed -i "s|{{ keepalived_interface }}|$KEEPALIVED_INTERFACE|g" ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf
+  sed -i "s|{{ keepalived_priority }}|$KEEPALIVED_PRIORITY|g" ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf
+  sed -i "s|{{ keepalived_password }}|$KEEPALIVED_PASSWORD|g" ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf
 
   if [ -n "$KEEPALIVED_NOTIFY" ]; then
-    sed -i --follow-symlinks "s|{{ keepalived_notify }}|notify \"$KEEPALIVED_NOTIFY\"|g" /etc/keepalived/keepalived.conf
+    sed -i "s|{{ keepalived_notify }}|notify \"$KEEPALIVED_NOTIFY\"|g" ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf
     chmod +x $KEEPALIVED_NOTIFY
   else
-    sed -i --follow-symlinks "/{{ keepalived_notify }}/d" /etc/keepalived/keepalived.conf
+    sed -i "/{{ keepalived_notify }}/d" ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf
   fi
 
   # unicast peers
   for peer in $(complex-bash-env iterate "${KEEPALIVED_UNICAST_PEERS}")
   do
-    sed -i --follow-symlinks "s|{{ keepalived_unicast_peers }}|${peer}\n    {{ keepalived_unicast_peers }}|g" /etc/keepalived/keepalived.conf
+    sed -i "s|{{ keepalived_unicast_peers }}|${peer}\n    {{ keepalived_unicast_peers }}|g" ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf
   done
-  sed -i --follow-symlinks "/{{ keepalived_unicast_peers }}/d" /etc/keepalived/keepalived.conf
+  sed -i "/{{ keepalived_unicast_peers }}/d" ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf
 
   # virtual ips
   for vip in $(complex-bash-env iterate "${KEEPALIVED_VIRTUAL_IPS}")
   do
-    sed -i --follow-symlinks "s|{{ keepalived_virtual_ips }}|${vip}\n    {{ keepalived_virtual_ips }}|g" /etc/keepalived/keepalived.conf
+    sed -i "s|{{ keepalived_virtual_ips }}|${vip}\n    {{ keepalived_virtual_ips }}|g" ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf
   done
-  sed -i --follow-symlinks "/{{ keepalived_virtual_ips }}/d" /etc/keepalived/keepalived.conf
+  sed -i "/{{ keepalived_virtual_ips }}/d" ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf
 
   touch $FIRST_START_DONE
 fi
 
+if [ ! -e "/etc/backup-manager.conf" ]; then
+  ln -sf ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf /etc/keepalived/keepalived.conf
+fi
+
 exit 0

From 27699af63817e30467b40e0bcdd5aed682131239 Mon Sep 17 00:00:00 2001
From: ofreax <bertrand.gouny@gmail.com>
Date: Mon, 18 Jan 2016 22:17:29 +0100
Subject: [PATCH 14/18] docs

---
 README.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/README.md b/README.md
index 3bdac20..f24eaff 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,22 @@
 A docker image to run Keepalived.
 > [keepalived.org](http://keepalived.org/)
 
+- [Quick start](#quick-start)
+- [Beginner Guide](#beginner-guide)
+	- [Use your own Backup Manager config](#use-your-own-backup-manager-config)
+	- [Debug](#debug)
+- [Environment Variables](#environment-variables)
+	- [Set your own environment variables](#set-your-own-environment-variables)
+		- [Use command line argument](#use-command-line-argument)
+		- [Link environment file](#link-environment-file)
+		- [Make your own image or extend this image](#make-your-own-image-or-extend-this-image)
+- [Advanced User Guide](#advanced-user-guide)
+	- [Extend osixia/keepalived:0.2.0 image](#extend-osixiakeepalived020-image)
+	- [Make your own keepalived image](#make-your-own-keepalived-image)
+	- [Tests](#tests)
+	- [Under the hood: osixia/light-baseimage](#under-the-hood-osixialight-baseimage)
+- [Changelog](#changelog)
+
 
 
 ## Quick start

From 46b1825a10f89db5570b668fc5a7091ea7503fa1 Mon Sep 17 00:00:00 2001
From: Bertrand Gouny <bgouny@hipay.com>
Date: Tue, 19 Jan 2016 17:18:32 +0100
Subject: [PATCH 15/18] docs

---
 README.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/README.md b/README.md
index f24eaff..3c2f37f 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # osixia/keepalived
 
-[![](https://badge.imagelayers.io/osixia/keepalived:latest.svg)](https://imagelayers.io/?images=osixia/keepalived:latest 'Get your own badge on imagelayers.io') | Latest release: 0.2.0 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/keepalived/) 
+[![](https://badge.imagelayers.io/osixia/keepalived:latest.svg)](https://imagelayers.io/?images=osixia/keepalived:latest 'Get your own badge on imagelayers.io') | Latest release: 0.2.0 - Keepalived 1.2.19 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/keepalived/) 
 
 A docker image to run Keepalived.
 > [keepalived.org](http://keepalived.org/)
@@ -21,8 +21,6 @@ A docker image to run Keepalived.
 	- [Under the hood: osixia/light-baseimage](#under-the-hood-osixialight-baseimage)
 - [Changelog](#changelog)
 
-
-
 ## Quick start
 
 This image require the kernel module ip_vs loaded on the host (`modprobe ip_vs`) and need to be run with : --cap-add=NET_ADMIN --net=host

From 0fc4b060e3be44b5bf197c4fc67bf65444ab3bf1 Mon Sep 17 00:00:00 2001
From: ofreax <bertrand.gouny@gmail.com>
Date: Tue, 19 Jan 2016 20:59:40 +0100
Subject: [PATCH 16/18] complex-bash-env

---
 image/service/keepalived/startup.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/image/service/keepalived/startup.sh b/image/service/keepalived/startup.sh
index ef86a34..525f7da 100755
--- a/image/service/keepalived/startup.sh
+++ b/image/service/keepalived/startup.sh
@@ -23,16 +23,16 @@ if [ ! -e "$FIRST_START_DONE" ]; then
   fi
 
   # unicast peers
-  for peer in $(complex-bash-env iterate "${KEEPALIVED_UNICAST_PEERS}")
+  for peer in $(complex-bash-env iterate KEEPALIVED_UNICAST_PEERS)
   do
-    sed -i "s|{{ keepalived_unicast_peers }}|${peer}\n    {{ keepalived_unicast_peers }}|g" ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf
+    sed -i "s|{{ keepalived_unicast_peers }}|${!peer}\n    {{ keepalived_unicast_peers }}|g" ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf
   done
   sed -i "/{{ keepalived_unicast_peers }}/d" ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf
 
   # virtual ips
-  for vip in $(complex-bash-env iterate "${KEEPALIVED_VIRTUAL_IPS}")
+  for vip in $(complex-bash-env iterate KEEPALIVED_VIRTUAL_IPS)
   do
-    sed -i "s|{{ keepalived_virtual_ips }}|${vip}\n    {{ keepalived_virtual_ips }}|g" ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf
+    sed -i "s|{{ keepalived_virtual_ips }}|${!vip}\n    {{ keepalived_virtual_ips }}|g" ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf
   done
   sed -i "/{{ keepalived_virtual_ips }}/d" ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf
 

From c11e41c67320a96ca9554fe8af23397bba6ab17e Mon Sep 17 00:00:00 2001
From: Bertrand Gouny <bgouny@hipay.com>
Date: Wed, 20 Jan 2016 09:48:53 +0100
Subject: [PATCH 17/18] KEEPALIVED_COMMAND_LINE_ARGUMENTS

---
 README.md                           | 2 ++
 image/environment/default.yaml      | 2 ++
 image/service/keepalived/process.sh | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 3c2f37f..746c042 100644
--- a/README.md
+++ b/README.md
@@ -84,6 +84,8 @@ See how to [set your own environment variables](#set-your-own-environment-variab
 
 - **KEEPALIVED_NOTIFY** Script to execute when node state change. Defaults to `/container/service/keepalived/assets/notify.sh`
 
+- **KEEPALIVED_COMMAND_LINE_ARGUMENTS** Keepalived command line arguments; Defaults to `--log-detail --dump-conf`
+
 ### Set environment variables at run time :
 
 Environment variable can be set directly by adding the -e argument in the command line, for example :
diff --git a/image/environment/default.yaml b/image/environment/default.yaml
index b3017d3..738bd6f 100644
--- a/image/environment/default.yaml
+++ b/image/environment/default.yaml
@@ -14,3 +14,5 @@ KEEPALIVED_VIRTUAL_IPS:
   - 192.168.1.232
 
 KEEPALIVED_NOTIFY: /container/service/keepalived/assets/notify.sh
+
+KEEPALIVED_COMMAND_LINE_ARGUMENTS: --log-detail --dump-conf
diff --git a/image/service/keepalived/process.sh b/image/service/keepalived/process.sh
index e549755..6810608 100755
--- a/image/service/keepalived/process.sh
+++ b/image/service/keepalived/process.sh
@@ -4,4 +4,4 @@
 # https://github.com/osixia/docker-light-baseimage/blob/stable/image/tool/log-helper
 log-helper level eq trace && set -x
 
-exec /usr/local/sbin/keepalived -f /etc/keepalived/keepalived.conf --dont-fork --log-console -D -d
+exec /usr/local/sbin/keepalived -f /etc/keepalived/keepalived.conf --dont-fork --log-console ${KEEPALIVED_COMMAND_LINE_ARGUMENTS}

From 56e95efc5446bb417c4435334438a35715bfbfc3 Mon Sep 17 00:00:00 2001
From: Bertrand Gouny <bgouny@hipay.com>
Date: Wed, 27 Jan 2016 13:46:29 +0100
Subject: [PATCH 18/18] --follow-symlinks

---
 image/service/keepalived/startup.sh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/image/service/keepalived/startup.sh b/image/service/keepalived/startup.sh
index 525f7da..51206db 100755
--- a/image/service/keepalived/startup.sh
+++ b/image/service/keepalived/startup.sh
@@ -11,30 +11,30 @@ if [ ! -e "$FIRST_START_DONE" ]; then
   #
   # bootstrap config
   #
-  sed -i "s|{{ keepalived_interface }}|$KEEPALIVED_INTERFACE|g" ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf
-  sed -i "s|{{ keepalived_priority }}|$KEEPALIVED_PRIORITY|g" ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf
-  sed -i "s|{{ keepalived_password }}|$KEEPALIVED_PASSWORD|g" ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf
+  sed -i --follow-symlinks "s|{{ keepalived_interface }}|$KEEPALIVED_INTERFACE|g" ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf
+  sed -i --follow-symlinks "s|{{ keepalived_priority }}|$KEEPALIVED_PRIORITY|g" ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf
+  sed -i --follow-symlinks "s|{{ keepalived_password }}|$KEEPALIVED_PASSWORD|g" ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf
 
   if [ -n "$KEEPALIVED_NOTIFY" ]; then
-    sed -i "s|{{ keepalived_notify }}|notify \"$KEEPALIVED_NOTIFY\"|g" ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf
+    sed -i --follow-symlinks "s|{{ keepalived_notify }}|notify \"$KEEPALIVED_NOTIFY\"|g" ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf
     chmod +x $KEEPALIVED_NOTIFY
   else
-    sed -i "/{{ keepalived_notify }}/d" ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf
+    sed -i --follow-symlinks "/{{ keepalived_notify }}/d" ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf
   fi
 
   # unicast peers
   for peer in $(complex-bash-env iterate KEEPALIVED_UNICAST_PEERS)
   do
-    sed -i "s|{{ keepalived_unicast_peers }}|${!peer}\n    {{ keepalived_unicast_peers }}|g" ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf
+    sed -i --follow-symlinks "s|{{ keepalived_unicast_peers }}|${!peer}\n    {{ keepalived_unicast_peers }}|g" ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf
   done
-  sed -i "/{{ keepalived_unicast_peers }}/d" ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf
+  sed -i --follow-symlinks "/{{ keepalived_unicast_peers }}/d" ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf
 
   # virtual ips
   for vip in $(complex-bash-env iterate KEEPALIVED_VIRTUAL_IPS)
   do
-    sed -i "s|{{ keepalived_virtual_ips }}|${!vip}\n    {{ keepalived_virtual_ips }}|g" ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf
+    sed -i --follow-symlinks "s|{{ keepalived_virtual_ips }}|${!vip}\n    {{ keepalived_virtual_ips }}|g" ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf
   done
-  sed -i "/{{ keepalived_virtual_ips }}/d" ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf
+  sed -i --follow-symlinks "/{{ keepalived_virtual_ips }}/d" ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf
 
   touch $FIRST_START_DONE
 fi