Merge branch 'release-1.3.0' into stable

CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## 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
+
+## 0.2.2
+  - Upgrade baseimage: light-baseimage:0.2.4
+  - Keepalived version 1.2.23
+
 ## 0.2.1
   - Upgrade baseimage: light-baseimage:0.2.2
 

Makefile

@@ -1,5 +1,5 @@
 NAME = osixia/keepalived
-VERSION = 0.2.1
+VERSION = 1.3.0
 
 .PHONY: all build build-nocache test tag_latest release
 
@@ -15,7 +15,7 @@ test:
 	env NAME=$(NAME) VERSION=$(VERSION) bats test/test.bats
 
 tag_latest:
-	docker tag -f $(NAME):$(VERSION) $(NAME):latest
+	docker tag $(NAME):$(VERSION) $(NAME):latest
 
 release: build test tag_latest
 	@if ! docker images $(NAME) | awk '{ print $$2 }' | grep -q -F $(VERSION); then echo "$(NAME) version $(VERSION) is not yet built. Please run 'make build'"; false; fi

README.md

@@ -2,14 +2,13 @@
 
 [![Docker Pulls](https://img.shields.io/docker/pulls/osixia/keepalived.svg)][hub]
 [![Docker Stars](https://img.shields.io/docker/stars/osixia/keepalived.svg)][hub]
-[![Image Size](https://img.shields.io/imagelayers/image-size/osixia/keepalived/latest.svg)](https://imagelayers.io/?images=osixia/keepalived:latest)
+[![](https://images.microbadger.com/badges/image/osixia/keepalived.svg)](http://microbadger.com/images/osixia/keepalived "Get your own image badge on microbadger.com")
-[![Image Layers](https://img.shields.io/imagelayers/layers/osixia/keepalived/latest.svg)](https://imagelayers.io/?images=osixia/keepalived:latest)
 
 [hub]: https://hub.docker.com/r/osixia/keepalived/
 
-Latest release: 0.2.1 - Keepalived 1.2.19 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/keepalived/) 
+Latest release: 1.3.0 - Keepalived 1.3.0 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/keepalived/) 
 
-A docker image to run Keepalived.
+**A docker image to run Keepalived.**
 > [keepalived.org](http://keepalived.org/)
 
 - [Quick start](#quick-start)
@@ -23,7 +22,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.1 image](#extend-osixiakeepalived021-image)
+	- [Extend osixia/keepalived:1.3.0 image](#extend-osixiakeepalived130-image)
 	- [Make your own keepalived image](#make-your-own-keepalived-image)
 	- [Tests](#tests)
 	- [Under the hood: osixia/light-baseimage](#under-the-hood-osixialight-baseimage)
@@ -33,7 +32,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.1
+    docker run --cap-add=NET_ADMIN --net=host -d osixia/keepalived:1.3.0
 
 ## Beginner Guide
 
@@ -43,7 +42,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.1
+      docker run --volume /data/my-keepalived.conf:/container/service/keepalived/assets/keepalived.conf --detach osixia/keepalived:1.3.0
 
 - Add your config file by extending or cloning this image, please refer to the [Advanced User Guide](#advanced-user-guide)
 
@@ -53,7 +52,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.1 --copy-service
+		docker run [your options] osixia/keepalived:1.3.0 --copy-service
 
 ### Debug
 
@@ -62,11 +61,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.1 --loglevel debug
+	docker run --detach osixia/keepalived:1.3.0 --loglevel debug
 
 See all command line options:
 
-	docker run osixia/keepalived:0.2.1 --help
+	docker run osixia/keepalived:1.3.0 --help
 
 
 ## Environment Variables
@@ -86,7 +85,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.1
+      docker run --env KEEPALIVED_UNICAST_PEERS="#PYTHON2BASH:['192.168.1.10', '192.168.1.11']" --detach osixia/keepalived:1.3.0
 
   To convert yaml to python online : http://yaml-online-parser.appspot.com/
 
@@ -102,25 +101,13 @@ 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`
 
-### Set environment variables at run time :
-
-Environment variable can be set directly by adding the -e argument in the command line, for example :
-
-	docker run --env KEEPALIVED_INTERFACE="eno1" --env KEEPALIVED_PASSWORD="password!" \
-	--env KEEPALIVED_PRIORITY="100" --detach osixia/keepalived
-
-Or by setting your own `env.yaml` file as a docker volume to `/container/environment/env.yaml`
-
-	docker run --volume /data/my-env.yaml:/container/environment/env.yaml \
-	--detach osixia/keepalived
-
 ### 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:0.2.1
+    --env KEEPALIVED_PRIORITY="100" --detach osixia/keepalived:1.3.0
 
 
 #### Link environment file
@@ -128,7 +115,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.1
+	--detach osixia/keepalived:1.3.0
 
 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).
 
@@ -138,13 +125,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.1 image
+### Extend osixia/keepalived:1.3.0 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.1
+    FROM osixia/osixia/keepalived:1.3.0
     MAINTAINER Your Name <your@name.com>
 
     ADD keepalived.conf /container/service/keepalived/assets/keepalived.conf
@@ -163,7 +150,7 @@ Clone this project :
 Adapt Makefile, set your image NAME and VERSION, for example :
 
 	NAME = osixia/keepalived
-	VERSION = 0.2.1
+	VERSION = 1.3.0
 
 	becomes :
 	NAME = billy-the-king/keepalived

image/Dockerfile

@@ -1,10 +1,10 @@
 # Use osixia/light-baseimage
 # sources: https://github.com/osixia/docker-light-baseimage
-FROM osixia/light-baseimage:0.2.2
+FROM osixia/light-baseimage:0.2.6
 MAINTAINER Bertrand Gouny <bertrand.gouny@osixia.net>
 
 # Keepalived version
-ENV KEEPALIVED_VERSION 1.2.19
+ENV KEEPALIVED_VERSION 1.3.0
 
 # Download, build and install Keepalived
 RUN apt-get -y update \
@@ -13,6 +13,8 @@ RUN apt-get -y update \
        gcc \
        libnl-3-dev \
        libnl-genl-3-dev \
+       libnl-route-3-dev \
+       libnfnetlink-dev \
        libssl-dev \
        make \
        pkg-config \
@@ -23,7 +25,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 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 \

image/environment/default.startup.yaml

@@ -0,0 +1,16 @@
+KEEPALIVED_INTERFACE: eth0
+KEEPALIVED_PASSWORD: d0cker
+
+# For electing MASTER, highest priority wins.
+# to be MASTER, make 50 more than other machines
+KEEPALIVED_PRIORITY: 150
+
+KEEPALIVED_UNICAST_PEERS:
+  - 192.168.1.10
+  - 192.168.1.11
+
+KEEPALIVED_VIRTUAL_IPS:
+  - 192.168.1.231
+  - 192.168.1.232
+
+KEEPALIVED_NOTIFY: /container/service/keepalived/assets/notify.sh

image/environment/default.yaml

@@ -1,18 +1 @@
-KEEPALIVED_INTERFACE: eth0
-KEEPALIVED_PASSWORD: d0cker
-
-# For electing MASTER, highest priority wins.
-# to be MASTER, make 50 more than other machines
-KEEPALIVED_PRIORITY: 150
-
-KEEPALIVED_UNICAST_PEERS:
-  - 192.168.1.10
-  - 192.168.1.11
-
-KEEPALIVED_VIRTUAL_IPS:
-  - 192.168.1.231
-  - 192.168.1.232
-
-KEEPALIVED_NOTIFY: /container/service/keepalived/assets/notify.sh
-
 KEEPALIVED_COMMAND_LINE_ARGUMENTS: --log-detail --dump-conf

image/service/keepalived/assets/keepalived.conf

@@ -1,11 +1,3 @@
-vrrp_sync_group VG_1 {
-  group {
-    VI_1
-  }
-
-  {{ keepalived_notify }}
-}
-
 vrrp_instance VI_1 {
   interface {{ keepalived_interface }}
 
@@ -30,4 +22,6 @@ vrrp_instance VI_1 {
     auth_type PASS
     auth_pass {{ keepalived_password }}
   }
+
+  {{ keepalived_notify }}
 }

image/service/keepalived/finish.sh

@@ -0,0 +1,13 @@
+#!/bin/bash -e
+
+# set -x (bash debug) if log level is trace
+# https://github.com/osixia/docker-light-baseimage/blob/stable/image/tool/log-helper
+log-helper level eq trace && set -x
+
+# try to delete virtual ips from interface
+for vip in $(complex-bash-env iterate KEEPALIVED_VIRTUAL_IPS)
+do
+  ip addr del ${vip}/32 dev ${KEEPALIVED_INTERFACE} || true
+done
+
+exit 0

image/service/keepalived/startup.sh

@@ -39,6 +39,12 @@ if [ ! -e "$FIRST_START_DONE" ]; then
   touch $FIRST_START_DONE
 fi
 
+# try to delete virtual ips from interface
+for vip in $(complex-bash-env iterate KEEPALIVED_VIRTUAL_IPS)
+do
+  ip addr del ${vip}/32 dev ${KEEPALIVED_INTERFACE} || true
+done
+
 if [ ! -e "/etc/backup-manager.conf" ]; then
   ln -sf ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf /etc/keepalived/keepalived.conf
 fi

test/test_helper.bash

@@ -30,19 +30,10 @@ clear_container() {
   remove_containers_by_cid $CONTAINER_ID
 }
 
-is_service_running() {
+wait_process() {
-  is_service_running_by_cid $CONTAINER_ID $1
+  wait_process_by_cid $CONTAINER_ID $@
 }
 
-is_file_exists() {
-  is_file_exists_by_cid $CONTAINER_ID $1
-}
-
-wait_service() {
-  wait_service_by_cid $CONTAINER_ID $@
-}
-
-
 # generic functions
 get_container_ip_by_cid() {
   local IP=$(docker inspect -f "{{ .NetworkSettings.IPAddress }}" $1)
@@ -78,30 +69,7 @@ clear_containers_by_cid() {
   remove_containers_by_cid $@
 }
 
-is_service_running_by_cid() {
+wait_process_by_cid() {
-  docker exec $1 ps cax | grep $2  > /dev/null
-}
-
-is_file_exists_by_cid() {
-  docker exec $1 cat $2 > /dev/null 2>&1
-}
-
-wait_service_by_cid() {
-
   cid=$1
-
+  docker exec $cid /container/tool/wait-process ${@:2}
-  # first wait image init end
-  while ! is_file_exists_by_cid $cid /container/run/state/startup-done
-  do
-    sleep 0.5
-  done
-
-  for service in "${@:2}"
-  do
-    # wait service
-    while ! is_service_running_by_cid $cid $service
-    do
-      sleep 0.5
-    done
-  done
 }