Merge branch 'feature-1.3.5-1' into stable

Fix dockerfile example FROM error

CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changelog
 
+## 1.3.5
+  - Keepalived version 1.3.5
+
+## 1.3.4
+  - Keepalived version 1.3.4
+
+## 1.3.2
+  - Keepalived version 1.3.2
+
+## 1.3.1
+  - Keepalived version 1.3.1
+
+## 1.3.0
+  - Keepalived version 1.3.0
+  - Upgrade baseimage: light-baseimage:0.2.6
+
+## 1.2.24
+  - Keepalived version 1.2.24
+  - We now use the keepalived version number as docker image tag
+
 ## 0.2.3
   - Upgrade baseimage: light-baseimage:0.2.5
 

Makefile

@@ -1,5 +1,5 @@
 NAME = osixia/keepalived
-VERSION = 0.2.3
+VERSION = 1.3.5
 
 .PHONY: all build build-nocache test tag_latest release
 

README.md

@@ -2,12 +2,15 @@
 
 [![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: 0.2.3 - Keepalived 1.2.23 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/keepalived/) 
+Latest release: 1.3.5 - Keepalived 1.3.5 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/keepalived/) 
 
-A docker image to run Keepalived.
+## /!\ Due to segmentation fault in keepalived 1.3.5 the image have been removed please use v1.3.4
+
+**A docker image to run Keepalived.**
 > [keepalived.org](http://keepalived.org/)
 
 - [Quick start](#quick-start)
@@ -21,7 +24,7 @@ A docker image to run Keepalived.
 		- [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.3 image](#extend-osixiakeepalived023-image)
+	- [Extend osixia/keepalived:1.3.5 image](#extend-osixiakeepalived135-image)
 	- [Make your own keepalived image](#make-your-own-keepalived-image)
 	- [Tests](#tests)
 	- [Under the hood: osixia/light-baseimage](#under-the-hood-osixialight-baseimage)
@@ -31,7 +34,7 @@ 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:0.2.3
+    docker run --cap-add=NET_ADMIN --net=host -d osixia/keepalived:1.3.5
 
 ## Beginner Guide
 
@@ -41,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:0.2.3
+      docker run --volume /data/my-keepalived.conf:/container/service/keepalived/assets/keepalived.conf --detach osixia/keepalived:1.3.5
 
 - Add your config file by extending or cloning this image, please refer to the [Advanced User Guide](#advanced-user-guide)
 
@@ -51,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:0.2.3 --copy-service
+		docker run [your options] osixia/keepalived:1.3.5 --copy-service
 
 ### Debug
 
@@ -60,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.3 --loglevel debug
+	docker run --detach osixia/keepalived:1.3.5 --loglevel debug
 
 See all command line options:
 
-	docker run osixia/keepalived:0.2.3 --help
+	docker run osixia/keepalived:1.3.5 --help
 
 
 ## Environment Variables
@@ -84,7 +87,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.3
+      docker run --env KEEPALIVED_UNICAST_PEERS="#PYTHON2BASH:['192.168.1.10', '192.168.1.11']" --detach osixia/keepalived:1.3.5
 
   To convert yaml to python online : http://yaml-online-parser.appspot.com/
 
@@ -106,7 +109,7 @@ 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:0.2.3
+    --env KEEPALIVED_PRIORITY="100" --detach osixia/keepalived:1.3.5
 
 
 #### Link environment file
@@ -114,7 +117,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.3
+	--detach osixia/keepalived:1.3.5
 
 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).
 
@@ -124,13 +127,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.3 image
+### Extend osixia/keepalived:1.3.5 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.3
+    FROM osixia/keepalived:1.3.5
     MAINTAINER Your Name <your@name.com>
 
     ADD keepalived.conf /container/service/keepalived/assets/keepalived.conf
@@ -149,7 +152,7 @@ Clone this project :
 Adapt Makefile, set your image NAME and VERSION, for example :
 
 	NAME = osixia/keepalived
-	VERSION = 0.2.3
+	VERSION = 1.3.5
 
 	becomes :
 	NAME = billy-the-king/keepalived

image/Dockerfile

@@ -1,18 +1,22 @@
 # Use osixia/light-baseimage
 # sources: https://github.com/osixia/docker-light-baseimage
-FROM osixia/light-baseimage:0.2.5
+FROM osixia/light-baseimage:0.2.6
 MAINTAINER Bertrand Gouny <bertrand.gouny@osixia.net>
 
 # Keepalived version
-ENV KEEPALIVED_VERSION 1.2.23
+ENV KEEPALIVED_VERSION 1.3.5
 
 # Download, build and install Keepalived
 RUN apt-get -y update \
     && LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
        curl \
        gcc \
+       iptables-dev \
+       libipset-dev \
        libnl-3-dev \
        libnl-genl-3-dev \
+       libnl-route-3-dev \
+       libnfnetlink-dev \
        libssl-dev \
        make \
        pkg-config \
@@ -20,10 +24,10 @@ RUN apt-get -y update \
     && 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 \
+    && apt-get remove -y --purge --auto-remove curl make gcc pkg-config \
     && rm -f keepalived.tar.gz \
     && rm -rf /container/keepalived-sources \
     && apt-get clean \