Set version to 2.1.5

keeping curl

.travis.yml

@@ -0,0 +1,101 @@
+language: bash
+
+services:
+  - docker
+env:
+  global:
+    - NAME="osixia/keepalived"
+    - VERSION="${TRAVIS_BRANCH}-dev"
+  matrix:
+    - TARGET_ARCH=amd64 QEMU_ARCH=x86_64
+    - TARGET_ARCH=arm32v7 QEMU_ARCH=arm
+    - TARGET_ARCH=arm64v8 QEMU_ARCH=aarch64
+
+addons:
+  apt:
+    # The docker manifest command was added in docker-ee version 18.x
+    # So update our current installation and we also have to enable the experimental features.
+    sources:
+      - sourceline: "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
+        key_url: "https://download.docker.com/linux/ubuntu/gpg"
+    packages:
+      - docker-ce
+
+before_install:
+  - docker --version
+  - mkdir $HOME/.docker
+  - 'echo "{" > $HOME/.docker/config.json'
+  - 'echo "  \"experimental\": \"enabled\"" >> $HOME/.docker/config.json'
+  - 'echo "}" >> $HOME/.docker/config.json'
+  - sudo service docker restart
+
+install:
+  # For cross buidling our images
+  # This is necessary because travis-ci.org has only x86_64 machines.
+  # If travis-ci.org gets native arm builds, probably this step is not
+  # necessary any more.
+  - docker run --rm --privileged multiarch/qemu-user-static:register --reset
+    # Bats is necessary for the UT
+  - curl -o bats.tar.gz -SL https://github.com/bats-core/bats-core/archive/v1.1.0.tar.gz
+  - mkdir bats-core && tar -xf bats.tar.gz -C bats-core --strip-components=1
+  - cd bats-core/
+  - sudo ./install.sh /usr/local
+  - cd ..
+
+before_script:
+  # Set baseimage.
+  - sed -i -e "s/FROM \(.*\)/FROM \1-${TARGET_ARCH}/g" image/Dockerfile;
+  - cat image/Dockerfile;
+  # If this is a tag then change the VERSION variable to only have the
+  # tag name and not also the commit hash.
+  - if [ -n "$TRAVIS_TAG" ]; then
+    VERSION=$(echo "${TRAVIS_TAG}" | sed -e 's/\(.*\)[-v]\(.*\)/\1\2/g');
+    fi
+  - if [ "${TRAVIS_BRANCH}" == 'stable' ]; then
+    VERSION="stable";
+    fi
+
+script:
+  - make build-nocache NAME=${NAME} VERSION=${VERSION}-${TARGET_ARCH}
+  # Run the test and if the test fails mark the build as failed.
+  - make test NAME=${NAME} VERSION=${VERSION}-${TARGET_ARCH}
+
+before_deploy:
+  - docker run -d --name test_image ${NAME}:${VERSION}-${TARGET_ARCH} sleep 10
+  - sleep 5
+  - sudo docker ps | grep -q test_image
+  # To have `DOCKER_USER` and `DOCKER_PASS`
+  # use `travis env set`.
+  - docker login -u "$DOCKER_USER" -p "$DOCKER_PASS";
+  - make tag NAME=${NAME} VERSION=${VERSION}-${TARGET_ARCH}
+
+deploy:
+  provider: script
+  on:
+    all_branches: true
+  script: make push NAME=${NAME} VERSION=${VERSION}-${TARGET_ARCH}
+
+jobs:
+  include:
+    - stage: Manifest creation
+      install: skip
+      script: skip
+      after_deploy:
+        - docker login -u "$DOCKER_USER" -p "$DOCKER_PASS";
+        - docker manifest create ${NAME}:${VERSION} ${NAME}:${VERSION}-amd64 ${NAME}:${VERSION}-arm32v7 ${NAME}:${VERSION}-arm64v8;
+          docker manifest annotate ${NAME}:${VERSION} ${NAME}:${VERSION}-amd64 --os linux --arch amd64;
+          docker manifest annotate ${NAME}:${VERSION} ${NAME}:${VERSION}-arm32v7 --os linux --arch arm --variant v7;
+          docker manifest annotate ${NAME}:${VERSION} ${NAME}:${VERSION}-arm64v8 --os linux --arch arm64 --variant v8;
+
+        # The latest tag is coming from the stable branch of the repo
+        - if [ "${TRAVIS_BRANCH}" == 'stable' ]; then
+          docker manifest create ${NAME}:latest ${NAME}:${VERSION}-amd64 ${NAME}:${VERSION}-arm32v7 ${NAME}:${VERSION}-arm64v8;
+          docker manifest annotate ${NAME}:latest ${NAME}:${VERSION}-amd64 --os linux --arch amd64;
+          docker manifest annotate ${NAME}:latest ${NAME}:${VERSION}-arm32v7 --os linux --arch arm --variant v7;
+          docker manifest annotate ${NAME}:latest ${NAME}:${VERSION}-arm64v8 --os linux --arch arm64 --variant v8;
+          fi
+
+        - docker manifest push ${NAME}:${VERSION};
+          if [ "${TRAVIS_BRANCH}" == 'stable' ]; then
+          docker manifest push ${NAME}:latest;
+          fi

