Merge branch 'hotfix-0.1.4' into stable
This commit is contained in:
commit
4cbbbc1778
|
@ -1,5 +1,8 @@
|
||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## 0.1.4
|
||||||
|
- Use light-baseimage
|
||||||
|
|
||||||
## 0.1.3
|
## 0.1.3
|
||||||
- Fix libnl dependency
|
- Fix libnl dependency
|
||||||
|
|
||||||
|
|
2
Makefile
2
Makefile
|
@ -1,5 +1,5 @@
|
||||||
NAME = osixia/keepalived
|
NAME = osixia/keepalived
|
||||||
VERSION = 0.1.3
|
VERSION = 0.1.4
|
||||||
|
|
||||||
.PHONY: all build test tag_latest release
|
.PHONY: all build test tag_latest release
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
# osixia/keepalived
|
# osixia/keepalived
|
||||||
|
|
||||||
|
[](https://imagelayers.io/?images=osixia/keepalived:latest 'Get your own badge on imagelayers.io')
|
||||||
|
|
||||||
A docker image to run Keepalived.
|
A docker image to run Keepalived.
|
||||||
> [keepalived.org](http://keepalived.org/)
|
> [keepalived.org](http://keepalived.org/)
|
||||||
|
|
||||||
|
|
|
@ -1,35 +1,42 @@
|
||||||
FROM osixia/baseimage:0.10.4
|
FROM osixia/light-baseimage:0.1.0
|
||||||
MAINTAINER Bertrand Gouny <bertrand.gouny@osixia.net>
|
MAINTAINER Bertrand Gouny <bertrand.gouny@osixia.net>
|
||||||
|
|
||||||
# Keepalived version
|
# Keepalived version
|
||||||
ENV KEEPALIVED_VERSION 1.2.19
|
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
|
# Install Keepalived
|
||||||
RUN apt-get -y update \
|
RUN apt-get -y update \
|
||||||
&& LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get install -y \
|
&& 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 \
|
&& 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 \
|
&& ./configure --with-kernel-dir=/lib/modules/$(uname -r)/build \
|
||||||
&& make && make install \
|
&& make && make install \
|
||||||
&& cd - && mkdir -p /etc/keepalived \
|
&& 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 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 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
|
|
||||||
|
|
|
@ -13,4 +13,4 @@ KEEPALIVED_VIRTUAL_IPS:
|
||||||
- 192.168.1.231
|
- 192.168.1.231
|
||||||
- 192.168.1.232
|
- 192.168.1.232
|
||||||
|
|
||||||
KEEPALIVED_NOTIFY: /osixia/keepalived/notify.sh
|
KEEPALIVED_NOTIFY: /container/service/keepalived/assets/notify.sh
|
|
@ -8,12 +8,12 @@ if [ ! -e "$FIRST_START_DONE" ]; then
|
||||||
# config folder is empty use bootstrap config if available
|
# config folder is empty use bootstrap config if available
|
||||||
if [ ! -e /etc/keepalived/keepalived.conf ]; then
|
if [ ! -e /etc/keepalived/keepalived.conf ]; then
|
||||||
echo "No keepalived.conf provided using image default one"
|
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
|
exit 1
|
||||||
else
|
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
|
# bootstrap config
|
||||||
|
|
|
@ -34,6 +34,10 @@ is_service_running() {
|
||||||
is_service_running_by_cid $CONTAINER_ID $1
|
is_service_running_by_cid $CONTAINER_ID $1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
is_file_exists() {
|
||||||
|
is_file_exists_by_cid $CONTAINER_ID $1
|
||||||
|
}
|
||||||
|
|
||||||
wait_service() {
|
wait_service() {
|
||||||
wait_service_by_cid $CONTAINER_ID $@
|
wait_service_by_cid $CONTAINER_ID $@
|
||||||
}
|
}
|
||||||
|
@ -78,12 +82,18 @@ is_service_running_by_cid() {
|
||||||
docker exec $1 ps cax | grep $2 > /dev/null
|
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() {
|
wait_service_by_cid() {
|
||||||
|
|
||||||
cid=$1
|
cid=$1
|
||||||
|
|
||||||
|
sleep 1
|
||||||
|
|
||||||
# first wait image init end
|
# 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
|
do
|
||||||
sleep 1
|
sleep 1
|
||||||
done
|
done
|
||||||
|
|
Loading…
Reference in New Issue