From befaefc9e4c3627c5c98ec2ad2e3ba71c23db63e Mon Sep 17 00:00:00 2001
From: Bertrand Gouny <bgouny@hi-media.com>
Date: Thu, 23 Jul 2015 12:11:36 +0200
Subject: [PATCH] new baseimage

---
 image/Dockerfile                            | 33 +++++++++++++--------
 image/env.yaml                              |  2 +-
 image/service/keepalived/container-start.sh |  6 ++--
 3 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/image/Dockerfile b/image/Dockerfile
index 032710f..f1173a7 100644
--- a/image/Dockerfile
+++ b/image/Dockerfile
@@ -4,30 +4,39 @@ MAINTAINER Bertrand Gouny <bertrand.gouny@osixia.net>
 # Keepalived version
 ENV KEEPALIVED_VERSION 1.2.19
 
-# Use baseimage-docker's init system.
-CMD ["/osixia/tool/run"]
+# Use baseimage's init system.
+# 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 \
-    curl make gcc pkg-config libssl-dev libnl-3-dev libnl-genl-3-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 \
-    && tar -xzf keepalived.tar.gz --strip 1 -C /osixia/keepalived-sources \
-    && cd osixia/keepalived-sources \
+    && 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 \
     && make && make install \
     && cd - && mkdir -p /etc/keepalived \
     && apt-get remove -y --purge --auto-remove curl make gcc pkg-config libssl-dev
 
-# Add service directory to /osixia/service
-ADD service /osixia/service
+# Add service directory to /container/service
+ADD service /container/service
 
-# Clean all
 # Use baseimage install-service script and clean all
-RUN ./sbin/install-service \
-  && rm -f keepalived.tar.gz && rm -rf /osixia/keepalived-sources \
-  && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+# https://github.com/osixia/docker-light-baseimage/blob/stable/image/tool/install-service
+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.yaml /etc/env.yaml
diff --git a/image/env.yaml b/image/env.yaml
index eadb0cd..6fbd290 100644
--- a/image/env.yaml
+++ b/image/env.yaml
@@ -13,4 +13,4 @@ KEEPALIVED_VIRTUAL_IPS:
   - 192.168.1.231
   - 192.168.1.232
 
-KEEPALIVED_NOTIFY: /osixia/service/keepalived/assets/notify.sh
+KEEPALIVED_NOTIFY: /container/service/keepalived/assets/notify.sh
diff --git a/image/service/keepalived/container-start.sh b/image/service/keepalived/container-start.sh
index 49b3170..c843cc9 100755
--- a/image/service/keepalived/container-start.sh
+++ b/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/service/keepalived/assets/keepalived.conf ]; then
-      echo "Error: No default keepalived.conf found in /osixia/service/keepalived/assets/keepalived.conf"
+    if [ ! -e /container/service/keepalived/assets/keepalived.conf ]; then
+      echo "Error: No default keepalived.conf found in /container/service/keepalived/assets/keepalived.conf"
       exit 1
     else
 
-      ln -s /osixia/service/keepalived/assets/keepalived.conf /etc/keepalived/keepalived.conf
+      ln -s /container/service/keepalived/assets/keepalived.conf /etc/keepalived/keepalived.conf
 
       #
       # bootstrap config