CHANGELOG.md

@@ -1,38 +1,249 @@
 # 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.2.0
-  - Upgrade baseimage: light-baseimage:0.2.1
+The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
+and this project follows keepalived versioning.
+
+## [2.0.20] - 2020-02-07
+### Changed
+  - Upgrade keepalived version to 2.0.20
+
+### Fixed
+  - When system reboot or unexpected shutdown, keepalived never start up again #18 #25
+
+## [2.0.19] - 2019-11-15
+## Added
+  - Multiarch support
+
+### Changed
+  - Upgrade keepalived version to 2.0.19
+
+## [2.0.17] - 2019-07-05
+### Added
+  - Curl
+
+### Changed
+  - Upgrade keepalived version to 2.0.17
+  - Upgrade baseimage to alpine-light-baseimage:0.1.6
+
+## [2.0.16] - 2019-05-29
+### Added 
+  - Add NET_BROADCAST and NET_RAW capabilities on readme. Fixes #14
+
+### Changed
+  - Upgrade keepalived version to 2.0.16
+
+
+## [2.0.15] - 2019-04-05
+### Changed
+  - Upgrade keepalived version to 2.0.15
+
+## [2.0.13] - 2019-02-27
+### Changed
+  - Upgrade keepalived version to 2.0.13
+
+## [2.0.12] - 2019-01-30
+### Changed
+  - Upgrade keepalived version to 2.0.12
+
+## [2.0.11] - 2019-01-21
+### Added
+  - KEEPALIVED_STATE environment variable
+
+### Changed
+  - Upgrade keepalived version to 2.0.11
+
+## [2.0.10] - 2018-11-13
+### Changed
+  - Upgrade keepalived version to 2.0.10
+
+### Removed 
+  - track_interface in keepalived.conf
+
+## [1.4.5] - 2018-06-02
+### Changed
+  - Upgrade keepalived version to 1.4.5
+
+## [1.4.4] - 2018-05-14
+### Added
+  - Router ID with environment KEEPALIVED_ROUTER_ID #16
+
+### Changed
+  - Upgrade keepalived version to 1.4.4
+
+## [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
 
-## 0.1.9
-  - Upgrade baseimage: light-baseimage:0.1.5
+### Changed
+  - Upgrade baseimage to light-baseimage:0.2.1
 
-## 0.1.8
-  - Upgrade baseimage: light-baseimage:0.1.4
+## [0.1.9] - 2015-11-20
+### Changed
+  - Upgrade baseimage to light-baseimage:0.1.5
 
-## 0.1.7
-  - Upgrade baseimage: light-baseimage:0.1.2
+## [0.1.8] - 2015-11-19
+### Changed
+  - Upgrade baseimage to light-baseimage:0.1.4
 
-## 0.1.6
+## [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
-  - Upgrade baseimage: light-baseimage:0.1.1
+## [0.1.5] - 2015-08-19
+### Changed
+  - Upgrade baseimage to light-baseimage:0.1.1
 
-## 0.1.4
+## [0.1.4] - 2015-07-23
+### Changed
   - Use light-baseimage
 
-## 0.1.3
+## [0.1.3] - 2015-07-09
+### Fixed
   - Fix libnl dependency
 
-## 0.1.2
-  - Keepalived version 1.2.19
-  - Update default config :
+## [0.1.2] - 2015-07-09
+### Changed
+  - Upgrade keepalived version to 1.2.19
+  - Upgrade default config :
   - Set start state to BACKUP
 
-## 0.1.1
-  - Add notify script
+## [0.1.1] - 2015-06-21
+### Added
+  - Notify script
 
