Merge branch 'release-2.0.10' into stable

CHANGELOG.md

@@ -5,6 +5,13 @@ 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.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

Makefile

@@ -1,5 +1,5 @@
 NAME = osixia/keepalived
-VERSION = 1.4.5
+VERSION = 2.0.10
 
 .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.5 - Keepalived 1.4.5 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/keepalived/) 
+Latest release: 2.0.10 - Keepalived 2.0.10 - [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.5 image](#extend-osixiakeepalived145-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.10 image](#extend-osixiakeepalived2010-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.5
+    docker run --cap-add=NET_ADMIN --net=host -d osixia/keepalived:2.0.10
 
 ## 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.5
+      docker run --volume /data/my-keepalived.conf:/container/service/keepalived/assets/keepalived.conf --detach osixia/keepalived:2.0.10
 
 - 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.5 --copy-service
+		docker run [your options] osixia/keepalived:2.0.10 --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.5 --loglevel debug
+	docker run --detach osixia/keepalived:2.0.10 --loglevel debug
 
 See all command line options:
 
-	docker run osixia/keepalived:1.4.5 --help
+	docker run osixia/keepalived:2.0.10 --help
 
 
 ## Environment Variables
@@ -87,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.5
+      docker run --env KEEPALIVED_UNICAST_PEERS="#PYTHON2BASH:['192.168.1.10', '192.168.1.11']" --detach osixia/keepalived:2.0.10
 
   To convert yaml to python online : http://yaml-online-parser.appspot.com/
 
@@ -109,15 +110,15 @@ See how to [set your own environment variables](#set-your-own-environment-variab
 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.5
+    --env KEEPALIVED_PRIORITY="100" --detach osixia/keepalived:2.0.10
 
 
 #### 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.5
+	--detach osixia/keepalived:2.0.10
 
 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).
 
@@ -127,13 +128,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.5 image
+### Extend osixia/keepalived:2.0.10 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.5
+    FROM osixia/keepalived:2.0.10
     MAINTAINER Your Name <[email protected]>
 
     ADD keepalived.conf /container/service/keepalived/assets/keepalived.conf

image/Dockerfile

@@ -1,28 +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 <[email protected]>
 
 # Keepalived version
-ARG KEEPALIVED_VERSION=1.4.5
+ARG KEEPALIVED_VERSION=2.0.10
 
 # Download, build and install Keepalived
 RUN apk --no-cache add \
-       autoconf \
-       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 \
@@ -33,16 +32,16 @@ RUN apk --no-cache add \
     && rm -f keepalived.tar.gz \
     && rm -rf /container/keepalived-sources \
     && apk --no-cache del \
-        autoconf \
-        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

image/service/keepalived/assets/keepalived.conf

@@ -5,10 +5,6 @@ global_defs {
 vrrp_instance VI_1 {
   interface {{ KEEPALIVED_INTERFACE }}
 
-  track_interface {
-    {{ KEEPALIVED_INTERFACE }}
-  }
-
   state BACKUP
   virtual_router_id {{ KEEPALIVED_ROUTER_ID }}
   priority {{ KEEPALIVED_PRIORITY }}