Merge branch 'release-1.4.2' into stable

v1.3.5-1

CHANGELOG.md

@@ -1,15 +1,171 @@
 # Changelog
+This file only reflects the changes that are made in this project.
+Please refer to the upstream [keepalived changelog](https://github.com/acassen/keepalived/blob/master/ChangeLog) for the list of changes in keepalived.
 
-## 0.1.3
+The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
+and this project follows keepalived versioning.
+
+## [1.4.2] - 2018-03-03
+### Changed
+  - Upgrade keepalived version to 1.4.2
+
+## [1.4.1] - 2018-01-29
+### Changed
+  - Upgrade keepalived version to 1.4.1
+
+## [1.4.0] - 2018-01-11
+### Changed
+  - Upgrade keepalived version to 1.4.0
+
+## [1.3.9] - 2017-10-22
+### Changed
+  - Upgrade keepalived version to 1.3.9
+
+## [1.3.8] - 2017-10-16
+### Changed
+  - Upgrade keepalived version to 1.3.8
+
+## [1.3.6-1] - 2017-10-16
+### Changed
+  - Upgrade baseimage to alpine-light-baseimage:0.1.5
+
+## [1.3.6] - 2017-08-15
+### Changed
+  - Upgrade keepalived version to 1.3.6
+
+### Removed
+  - keepalived_script script user, scripts are now run with root user
+
+## [1.3.5-1] - 2017-07-19
+### Added
+  - Add keepalived_script script user
+
+### Changed
+  - Use linux alpine as baseimage
+
+### Fixed
+  - startup.sh and finish.sh ip address removal
+
+## [1.3.5] - 2017-03-21
+### Changed
+  - Upgrade keepalived version to 1.3.5
+
+## [1.3.4] - 2017-02-19
+### Changed
+  - Upgrade keepalived version to 1.3.4
+
+## [1.3.3] - 2017-02-15
+### Changed
+  - Upgrade keepalived version to 1.3.3
+
+## [1.3.2] - 2016-11-29
+### Changed
+  - Upgrade keepalived version to 1.3.2
+
+## [1.3.1] - 2016-11-22
+### Changed
+  - Upgrade keepalived version to 1.3.1
+
+## [1.3.0] - 2016-11-21
+### Changed
+  - Upgrade keepalived version to 1.3.0
+  - Upgrade baseimage to light-baseimage:0.2.6
+
+## [1.2.24] - 2016-09-13
+### Changed
+  - Upgrade keepalived version to 1.2.24
+
+## Versions before following the keepalived versioning
+
+## [0.2.3] - 2016-09-03
+### Changed
+  - Upgrade baseimage to light-baseimage:0.2.5
+
+## [0.2.2] - 2016-07-26
+### Changed
+  - Upgrade baseimage to light-baseimage:0.2.4
+  - Upgrade keepalived version to 1.2.23
+
+## [0.2.1] - 2016-02-20
+### Changed
+  - Upgrade baseimage to light-baseimage:0.2.2
+
+## [0.2.0] - 2016-01-27
+### Added
+  - Makefile with build no cache
+
+### Changed
+  - Upgrade baseimage to light-baseimage:0.2.1
+
+## [0.1.9] - 2015-11-20
+### Changed
+  - Upgrade baseimage to light-baseimage:0.1.5
+
+## [0.1.8] - 2015-11-19
+### Changed
+  - Upgrade baseimage to light-baseimage:0.1.4
+
+## [0.1.7] - 2015-10-26
+### Changed
+  - Upgrade baseimage to light-baseimage:0.1.2
+
+## [0.1.6] - 2015-08-21
+### Added
+  - Better way to add custom config
+
+### Changed
+  - Improve documentation
+
+## [0.1.5] - 2015-08-19
+### Changed
+  - Upgrade baseimage to light-baseimage:0.1.1
+
+## [0.1.4] - 2015-07-23
+### Changed
+  - Use light-baseimage
+
+## [0.1.3] - 2015-07-09
+### Fixed
   - Fix libnl dependency
 
-## 0.1.2
+## [0.1.2] - 2015-07-09
-  - Keepalived version 1.2.19
+### Changed
-  - Update default config :
+  - Upgrade keepalived version to 1.2.19
-    - Set start state to BACKUP
+  - Upgrade default config :
+  - Set start state to BACKUP
 
-## 0.1.1
+## [0.1.1] - 2015-06-21
-  - Add notify script
+### Added
+  - Notify script
 
-## 0.1.0
+## 0.1.0 - 2015-06-16
-  - Initial release
+Initial release
+
+[1.4.2]: https://github.com/osixia/docker-keepalived/compare/v1.4.1...v1.4.2
+[1.4.1]: https://github.com/osixia/docker-keepalived/compare/v1.4.0...v1.4.1
+[1.4.0]: https://github.com/osixia/docker-keepalived/compare/v1.3.9...v1.4.0
+[1.3.9]: https://github.com/osixia/docker-keepalived/compare/v1.3.8...v1.3.9
+[1.3.8]: https://github.com/osixia/docker-keepalived/compare/v1.3.6-1...v1.3.8
+[1.3.6-1]: https://github.com/osixia/docker-keepalived/compare/v1.3.6...v1.3.6-1
+[1.3.6]: https://github.com/osixia/docker-keepalived/compare/v1.3.5-1...v1.3.6
+[1.3.5-1]: https://github.com/osixia/docker-keepalived/compare/v1.3.5...v1.3.5-1
+[1.3.5]: https://github.com/osixia/docker-keepalived/compare/v1.3.4...v1.3.5
+[1.3.4]: https://github.com/osixia/docker-keepalived/compare/v1.3.3...v1.3.4
+[1.3.3]: https://github.com/osixia/docker-keepalived/compare/v1.3.2...v1.3.3
+[1.3.2]: https://github.com/osixia/docker-keepalived/compare/v1.3.1...v1.3.2
+[1.3.1]: https://github.com/osixia/docker-keepalived/compare/v1.3.0...v1.3.1
+[1.3.0]: https://github.com/osixia/docker-keepalived/compare/v1.2.24...v1.3.0
+[1.2.24]: https://github.com/osixia/docker-keepalived/compare/v0.2.3...v1.2.24
+[0.2.3]: https://github.com/osixia/docker-keepalived/compare/v0.2.2...v0.2.3
+[0.2.2]: https://github.com/osixia/docker-keepalived/compare/v0.2.1...v0.2.2
+[0.2.1]: https://github.com/osixia/docker-keepalived/compare/v0.2.0...v0.2.1
+[0.2.0]: https://github.com/osixia/docker-keepalived/compare/v0.1.9...v0.2.0
+[0.1.9]: https://github.com/osixia/docker-keepalived/compare/v0.1.8...v0.1.9
+[0.1.8]: https://github.com/osixia/docker-keepalived/compare/v0.1.7...v0.1.8
+[0.1.7]: https://github.com/osixia/docker-keepalived/compare/v0.1.6...v0.1.7
+[0.1.6]: https://github.com/osixia/docker-keepalived/compare/v0.1.5...v0.1.6
+[0.1.5]: https://github.com/osixia/docker-keepalived/compare/v0.1.4...v0.1.5
+[0.1.4]: https://github.com/osixia/docker-keepalived/compare/v0.1.3...v0.1.4
+[0.1.3]: https://github.com/osixia/docker-keepalived/compare/v0.1.2...v0.1.3
+[0.1.2]: https://github.com/osixia/docker-keepalived/compare/v0.1.1...v0.1.2
+[0.1.1]: https://github.com/osixia/docker-keepalived/compare/v0.1.0...v0.1.1

Makefile

@@ -1,20 +1,28 @@
 NAME = osixia/keepalived
-VERSION = 0.1.3
+VERSION = 1.4.2
 
-.PHONY: all build test tag_latest release
+.PHONY: build build-nocache test tag-latest push push-latest release git-tag-version
-
-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
 
-tag_latest:
+tag-latest:
-	docker tag -f $(NAME):$(VERSION) $(NAME):latest
+	docker tag $(NAME):$(VERSION) $(NAME):latest
 
-release: build test tag_latest
+push:
-	@if ! docker images $(NAME) | awk '{ print $$2 }' | grep -q -F $(VERSION); then echo "$(NAME) version $(VERSION) is not yet built. Please run 'make build'"; false; fi
+	docker push $(NAME):$(VERSION)
-	docker push $(NAME)
+
-	@echo "*** Don't forget to run 'twgit release/hotfix finish' :)"
+push-latest:
+	docker push $(NAME):latest
+
+release: build test tag-latest push push-latest
+
+git-tag-version: release
+	git tag -a v$(VERSION) -m "v$(VERSION)"
+	git push origin v$(VERSION)

README.md

@@ -1,10 +1,193 @@
 # osixia/keepalived
 
-A docker image to run Keepalived.
+[![Docker Pulls](https://img.shields.io/docker/pulls/osixia/keepalived.svg)][hub]
+[![Docker Stars](https://img.shields.io/docker/stars/osixia/keepalived.svg)][hub]
+[![](https://images.microbadger.com/badges/image/osixia/keepalived.svg)](http://microbadger.com/images/osixia/keepalived "Get your own image badge on microbadger.com")
+
+[hub]: https://hub.docker.com/r/osixia/keepalived/
+
+Latest release: 1.4.2 - Keepalived 1.4.2 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/keepalived/) 
+
+**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)
+	- [Fix docker mounted file problems](#fix-docker-mounted-file-problems)
+	- [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:1.4.2 image](#extend-osixiakeepalived142-image)
+	- [Make your own keepalived image](#make-your-own-keepalived-image)
+	- [Tests](#tests)
+	- [Under the hood: osixia/light-baseimage](#under-the-hood-osixialight-baseimage)
+- [Security](#security)
+- [Changelog](#changelog)
+
 ## Quick start
 
-This image require the kernel module ip_vs loaded on the host and need to be run with : --privileged --net=host
+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 --privileged --net=host -d osixia/keepalived
+    docker run --cap-add=NET_ADMIN --net=host -d osixia/keepalived:1.4.2
+
+## 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:1.4.2
+
+- Add your config file by extending or cloning this image, please refer to the [Advanced User Guide](#advanced-user-guide)
+
+### Fix docker mounted file problems
+
+You may have some problems with mounted files on some systems. The startup script try to make some file adjustment and fix files owner and permissions, this can result in multiple errors. See [Docker documentation](https://docs.docker.com/v1.4/userguide/dockervolumes/#mount-a-host-file-as-a-data-volume).
+
+To fix that run the container with `--copy-service` argument :
+
+		docker run [your options] osixia/keepalived:1.4.2 --copy-service
+
+### 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:1.4.2 --loglevel debug
+
+See all command line options:
+
+	docker run osixia/keepalived:1.4.2 --help
+
+
+## Environment Variables
+
+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`
+- **KEEPALIVED_PRIORITY** Keepalived node priority. Defaults to `150`
+
+- **KEEPALIVED_UNICAST_PEERS** Keepalived unicast peers. Defaults to :
+      - 192.168.1.10
+      - 192.168.1.11
+
+  If you want to set this variable at docker run command add the tag `#PYTHON2BASH:` and convert the yaml in python:
+
+      docker run --env KEEPALIVED_UNICAST_PEERS="#PYTHON2BASH:['192.168.1.10', '192.168.1.11']" --detach osixia/keepalived:1.4.2
+
+  To convert yaml to python online : http://yaml-online-parser.appspot.com/
+
+
+- **KEEPALIVED_VIRTUAL_IPS** Keepalived virtual IPs. Defaults to :
+
+      - 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.
+
+- **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 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:1.4.2
+
+
+#### 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:1.4.2
+
+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:1.4.2 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/keepalived:1.4.2
+    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
+
+
+### Make your own keepalived image
+
+
+Clone this project :
+
+	git clone https://github.com/osixia/docker-keepalived
+	cd docker-keepalived
+
+Adapt Makefile, set your image NAME and VERSION, for example :
+
+	NAME = osixia/keepalived
+	VERSION = 1.3.5
+
+	becomes :
+	NAME = billy-the-king/keepalived
+	VERSION = 0.1.0
+
+Add your custom scripts, environment files, config ...
+
+Build your image :
+
+	make build
+
+Run your image :
+
+	docker run -d billy-the-king/keepalived:0.1.0
+
+### Tests
+
+We use **Bats** (Bash Automated Testing System) to test this image:
+
+> [https://github.com/sstephenson/bats](https://github.com/sstephenson/bats)
+
+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
+
+## Security
+If you discover a security vulnerability within this docker image, please send an email to the Osixia! team at security@osixia.net. For minor vulnerabilities feel free to add an issue here on github.
+
+Please include as many details as possible.
+
+## Changelog
+
+Please refer to: [CHANGELOG.md](CHANGELOG.md)

image/Dockerfile

@@ -1,35 +1,54 @@
-FROM osixia/baseimage:0.10.4
+# Use osixia/light-baseimage
+# sources: https://github.com/osixia/docker-light-baseimage
+FROM osixia/alpine-light-baseimage:0.1.5
 MAINTAINER Bertrand Gouny <bertrand.gouny@osixia.net>
 
 # Keepalived version
-ENV KEEPALIVED_VERSION 1.2.19
+ARG KEEPALIVED_VERSION=1.4.2
 
-# Use baseimage-docker's init system.
+# Download, build and install Keepalived
-CMD ["/sbin/my_init"]
+RUN apk --no-cache add \
-
+       curl \
-# Install Keepalived
+       gcc \
-RUN apt-get -y update \
+       ipset \
-    && LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get install -y \
+       ipset-dev \
-    make gcc pkg-config libssl-dev libnl-dev \
+       iptables \
+       iptables-dev \
+       libnfnetlink \
+       libnfnetlink-dev \
+       libnl3 \
+       libnl3-dev \
+       make \
+       musl-dev \
+       openssl \
+       openssl-dev \
     && curl -o keepalived.tar.gz -SL http://keepalived.org/software/keepalived-${KEEPALIVED_VERSION}.tar.gz \
-    && mkdir -p /osixia/keepalived-sources \
+    && mkdir -p /container/keepalived-sources \
-    && tar -xzf keepalived.tar.gz --strip 1 -C /osixia/keepalived-sources \
+    && tar -xzf keepalived.tar.gz --strip 1 -C /container/keepalived-sources \
-    && cd osixia/keepalived-sources \
+    && cd container/keepalived-sources \
-    && ./configure --with-kernel-dir=/lib/modules/$(uname -r)/build \
+    && ./configure --disable-dynamic-linking \
     && make && make install \
     && cd - && mkdir -p /etc/keepalived \
-    && apt-get remove -y --purge --auto-remove make gcc pkg-config libssl-dev
+    && rm -f keepalived.tar.gz \
+    && rm -rf /container/keepalived-sources \
+    && apk --no-cache del \
+        curl \
+        gcc \
+        ipset-dev \
+        iptables-dev \
+        libnfnetlink-dev \
+        libnl3-dev \
+        make \
+        musl-dev \
+        openssl-dev
 
-# Add Keepalived assets
-ADD service/keepalived/assets /osixia/keepalived
 
-# Clean all
+# Add service directory to /container/service
-RUN rm keepalived.tar.gz \
+ADD service /container/service
-  && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+# Use baseimage install-service script
+# https://github.com/osixia/docker-light-baseimage/blob/stable/image/tool/install-service
+RUN /container/tool/install-service
 
 # Add default env variables
-ADD env.yml /etc/env.yml
+ADD environment /container/environment/99-default
-
-# Add Keepalived container start config & daemon
-ADD service/keepalived/container-start.sh /etc/my_init.d/keepalived
-ADD service/keepalived/daemon.sh /etc/service/keepalived/run

image/environment/default.yaml

@@ -1,7 +1,9 @@
+KEEPALIVED_COMMAND_LINE_ARGUMENTS: --log-detail --dump-conf
+
 KEEPALIVED_INTERFACE: eth0
 KEEPALIVED_PASSWORD: d0cker
 
-# for electing MASTER, highest priority wins.
+# For electing MASTER, highest priority wins.
 # to be MASTER, make 50 more than other machines
 KEEPALIVED_PRIORITY: 150
 
@@ -13,4 +15,4 @@ KEEPALIVED_VIRTUAL_IPS:
   - 192.168.1.231
   - 192.168.1.232
 
-KEEPALIVED_NOTIFY: /osixia/keepalived/notify.sh
+KEEPALIVED_NOTIFY: /container/service/keepalived/assets/notify.sh

image/service/keepalived/assets/README.md

@@ -1 +1 @@
-Add your custom keepalived.conf file here or mount one at docker run to /etc/keepalived/keepalived.conf
+Add your custom keepalived.conf file here or mount one at docker run to /container/service/keepalived/assets/keepalived.conf

image/service/keepalived/assets/keepalived.conf

@@ -1,33 +1,31 @@
-vrrp_sync_group VG_1 {
+global_defs {
-  group {
+  default_interface {{ KEEPALIVED_INTERFACE }}
-    VI_1
-  }
-
-  {{ keepalived_notify }}
 }
 
 vrrp_instance VI_1 {
-  interface {{ keepalived_interface }}
+  interface {{ KEEPALIVED_INTERFACE }}
 
   track_interface {
-    {{ keepalived_interface }}
+    {{ KEEPALIVED_INTERFACE }}
   }
 
   state BACKUP
   virtual_router_id 51
-  priority {{ keepalived_priority }}
+  priority {{ KEEPALIVED_PRIORITY }}
   nopreempt
 
   unicast_peer {
-    {{ keepalived_unicast_peers }}
+    {{ KEEPALIVED_UNICAST_PEERS }}
   }
 
   virtual_ipaddress {
-    {{ keepalived_virtual_ips }}
+    {{ KEEPALIVED_VIRTUAL_IPS }}
   }
 
   authentication {
     auth_type PASS
-    auth_pass {{ keepalived_password }}
+    auth_pass {{ KEEPALIVED_PASSWORD }}
   }
+
+  {{ KEEPALIVED_NOTIFY }}
 }

image/service/keepalived/assets/notify.sh

@@ -16,16 +16,16 @@ NAME=$2
 STATE=$3
 
 case $STATE in
-        "MASTER") logger "I'm the MASTER! Whup whup."
+        "MASTER") echo "I'm the MASTER! Whup whup." > /proc/1/fd/1
                   exit 0
                   ;;
-        "BACKUP") logger "Ok, i'm just a backup, great."
+        "BACKUP") echo "Ok, i'm just a backup, great." > /proc/1/fd/1
                   exit 0
                   ;;
-        "FAULT")  logger "Fault, what ?"
+        "FAULT")  echo "Fault, what ?" > /proc/1/fd/1
                   exit 0
                   ;;
-        *)        logger "Unknown state"
+        *)        echo "Unknown state" > /proc/1/fd/1
                   exit 1
                   ;;
 esac

image/service/keepalived/container-start.sh

@@ -1,67 +0,0 @@
-#!/bin/bash -e
-
-FIRST_START_DONE="/etc/docker-keepalived-first-start-done"
-
-# container first start
-if [ ! -e "$FIRST_START_DONE" ]; then
-
-  # config folder is empty use bootstrap config if available
-  if [ ! -e /etc/keepalived/keepalived.conf ]; then
-    echo "No keepalived.conf provided using image default one"
-    if [ ! -e /osixia/keepalived/keepalived.conf ]; then
-      echo "Error: No default keepalived.conf found in /osixia/keepalived/keepalived.conf"
-      exit 1
-    else
-
-      ln -s /osixia/keepalived/keepalived.conf /etc/keepalived/keepalived.conf
-
-      #
-      # 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
-
-      if [ -n "$KEEPALIVED_NOTIFY" ]; then
-        sed -i "s|{{ keepalived_notify }}|notify \"$KEEPALIVED_NOTIFY\"|g" /etc/keepalived/keepalived.conf
-      else
-        sed -i "/{{ keepalived_notify }}/d" /etc/keepalived/keepalived.conf
-      fi
-
-      # unicast peers
-      KEEPALIVED_UNICAST_PEERS=($KEEPALIVED_UNICAST_PEERS)
-      for peer in "${KEEPALIVED_UNICAST_PEERS[@]}"
-      do
-        # 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
-        # directly
-        else
-          sed -i "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
-
-      # virtual ips
-      KEEPALIVED_VIRTUAL_IPS=($KEEPALIVED_VIRTUAL_IPS)
-      for vip in "${KEEPALIVED_VIRTUAL_IPS[@]}"
-      do
-        # 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
-        # directly
-        else
-          sed -i "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
-    fi
-
-  fi
-
-  touch $FIRST_START_DONE
-fi
-
-exit 0

image/service/keepalived/daemon.sh

@@ -1,2 +0,0 @@
-#!/bin/bash -e
-exec /usr/local/sbin/keepalived -f /etc/keepalived/keepalived.conf --dont-fork --log-console -D -d

image/service/keepalived/finish.sh

@@ -0,0 +1,26 @@
+#!/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
+
+# 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_INFO=$(ip addr list | grep ${IP}) || continue
+  IP_V6=$(echo "${IP_INFO}" | grep "inet6") || true
+
+  # ipv4
+  if [ -z "${IP_V6}" ]; then
+    IP_INTERFACE=$(echo "${IP_INFO}" |  awk '{print $5}')
+  # ipv6
+  else
+    echo "skipping address: ${IP} - ipv6 not supported yet :("
+    continue
+  fi
+
+  ip addr del ${IP} dev ${IP_INTERFACE} || true
+done
+
+exit 0

image/service/keepalived/install.sh

@@ -0,0 +1,5 @@
+#!/bin/bash -e
+# this script is run during the image build
+
+# delete keepalived default config file
+rm /usr/local/etc/keepalived/keepalived.conf

image/service/keepalived/process.sh

@@ -0,0 +1,15 @@
+#!/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
+
+echo -n "Waiting config file /usr/local/etc/keepalived/keepalived.conf"
+while [ ! -e "/usr/local/etc/keepalived/keepalived.conf" ]
+do
+  echo -n "."
+  sleep 0.1
+done
+echo "ok"
+
+exec /usr/local/sbin/keepalived -f /usr/local/etc/keepalived/keepalived.conf --dont-fork --log-console ${KEEPALIVED_COMMAND_LINE_ARGUMENTS}

image/service/keepalived/startup.sh

@@ -0,0 +1,65 @@
+#!/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
+
+FIRST_START_DONE="${CONTAINER_STATE_DIR}/docker-keepalived-first-start-done"
+# container first start
+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
+
+  if [ -n "$KEEPALIVED_NOTIFY" ]; then
+    sed -i "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
+  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
+  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)
+  do
+    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
+
+  touch $FIRST_START_DONE
+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_INFO=$(ip addr list | grep ${IP}) || continue
+  IP_V6=$(echo "${IP_INFO}" | grep "inet6") || true
+
+  # ipv4
+  if [ -z "${IP_V6}" ]; then
+    IP_INTERFACE=$(echo "${IP_INFO}" |  awk '{print $5}')
+  # ipv6
+  else
+    echo "skipping address: ${IP} - ipv6 not supported yet :("
+    continue
+  fi
+
+  ip addr del ${IP} dev ${IP_INTERFACE} || true
+done
+
+if [ ! -e "/usr/local/etc/keepalived/keepalived.conf" ]; then
+  ln -sf ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf /usr/local/etc/keepalived/keepalived.conf
+fi
+
+exit 0

test/test_helper.bash

@@ -2,7 +2,7 @@ setup() {
   IMAGE_NAME="$NAME:$VERSION"
 }
 
-# function relative to the current container / image  
+# function relative to the current container / image
 build_image() {
   #disable outputs
   docker build -t $IMAGE_NAME $BATS_TEST_DIRNAME/../image &> /dev/null
@@ -30,16 +30,11 @@ clear_container() {
   remove_containers_by_cid $CONTAINER_ID
 }
 
-is_service_running() {
+wait_process() {
-  is_service_running_by_cid $CONTAINER_ID $1
+  wait_process_by_cid $CONTAINER_ID $@
 }
 
-wait_service() {
+# generic functions
-  wait_service_by_cid $CONTAINER_ID $@
-}
-
-
-# generic functions 
 get_container_ip_by_cid() {
   local IP=$(docker inspect -f "{{ .NetworkSettings.IPAddress }}" $1)
   echo "$IP"
@@ -50,7 +45,7 @@ start_containers_by_cid() {
   do
     #disable outputs
     docker start $cid &> /dev/null
-  done 
+  done
 }
 
 stop_containers_by_cid() {
@@ -58,7 +53,7 @@ stop_containers_by_cid() {
   do
     #disable outputs
     docker stop $cid &> /dev/null
-  done 
+  done
 }
 
 remove_containers_by_cid() {
@@ -66,7 +61,7 @@ remove_containers_by_cid() {
   do
     #disable outputs
     docker rm $cid &> /dev/null
-  done 
+  done
 }
 
 clear_containers_by_cid() {
@@ -74,28 +69,7 @@ clear_containers_by_cid() {
   remove_containers_by_cid $@
 }
 
-is_service_running_by_cid() {
+wait_process_by_cid() {
-  docker exec $1 ps cax | grep $2  > /dev/null
-}
-
-wait_service_by_cid() {
-
   cid=$1
-
+  docker exec $cid /container/tool/wait-process ${@:2}
-  # first wait image init end
+}
-  while ! is_service_running_by_cid $cid syslog-ng
-  do
-    sleep 1
-  done
-
-  for service in "${@:2}"
-  do
-    # wait service
-    while ! is_service_running_by_cid $cid $service
-    do
-      sleep 1
-    done
-  done
-
-  sleep 5
-}