-## 0.1.0
-  - Initial release
+## 0.1.0 - 2015-06-16
+Initial release
+
+[2.0.20]: https://github.com/osixia/docker-keepalived/compare/v2.0.19...v2.0.20
+[2.0.19]: https://github.com/osixia/docker-keepalived/compare/v2.0.17...v2.0.19
+[2.0.17]: https://github.com/osixia/docker-keepalived/compare/v2.0.16...v2.0.17
+[2.0.16]: https://github.com/osixia/docker-keepalived/compare/v2.0.15...v2.0.16
+[2.0.15]: https://github.com/osixia/docker-keepalived/compare/v2.0.13...v2.0.15
+[2.0.13]: https://github.com/osixia/docker-keepalived/compare/v2.0.12...v2.0.13
+[2.0.12]: https://github.com/osixia/docker-keepalived/compare/v2.0.11...v2.0.12
+[2.0.11]: https://github.com/osixia/docker-keepalived/compare/v2.0.10...v2.0.11
+[2.0.10]: https://github.com/osixia/docker-keepalived/compare/v1.4.5...v2.0.10
+[1.4.5]: https://github.com/osixia/docker-keepalived/compare/v1.4.4...v1.4.5
+[1.4.4]: https://github.com/osixia/docker-keepalived/compare/v1.4.2...v1.4.4
+[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,9 +1,7 @@
 NAME = osixia/keepalived
-VERSION = 0.2.0
+VERSION = 2.1.5
 
-.PHONY: all build build-nocache test tag_latest release
-
-all: build
+.PHONY: build build-nocache test tag-latest push push-latest release git-tag-version
 
 build:
 	docker build -t $(NAME):$(VERSION) --rm image
@@ -14,10 +12,20 @@ build-nocache:
 test:
 	env NAME=$(NAME) VERSION=$(VERSION) bats test/test.bats
 
-tag_latest:
-	docker tag -f $(NAME):$(VERSION) $(NAME):latest
+tag:
+	docker tag $(NAME):$(VERSION) $(NAME):$(VERSION)
 
-release: build test tag_latest
-	@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)
-	@echo "*** Don't forget to run 'twgit release/hotfix finish' :)"
+tag-latest:
+	docker tag $(NAME):$(VERSION) $(NAME):latest
+
+push:
+	docker push $(NAME):$(VERSION)
+
+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,31 +1,40 @@
 # 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/) 
