Merge branch 'hotfix-0.1.5' into stable

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 0.1.5
+  - Upgrade baseimage: osixia/light-baseimage:0.1.1
+
+## 0.1.4
+  - Use light-baseimage
+
+## 0.1.3
+  - Fix libnl dependency
+
 ## 0.1.2
   - Keepalived version 1.2.19
   - Update default config :

Makefile

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

README.md

@@ -1,5 +1,7 @@
 # osixia/keepalived
 
+[![](https://badge.imagelayers.io/osixia/keepalived:latest.svg)](https://imagelayers.io/?images=osixia/keepalived:latest 'Get your own badge on imagelayers.io')
+
 A docker image to run Keepalived.
 > [keepalived.org](http://keepalived.org/)
 

image/Dockerfile

@@ -1,35 +1,42 @@
-FROM osixia/baseimage:0.10.4
+FROM osixia/light-baseimage:0.1.1
 MAINTAINER Bertrand Gouny <bertrand.gouny@osixia.net>
 
 # Keepalived version
 ENV KEEPALIVED_VERSION 1.2.19
 
-# Use baseimage-docker's init system.
+# Use baseimage's init system.
-CMD ["/sbin/my_init"]
+# https://github.com/osixia/docker-light-baseimage/blob/stable/image/tool/run
+CMD ["/container/tool/run"]
 
 # Install Keepalived
 RUN apt-get -y update \
     && LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get install -y \
-    make gcc pkg-config libssl-dev libnl-dev \
+      curl \
+      make \
+      gcc \
+      pkg-config \
+      libssl-dev \
+      libnl-3-dev \
+      libnl-genl-3-dev \
     && curl -o keepalived.tar.gz -SL http://keepalived.org/software/keepalived-${KEEPALIVED_VERSION}.tar.gz \
-    && mkdir -p /osixia/keepalived-sources \
+    && mkdir -p /container/keepalived-sources \
-    && tar -xzf keepalived.tar.gz --strip 1 -C /osixia/keepalived-sources \
+    && tar -xzf keepalived.tar.gz --strip 1 -C /container/keepalived-sources \
-    && cd osixia/keepalived-sources \
+    && cd container/keepalived-sources \
     && ./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 pkg-config libssl-dev libnl-dev
+    && apt-get remove -y --purge --auto-remove curl make gcc pkg-config libssl-dev
 
-# Add Keepalived assets
+# Add service directory to /container/service
-ADD service/keepalived/assets /osixia/keepalived
+ADD service /container/service
 
-# Clean all
+# Use baseimage install-service script and clean all
-RUN rm keepalived.tar.gz \
+# https://github.com/osixia/docker-light-baseimage/blob/stable/image/tool/install-service
-  && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+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/*
 
 # Add default env variables
-ADD env.yml /etc/env.yml
+ADD env.yaml /etc/env.yaml
-
-# Add Keepalived container start config & daemon
-ADD service/keepalived/container-start.sh /etc/my_init.d/keepalived
-ADD service/keepalived/daemon.sh /etc/service/keepalived/run

image/env.yaml

@@ -1,7 +1,7 @@
 KEEPALIVED_INTERFACE: eth0
 KEEPALIVED_PASSWORD: d0cker
 
-# for electing MASTER, highest priority wins.
+# For electing MASTER, highest priority wins.
 # to be MASTER, make 50 more than other machines
 KEEPALIVED_PRIORITY: 150
 
@@ -13,4 +13,4 @@ KEEPALIVED_VIRTUAL_IPS:
   - 192.168.1.231
   - 192.168.1.232
 
-KEEPALIVED_NOTIFY: /osixia/keepalived/notify.sh
+KEEPALIVED_NOTIFY: /container/service/keepalived/assets/notify.sh

image/service/keepalived/assets/notify.sh

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

image/service/keepalived/container-start.sh

@@ -8,12 +8,12 @@ if [ ! -e "$FIRST_START_DONE" ]; then
   # config folder is empty use bootstrap config if available
   if [ ! -e /etc/keepalived/keepalived.conf ]; then
     echo "No keepalived.conf provided using image default one"
-    if [ ! -e /osixia/keepalived/keepalived.conf ]; then
+    if [ ! -e /container/service/keepalived/assets/keepalived.conf ]; then
-      echo "Error: No default keepalived.conf found in /osixia/keepalived/keepalived.conf"
+      echo "Error: No default keepalived.conf found in /container/service/keepalived/assets/keepalived.conf"
       exit 1
     else
 
-      ln -s /osixia/keepalived/keepalived.conf /etc/keepalived/keepalived.conf
+      ln -s /container/service/keepalived/assets/keepalived.conf /etc/keepalived/keepalived.conf
 
       #
       # bootstrap config

test/test_helper.bash

@@ -2,7 +2,7 @@ setup() {
   IMAGE_NAME="$NAME:$VERSION"
 }
 
-# function relative to the current container / image  
+# function relative to the current container / image
 build_image() {
   #disable outputs
   docker build -t $IMAGE_NAME $BATS_TEST_DIRNAME/../image &> /dev/null
@@ -34,12 +34,16 @@ is_service_running() {
   is_service_running_by_cid $CONTAINER_ID $1
 }
 
+is_file_exists() {
+  is_file_exists_by_cid $CONTAINER_ID $1
+}
+
 wait_service() {
   wait_service_by_cid $CONTAINER_ID $@
 }
 
 
-# generic functions 
+# generic functions
 get_container_ip_by_cid() {
   local IP=$(docker inspect -f "{{ .NetworkSettings.IPAddress }}" $1)
   echo "$IP"
@@ -50,7 +54,7 @@ start_containers_by_cid() {
   do
     #disable outputs
     docker start $cid &> /dev/null
-  done 
+  done
 }
 
 stop_containers_by_cid() {
@@ -58,7 +62,7 @@ stop_containers_by_cid() {
   do
     #disable outputs
     docker stop $cid &> /dev/null
-  done 
+  done
 }
 
 remove_containers_by_cid() {
@@ -66,7 +70,7 @@ remove_containers_by_cid() {
   do
     #disable outputs
     docker rm $cid &> /dev/null
-  done 
+  done
 }
 
 clear_containers_by_cid() {
@@ -78,12 +82,18 @@ is_service_running_by_cid() {
   docker exec $1 ps cax | grep $2  > /dev/null
 }
 
+is_file_exists_by_cid() {
+  docker exec $1 cat "/etc/my_init_startup_files_completed" > /dev/null 2>&1
+}
+
 wait_service_by_cid() {
 
   cid=$1
 
+  sleep 1
+
   # first wait image init end
-  while ! is_service_running_by_cid $cid syslog-ng
+  while ! is_file_exists_by_cid $cid /etc/my_init_startup_files_completed
   do
     sleep 1
   done
@@ -98,4 +108,4 @@ wait_service_by_cid() {
   done
 
   sleep 5
-}
+}