Merge branch 'hotfix-0.1.2' into stable

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.1.2
+  - Keepalived version 1.2.19
+  - Update default config :
+    - Set start state to BACKUP
+
 ## 0.1.1
   - Add notify script
 

Makefile

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

image/Dockerfile

@@ -2,7 +2,7 @@ FROM osixia/baseimage:0.10.4
 MAINTAINER Bertrand Gouny <bertrand.gouny@osixia.net>
 
 # Keepalived version
-ENV KEEPALIVED_VERSION 1.2.17
+ENV KEEPALIVED_VERSION 1.2.19
 
 # Use baseimage-docker's init system.
 CMD ["/sbin/my_init"]
@@ -10,7 +10,7 @@ CMD ["/sbin/my_init"]
 # Install Keepalived
 RUN apt-get -y update \
     && LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get install -y \
-    make gcc libssl-dev \
+    make gcc pkg-config libssl-dev libnl-dev \
     && curl -o keepalived.tar.gz -SL http://keepalived.org/software/keepalived-${KEEPALIVED_VERSION}.tar.gz \
     && mkdir -p /osixia/keepalived-sources \
     && tar -xzf keepalived.tar.gz --strip 1 -C /osixia/keepalived-sources \
@@ -18,7 +18,7 @@ RUN apt-get -y update \
     && ./configure --with-kernel-dir=/lib/modules/$(uname -r)/build \
     && make && make install \
     && cd - && mkdir -p /etc/keepalived \
-    && apt-get remove -y --purge --auto-remove make gcc libssl-dev
+    && apt-get remove -y --purge --auto-remove make gcc pkg-config libssl-dev libnl-dev
 
 # Add Keepalived assets
 ADD service/keepalived/assets /osixia/keepalived

image/service/keepalived/assets/keepalived.conf

@@ -13,7 +13,7 @@ vrrp_instance VI_1 {
     {{ keepalived_interface }}
   }
 
-  state MASTER
+  state BACKUP
   virtual_router_id 51
   priority {{ keepalived_priority }}
   nopreempt