+[![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")
 
-A docker image to run Keepalived.
+[hub]: https://hub.docker.com/r/osixia/keepalived/
+
+Latest release: 2.0.20 - Keepalived 2.0.20 - [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)
+- [osixia/keepalived](#osixiakeepalived)
+	- [Quick start](#quick-start)
+	- [Beginner Guide](#beginner-guide)
+		- [Use your own Keepalived config](#use-your-own-keepalived-config)
+		- [Fix docker mounted file problems](#fix-docker-mounted-file-problems)
 		- [Debug](#debug)
-- [Environment Variables](#environment-variables)
+	- [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)
+	- [Advanced User Guide](#advanced-user-guide)
+		- [Extend osixia/keepalived:2.0.20 image](#extend-osixiakeepalived2020-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)
+	- [Security](#security)
+	- [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
 
-    docker run --cap-add=NET_ADMIN --net=host -d osixia/keepalived:0.2.0
+    docker run --cap-add=NET_ADMIN --cap-add=NET_BROADCAST --cap-add=NET_RAW --net=host -d osixia/keepalived:2.0.20
 
 ## Beginner Guide
 
@@ -35,10 +44,18 @@ 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
+      docker run --volume /data/my-keepalived.conf:/container/service/keepalived/assets/keepalived.conf --detach osixia/keepalived:2.0.20
 
 - 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:2.0.20 --copy-service
+
 ### Debug
 
 The container default log level is **info**.
@@ -46,11 +63,11 @@ 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
+	docker run --detach osixia/keepalived:2.0.20 --loglevel debug
 
 See all command line options:
 
-	docker run osixia/keepalived:0.2.0 --help
+	docker run osixia/keepalived:2.0.20 --help
 
 
 ## Environment Variables
@@ -63,6 +80,7 @@ See how to [set your own environment variables](#set-your-own-environment-variab
 - **KEEPALIVED_INTERFACE**: Keepalived network interface. Defaults to `eth0`
 - **KEEPALIVED_PASSWORD**: Keepalived password. Defaults to `d0cker`
 - **KEEPALIVED_PRIORITY** Keepalived node priority. Defaults to `150`
+- **KEEPALIVED_ROUTER_ID** Keepalived virtual router ID. Defaults to `51`
 
 - **KEEPALIVED_UNICAST_PEERS** Keepalived unicast peers. Defaults to :
       - 192.168.1.10
@@ -70,7 +88,7 @@ See how to [set your own environment variables](#set-your-own-environment-variab
 
   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:0.2.0
+      docker run --env KEEPALIVED_UNICAST_PEERS="#PYTHON2BASH:['192.168.1.10', '192.168.1.11']" --detach osixia/keepalived:2.0.20
 
   To convert yaml to python online : http://yaml-online-parser.appspot.com/
 
@@ -86,17 +104,7 @@ See how to [set your own environment variables](#set-your-own-environment-variab
 
 - **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 :
-
-	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 --volume /data/my-env.yaml:/container/environment/env.yaml \
-	--detach osixia/keepalived
+- **KEEPALIVED_STATE** The starting state of keepalived; it can either be MASTER or BACKUP.
 
 ### Set your own environment variables
 
@@ -104,7 +112,7 @@ Or by setting your own `env.yaml` file as a docker volume to `/container/environ
 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
+    --env KEEPALIVED_PRIORITY="100" --detach osixia/keepalived:2.0.20
 
 
 #### Link environment file
@@ -112,7 +120,7 @@ Environment variables can be set by adding the --env argument in the command lin
 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
+	--detach osixia/keepalived:2.0.20
 
 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).
 
@@ -122,13 +130,13 @@ This is the best solution if you have a private registry. Please refer to the [A
 
 ## Advanced User Guide
 
-### Extend osixia/keepalived:0.2.0 image
+### Extend osixia/keepalived:2.0.20 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
+    FROM osixia/keepalived:2.0.20
     MAINTAINER Your Name <your@name.com>
 
     ADD keepalived.conf /container/service/keepalived/assets/keepalived.conf
@@ -147,7 +155,7 @@ Clone this project :
 Adapt Makefile, set your image NAME and VERSION, for example :
 
 	NAME = osixia/keepalived
-	VERSION = 0.2.0
+	VERSION = 1.3.5
 
 	becomes :
 	NAME = billy-the-king/keepalived
@@ -167,7 +175,7 @@ Run your image :
 
 We use **Bats** (Bash Automated Testing System) to test this image:
 
-> [https://github.com/sstephenson/bats](https://github.com/sstephenson/bats)
+> [https://github.com/bats-core/bats-core](https://github.com/bats-core/bats-core)
 
 Install Bats, and in this project directory run :
 
@@ -179,6 +187,11 @@ Install Bats, and in this project directory run :
 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,40 +1,53 @@
 # 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>
+FROM osixia/light-baseimage:alpine-0.1.6-dev
 
 # Keepalived version
-ENV KEEPALIVED_VERSION 1.2.19
+ARG KEEPALIVED_VERSION=2.1.5
 
 # Download, build and install Keepalived
-RUN apt-get -y update \
-    && LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+RUN apk --no-cache add \
+    autoconf \
     curl \
     gcc \
-       libnl-3-dev \
-       libnl-genl-3-dev \
-       libssl-dev \
+    ipset \
+    ipset-dev \
+    iptables \
+    iptables-dev \
+    libnfnetlink \
+    libnfnetlink-dev \
+    libnl3 \
+    libnl3-dev \
     make \
-       pkg-config \
+    musl-dev \
+    openssl \
+    openssl-dev \
     && 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 \
     && 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 curl make gcc pkg-config libssl-dev
+    && rm -f keepalived.tar.gz \
+    && rm -rf /container/keepalived-sources \
+    && apk --no-cache del \
+    autoconf \
+    gcc \
+    ipset-dev \
+    iptables-dev \
+    libnfnetlink-dev \
+    libnl3-dev \
+    make \
+    musl-dev \
+    openssl-dev
 
 # Add service directory to /container/service
 ADD service /container/service
 
-# Use baseimage install-service script and clean all
+# Use baseimage install-service script
 # https://github.com/osixia/docker-light-baseimage/blob/stable/image/tool/install-service
-RUN /container/tool/install-service \
-    && rm -f keepalived.tar.gz \
-    && rm -rf /container/keepalived-sources \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+RUN /container/tool/install-service
 
 # Add default env variables
 ADD environment /container/environment/99-default

image/environment/default.yaml

@@ -1,3 +1,5 @@
+KEEPALIVED_COMMAND_LINE_ARGUMENTS: --log-detail --dump-conf
+
 KEEPALIVED_INTERFACE: eth0
 KEEPALIVED_PASSWORD: d0cker
 
@@ -15,4 +17,6 @@ KEEPALIVED_VIRTUAL_IPS:
 
 KEEPALIVED_NOTIFY: /container/service/keepalived/assets/notify.sh
 
-KEEPALIVED_COMMAND_LINE_ARGUMENTS: --log-detail --dump-conf
+KEEPALIVED_ROUTER_ID: 51
+
+KEEPALIVED_STATE: BACKUP

image/service/keepalived/assets/keepalived.conf

@@ -1,33 +1,27 @@
-vrrp_sync_group VG_1 {
-  group {
-    VI_1
-  }
-
-  {{ keepalived_notify }}
+global_defs {
+  default_interface {{ KEEPALIVED_INTERFACE }}
 }
 
 vrrp_instance VI_1 {
-  interface {{ keepalived_interface }}
+  interface {{ KEEPALIVED_INTERFACE }}
 
-  track_interface {
-    {{ keepalived_interface }}
-  }
-
-  state BACKUP
-  virtual_router_id 51
-  priority {{ keepalived_priority }}
+  state {{ KEEPALIVED_STATE }}
+  virtual_router_id {{ KEEPALIVED_ROUTER_ID }}
+  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 -s -t keepalived-notify "I'm the MASTER! Whup whup."
+    "MASTER") echo "I'm the MASTER! Whup whup." > /proc/1/fd/1
         exit 0
     ;;
-        "BACKUP") logger -s -t keepalived-notify "Ok, i'm just a backup, great."
+    "BACKUP") echo "Ok, i'm just a backup, great." > /proc/1/fd/1
         exit 0
     ;;
-        "FAULT")  logger -s -t keepalived-notify "Fault, what ?"
+    "FAULT")  echo "Fault, what ?" > /proc/1/fd/1
         exit 0
     ;;
-        *)        logger -s -t keepalived-notify "Unknown state"
+    *)        echo "Unknown state" > /proc/1/fd/1
         exit 1
     ;;
 esac

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

@@ -4,4 +4,12 @@
 # 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 ${KEEPALIVED_COMMAND_LINE_ARGUMENTS}
+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

@@ -11,36 +11,59 @@ if [ ! -e "$FIRST_START_DONE" ]; then
   #
   # bootstrap config
   #
-  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
+  sed -i "s|{{ KEEPALIVED_STATE }}|$KEEPALIVED_STATE|g" ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf
+  sed -i "s|{{ KEEPALIVED_ROUTER_ID }}|$KEEPALIVED_ROUTER_ID|g" ${CONTAINER_SERVICE_DIR}/keepalived/assets/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" ${CONTAINER_SERVICE_DIR}/keepalived/assets/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" ${CONTAINER_SERVICE_DIR}/keepalived/assets/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" ${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 --follow-symlinks "/{{ keepalived_unicast_peers }}/d" ${CONTAINER_SERVICE_DIR}/keepalived/assets/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" ${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 --follow-symlinks "/{{ keepalived_virtual_ips }}/d" ${CONTAINER_SERVICE_DIR}/keepalived/assets/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
+# 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
 
+rm -f /run/keepalived.pid || true
+
 exit 0

test/test_helper.bash

@@ -30,19 +30,10 @@ clear_container() {
   remove_containers_by_cid $CONTAINER_ID
 }
 
-is_service_running() {
-  is_service_running_by_cid $CONTAINER_ID $1
+wait_process() {
+  wait_process_by_cid $CONTAINER_ID $@
 }
 
-is_file_exists() {
-  is_file_exists_by_cid $CONTAINER_ID $1
-}
-
-wait_service() {
-  wait_service_by_cid $CONTAINER_ID $@
-}
-
-
 # generic functions
 get_container_ip_by_cid() {
   local IP=$(docker inspect -f "{{ .NetworkSettings.IPAddress }}" $1)
@@ -78,30 +69,7 @@ clear_containers_by_cid() {
   remove_containers_by_cid $@
 }
 
-is_service_running_by_cid() {
-  docker exec $1 ps cax | grep $2  > /dev/null
-}
-
-is_file_exists_by_cid() {
-  docker exec $1 cat $2 > /dev/null 2>&1
-}
-
-wait_service_by_cid() {
-
+wait_process_by_cid() {
   cid=$1
-
-  # first wait image init end
-  while ! is_file_exists_by_cid $cid /container/run/state/startup-done
-  do
-    sleep 0.5
-  done
-
-  for service in "${@:2}"
-  do
-    # wait service
-    while ! is_service_running_by_cid $cid $service
-    do
-      sleep 0.5
-    done
-  done
+  docker exec $cid /container/tool/wait-process ${@:2}
 }