From 345188086e8ffd9833edae17b7f1bb3854404c76 Mon Sep 17 00:00:00 2001 From: ofreax Date: Thu, 16 Jul 2015 21:43:36 +0200 Subject: [PATCH 2/6] new baseimage --- CHANGELOG.md | 3 +++ Makefile | 2 +- image/Dockerfile | 20 +++++++++----------- image/env.yml | 2 +- image/service/keepalived/container-start.sh | 6 +++--- 5 files changed, 17 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b3b897..6915954 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog +## 0.1.4 + - Use light-baseimage + ## 0.1.3 - Fix libnl dependency diff --git a/Makefile b/Makefile index 2c7109c..cd0a72c 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ NAME = osixia/keepalived -VERSION = 0.1.3 +VERSION = 0.1.4 .PHONY: all build test tag_latest release diff --git a/image/Dockerfile b/image/Dockerfile index 5c0aec5..e7c5253 100644 --- a/image/Dockerfile +++ b/image/Dockerfile @@ -1,16 +1,16 @@ -FROM osixia/baseimage:0.10.4 +FROM osixia/light-baseimage:0.1.0 MAINTAINER Bertrand Gouny # Keepalived version ENV KEEPALIVED_VERSION 1.2.19 # Use baseimage-docker's init system. -CMD ["/sbin/my_init"] +CMD ["/osixia/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 \ && tar -xzf keepalived.tar.gz --strip 1 -C /osixia/keepalived-sources \ @@ -18,18 +18,16 @@ 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 pkg-config libssl-dev + && apt-get remove -y --purge --auto-remove curl make gcc pkg-config libssl-dev -# Add Keepalived assets -ADD service/keepalived/assets /osixia/keepalived +# Add service directory to /osixia/service +ADD service /osixia/service # Clean all -RUN rm keepalived.tar.gz \ +# 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/* # Add default env variables ADD env.yml /etc/env.yml - -# 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 diff --git a/image/env.yml b/image/env.yml index ac615c3..eadb0cd 100644 --- a/image/env.yml +++ b/image/env.yml @@ -13,4 +13,4 @@ KEEPALIVED_VIRTUAL_IPS: - 192.168.1.231 - 192.168.1.232 -KEEPALIVED_NOTIFY: /osixia/keepalived/notify.sh +KEEPALIVED_NOTIFY: /osixia/service/keepalived/assets/notify.sh diff --git a/image/service/keepalived/container-start.sh b/image/service/keepalived/container-start.sh index e84d7de..49b3170 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/keepalived/keepalived.conf ]; then - echo "Error: No default keepalived.conf found in /osixia/keepalived/keepalived.conf" + if [ ! -e /osixia/service/keepalived/assets/keepalived.conf ]; then + echo "Error: No default keepalived.conf found in /osixia/service/keepalived/assets/keepalived.conf" exit 1 else - ln -s /osixia/keepalived/keepalived.conf /etc/keepalived/keepalived.conf + ln -s /osixia/service/keepalived/assets/keepalived.conf /etc/keepalived/keepalived.conf # # bootstrap config From 5084fe225676a1148e7d22cc6ae8778f03cf7e10 Mon Sep 17 00:00:00 2001 From: ofreax Date: Fri, 17 Jul 2015 09:23:24 +0200 Subject: [PATCH 3/6] new test helper --- test/test_helper.bash | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/test/test_helper.bash b/test/test_helper.bash index 31bdd43..21217c5 100644 --- a/test/test_helper.bash +++ b/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 -} \ No newline at end of file +} From e107ae776fed72159542dc62817773b13c01bba0 Mon Sep 17 00:00:00 2001 From: ofreax Date: Fri, 17 Jul 2015 11:46:49 +0200 Subject: [PATCH 4/6] yml -> yaml --- image/Dockerfile | 2 +- image/{env.yml => env.yaml} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename image/{env.yml => env.yaml} (100%) diff --git a/image/Dockerfile b/image/Dockerfile index e7c5253..032710f 100644 --- a/image/Dockerfile +++ b/image/Dockerfile @@ -30,4 +30,4 @@ RUN ./sbin/install-service \ && 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 diff --git a/image/env.yml b/image/env.yaml similarity index 100% rename from image/env.yml rename to image/env.yaml From befaefc9e4c3627c5c98ec2ad2e3ba71c23db63e Mon Sep 17 00:00:00 2001 From: Bertrand Gouny Date: Thu, 23 Jul 2015 12:11:36 +0200 Subject: [PATCH 5/6] 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 # 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 From 689f1e5c81069fb395912125ddb472317fa80fc2 Mon Sep 17 00:00:00 2001 From: Bertrand Gouny Date: Thu, 23 Jul 2015 14:39:49 +0200 Subject: [PATCH 6/6] imagelayers.io --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 11b8cfe..0c64573 100644 --- a/README.md +++ b/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/)