From 6b09984838c7d4b13ac1d5e8d1dffb1473f12eee Mon Sep 17 00:00:00 2001 From: Bertrand Gouny Date: Wed, 29 Jul 2015 10:45:41 +0200 Subject: [PATCH 2/4] upgrade to light-baseimage:0.1.1 --- CHANGELOG.md | 3 +++ Makefile | 2 +- image/Dockerfile | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6915954..3f21916 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog +## 0.1.4 + - Upgrade baseimage: osixia/light-baseimage:0.1.1 + ## 0.1.4 - Use light-baseimage diff --git a/Makefile b/Makefile index cd0a72c..2b83fc9 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ NAME = osixia/keepalived -VERSION = 0.1.4 +VERSION = 0.1.5 .PHONY: all build test tag_latest release diff --git a/image/Dockerfile b/image/Dockerfile index f1173a7..d155f9b 100644 --- a/image/Dockerfile +++ b/image/Dockerfile @@ -1,4 +1,4 @@ -FROM osixia/light-baseimage:0.1.0 +FROM osixia/light-baseimage:0.1.1 MAINTAINER Bertrand Gouny # Keepalived version From 39da36944c37d63b2b361f72d3eaedbdc5ca7bbf Mon Sep 17 00:00:00 2001 From: ofreax Date: Mon, 3 Aug 2015 19:54:27 +0200 Subject: [PATCH 3/4] - --- image/env.yaml | 2 +- image/service/keepalived/assets/notify.sh | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/image/env.yaml b/image/env.yaml index 6fbd290..b3017d3 100644 --- a/image/env.yaml +++ b/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 diff --git a/image/service/keepalived/assets/notify.sh b/image/service/keepalived/assets/notify.sh index 348de0f..9411e90 100755 --- a/image/service/keepalived/assets/notify.sh +++ b/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 From d67d8be580076a91738e1dd612b25bb1213790ab Mon Sep 17 00:00:00 2001 From: ofreax Date: Wed, 19 Aug 2015 19:18:23 +0200 Subject: [PATCH 4/4] version --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f21916..633a7ea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## 0.1.4 +## 0.1.5 - Upgrade baseimage: osixia/light-baseimage:0.1.1 ## 0.1.4