Merge branch 'release-2.0.15' into stable

CHANGELOG.md

@@ -5,6 +5,47 @@ Please refer to the upstream [keepalived changelog](https://github.com/acassen/k
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project follows keepalived versioning.
 
+## [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
@@ -134,5 +175,41 @@ and this project follows keepalived versioning.
 ### Added
   - Notify script
 
-## [0.1.0] - 2015-06-16
+## 0.1.0 - 2015-06-16
 Initial release
+
+[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,5 +1,5 @@
 NAME = osixia/keepalived
-VERSION = 1.4.1
+VERSION = 2.0.15
 
 .PHONY: build build-nocache test tag-latest push push-latest release git-tag-version
 

README.md

@@ -6,34 +6,35 @@
 
 [hub]: https://hub.docker.com/r/osixia/keepalived/
 
-Latest release: 1.4.1 - Keepalived 1.4.1 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/keepalived/) 
+Latest release: 2.0.15 - Keepalived 2.0.15 - [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.1 image](#extend-osixiakeepalived141-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)
+- [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)
+		- [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:2.0.15 image](#extend-osixiakeepalived2015-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 (`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:1.4.1
+    docker run --cap-add=NET_ADMIN --net=host -d osixia/keepalived:2.0.15
 
 ## Beginner Guide
 
@@ -43,7 +44,7 @@ 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.1
+      docker run --volume /data/my-keepalived.conf:/container/service/keepalived/assets/keepalived.conf --detach osixia/keepalived:2.0.15
 
 - Add your config file by extending or cloning this image, please refer to the [Advanced User Guide](#advanced-user-guide)
 
@@ -53,7 +54,7 @@ You may have some problems with mounted files on some systems. The startup scrip
 
 To fix that run the container with `--copy-service` argument :
 
-		docker run [your options] osixia/keepalived:1.4.1 --copy-service
+		docker run [your options] osixia/keepalived:2.0.15 --copy-service
 
 ### Debug
 
@@ -62,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:1.4.1 --loglevel debug
+	docker run --detach osixia/keepalived:2.0.15 --loglevel debug
 
 See all command line options:
 
-	docker run osixia/keepalived:1.4.1 --help
+	docker run osixia/keepalived:2.0.15 --help
 
 
 ## Environment Variables
@@ -79,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
@@ -86,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:1.4.1
+      docker run --env KEEPALIVED_UNICAST_PEERS="#PYTHON2BASH:['192.168.1.10', '192.168.1.11']" --detach osixia/keepalived:2.0.15
 
   To convert yaml to python online : http://yaml-online-parser.appspot.com/
 
@@ -102,13 +104,15 @@ 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`
 
+- **KEEPALIVED_STATE** The starting state of keepalived; it can either be MASTER or BACKUP.
+
 ### 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.1
+    --env KEEPALIVED_PRIORITY="100" --detach osixia/keepalived:2.0.15
 
 
 #### Link environment file
@@ -116,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:1.4.1
+	--detach osixia/keepalived:2.0.15
 
 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).
 
@@ -126,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:1.4.1 image
+### Extend osixia/keepalived:2.0.15 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.1
+    FROM osixia/keepalived:2.0.15
     MAINTAINER Your Name <your@name.com>
 
     ADD keepalived.conf /container/service/keepalived/assets/keepalived.conf

image/Dockerfile

@@ -1,27 +1,27 @@
 # 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
-ARG KEEPALIVED_VERSION=1.4.1
+ARG KEEPALIVED_VERSION=2.0.15
 
 # Download, build and install Keepalived
 RUN apk --no-cache add \
-       curl \
-       gcc \
-       ipset \
-       ipset-dev \
-       iptables \
-       iptables-dev \
-       libnfnetlink \
-       libnfnetlink-dev \
-       libnl3 \
-       libnl3-dev \
-       make \
-       musl-dev \
-       openssl \
-       openssl-dev \
+    autoconf \
+    curl \
+    gcc \
+    ipset \
+    ipset-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 /container/keepalived-sources \
     && tar -xzf keepalived.tar.gz --strip 1 -C /container/keepalived-sources \
@@ -32,16 +32,16 @@ RUN apk --no-cache add \
     && rm -f keepalived.tar.gz \
     && rm -rf /container/keepalived-sources \
     && apk --no-cache del \
-        curl \
-        gcc \
-        ipset-dev \
-        iptables-dev \
-        libnfnetlink-dev \
-        libnl3-dev \
-        make \
-        musl-dev \
-        openssl-dev
-
+    autoconf \
+    curl \
+    gcc \
+    ipset-dev \
+    iptables-dev \
+    libnfnetlink-dev \
+    libnl3-dev \
+    make \
+    musl-dev \
+    openssl-dev
 
 # Add service directory to /container/service
 ADD service /container/service

image/environment/default.yaml

@@ -16,3 +16,7 @@ KEEPALIVED_VIRTUAL_IPS:
   - 192.168.1.232
 
 KEEPALIVED_NOTIFY: /container/service/keepalived/assets/notify.sh
+
+KEEPALIVED_ROUTER_ID: 51
+
+KEEPALIVED_STATE: BACKUP

image/service/keepalived/assets/keepalived.conf

@@ -5,12 +5,8 @@ global_defs {
 vrrp_instance VI_1 {
   interface {{ KEEPALIVED_INTERFACE }}
 
-  track_interface {
-    {{ KEEPALIVED_INTERFACE }}
-  }
-
-  state BACKUP
-  virtual_router_id 51
+  state {{ KEEPALIVED_STATE }}
+  virtual_router_id {{ KEEPALIVED_ROUTER_ID }}
   priority {{ KEEPALIVED_PRIORITY }}
   nopreempt
 

image/service/keepalived/assets/notify.sh

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

image/service/keepalived/startup.sh

@@ -11,6 +11,8 @@ if [ ! -e "$FIRST_START_DONE" ]; then
   #
   # bootstrap config
   #
+  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