coryHawkvelt
/
docker-keepalived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'hotfix-0.1.7' into stable

This commit is contained in:
Bertrand Gouny 2015-10-26 15:21:44 +01:00
parent c199795650 8184cf1a10
commit de03d7af70
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -1,5 +1,8 @@
# Changelog # Changelog
## 0.1.7
- Upgrade baseimage: osixia/light-baseimage:0.1.2
## 0.1.6 ## 0.1.6
- Better way to add custom config - Better way to add custom config
- Improve documentation - Improve documentation

2
Makefile
View File

@ -1,5 +1,5 @@
NAME = osixia/keepalived NAME = osixia/keepalived
VERSION = 0.1.6 VERSION = 0.1.7
.PHONY: all build test tag_latest release .PHONY: all build test tag_latest release

6
README.md
View File

@ -13,7 +13,7 @@ This image require the kernel module ip_vs loaded on the host (`modprobe ip_vs`)
## Environment Variables ## Environment Variables
Environement variables defaults are set in **image/env.yaml**. You can modify environment variable values directly in this file and rebuild the image ([see manual build](#manual-build)). You can also override those values at run time with -e argument or by setting your own env.yaml file as a docker volume to `/etc/env.yaml`. See examples below. Environement variables defaults are set in **image/env.yaml**. You can modify environment variable values directly in this file and rebuild the image ([see manual build](#manual-build)). You can also override those values at run time with -e argument or by setting your own env.yaml file as a docker volume to `/container/environment/env.yaml`. See examples below.
- **KEEPALIVED_INTERFACE**: Keepalived network interface. Defaults to `eth0` - **KEEPALIVED_INTERFACE**: Keepalived network interface. Defaults to `eth0`
- **KEEPALIVED_PASSWORD**: Keepalived password. Defaults to `d0cker` - **KEEPALIVED_PASSWORD**: Keepalived password. Defaults to `d0cker`
@ -46,9 +46,9 @@ Environment variable can be set directly by adding the -e argument in the comman
docker run -e KEEPALIVED_INTERFACE="eno1" -e KEEPALIVED_PASSWORD="password!" \ docker run -e KEEPALIVED_INTERFACE="eno1" -e KEEPALIVED_PASSWORD="password!" \
-e KEEPALIVED_PRIORITY="100" -d osixia/keepalived -e KEEPALIVED_PRIORITY="100" -d osixia/keepalived
Or by setting your own `env.yaml` file as a docker volume to `/etc/env.yaml` Or by setting your own `env.yaml` file as a docker volume to `/container/environment/env.yaml`
docker run -v /data/my-env.yaml:/etc/env.yaml \ docker run -v /data/my-env.yaml:/container/environment/env.yaml \
-d osixia/keepalived -d osixia/keepalived
## Manual build ## Manual build

4
image/Dockerfile
View File

@ -1,4 +1,4 @@
FROM osixia/light-baseimage:0.1.1 FROM osixia/light-baseimage:0.1.2
MAINTAINER Bertrand Gouny <bertrand.gouny@osixia.net> MAINTAINER Bertrand Gouny <bertrand.gouny@osixia.net>
# Keepalived version # Keepalived version
@ -39,4 +39,4 @@ RUN /container/tool/install-service \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
# Add default env variables # Add default env variables
ADD env.yaml /etc/env.yaml ADD env.yaml /container/environment/env.yaml