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

Merge branch 'release-1.4.1' into stable

This commit is contained in:
Bertrand Gouny 2018-01-29 15:43:58 +01:00
parent 0bd1278f7e e237c87e4b
commit 10631a780c
4 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -5,6 +5,10 @@ Please refer to the upstream [keepalived changelog](https://github.com/acassen/k
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project follows keepalived versioning.
## [1.4.1] - 2018-01-29
### Changed
- Upgrade keepalived version to 1.4.1
## [1.4.0] - 2018-01-11
### Changed
- Upgrade keepalived version to 1.4.0

2
Makefile
View File

@ -1,5 +1,5 @@
NAME = osixia/keepalived
VERSION = 1.4.0
VERSION = 1.4.1
.PHONY: build build-nocache test tag-latest push push-latest release git-tag-version

24
README.md
View File

@ -6,7 +6,7 @@
[hub]: https://hub.docker.com/r/osixia/keepalived/
Latest release: 1.4.0 - Keepalived 1.4.0 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/keepalived/) 
Latest release: 1.4.1 - Keepalived 1.4.1 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/keepalived/) 
**A docker image to run Keepalived.**
> [keepalived.org](http://keepalived.org/)
@ -22,7 +22,7 @@ Latest release: 1.4.0 - Keepalived 1.4.0 - [Changelog](CHANGELOG.md) | [Docker H
- [Link environment file](#link-environment-file)
- [Make your own image or extend this image](#make-your-own-image-or-extend-this-image)
- [Advanced User Guide](#advanced-user-guide)
- [Extend osixia/keepalived:1.4.0 image](#extend-osixiakeepalived140-image)
- [Extend osixia/keepalived:1.4.1 image](#extend-osixiakeepalived141-image)
- [Make your own keepalived image](#make-your-own-keepalived-image)
- [Tests](#tests)
- [Under the hood: osixia/light-baseimage](#under-the-hood-osixialight-baseimage)
@ -33,7 +33,7 @@ Latest release: 1.4.0 - Keepalived 1.4.0 - [Changelog](CHANGELOG.md) | [Docker H
This image require the kernel module ip_vs loaded on the host (`modprobe ip_vs`) and need to be run with : --cap-add=NET_ADMIN --net=host
docker run --cap-add=NET_ADMIN --net=host -d osixia/keepalived:1.4.0
docker run --cap-add=NET_ADMIN --net=host -d osixia/keepalived:1.4.1
## Beginner Guide
@ -43,7 +43,7 @@ but setting your own keepalived.conf is possible. 2 options:
- Link your config file at run time to `/container/service/keepalived/assets/keepalived.conf` :
docker run --volume /data/my-keepalived.conf:/container/service/keepalived/assets/keepalived.conf --detach osixia/keepalived:1.4.0
docker run --volume /data/my-keepalived.conf:/container/service/keepalived/assets/keepalived.conf --detach osixia/keepalived:1.4.1
- Add your config file by extending or cloning this image, please refer to the [Advanced User Guide](#advanced-user-guide)
@ -53,7 +53,7 @@ You may have some problems with mounted files on some systems. The startup scrip
To fix that run the container with `--copy-service` argument :
docker run [your options] osixia/keepalived:1.4.0 --copy-service
docker run [your options] osixia/keepalived:1.4.1 --copy-service
### Debug
@ -62,11 +62,11 @@ Available levels are: `none`, `error`, `warning`, `info`, `debug` and `trace`.
Example command to run the container in `debug` mode:
docker run --detach osixia/keepalived:1.4.0 --loglevel debug
docker run --detach osixia/keepalived:1.4.1 --loglevel debug
See all command line options:
docker run osixia/keepalived:1.4.0 --help
docker run osixia/keepalived:1.4.1 --help
## Environment Variables
@ -86,7 +86,7 @@ See how to [set your own environment variables](#set-your-own-environment-variab
If you want to set this variable at docker run command add the tag `#PYTHON2BASH:` and convert the yaml in python:
docker run --env KEEPALIVED_UNICAST_PEERS="#PYTHON2BASH:['192.168.1.10', '192.168.1.11']" --detach osixia/keepalived:1.4.0
docker run --env KEEPALIVED_UNICAST_PEERS="#PYTHON2BASH:['192.168.1.10', '192.168.1.11']" --detach osixia/keepalived:1.4.1
To convert yaml to python online : http://yaml-online-parser.appspot.com/
@ -108,7 +108,7 @@ See how to [set your own environment variables](#set-your-own-environment-variab
Environment variables can be set by adding the --env argument in the command line, for example:
docker run --env KEEPALIVED_INTERFACE="eno1" --env KEEPALIVED_PASSWORD="password!" \
--env KEEPALIVED_PRIORITY="100" --detach osixia/keepalived:1.4.0
--env KEEPALIVED_PRIORITY="100" --detach osixia/keepalived:1.4.1
#### Link environment file
@ -116,7 +116,7 @@ Environment variables can be set by adding the --env argument in the command lin
For example if your environment file is in : /data/environment/my-env.yaml
docker run --volume /data/environment/my-env.yaml:/container/environment/01-custom/env.yaml \
--detach osixia/keepalived:1.4.0
--detach osixia/keepalived:1.4.1
Take care to link your environment file to `/container/environment/XX-somedir` (with XX < 99 so they will be processed before default environment files) and not directly to `/container/environment` because this directory contains predefined baseimage environment files to fix container environment (INITRD, LANG, LANGUAGE and LC_CTYPE).
@ -126,13 +126,13 @@ This is the best solution if you have a private registry. Please refer to the [A
## Advanced User Guide
### Extend osixia/keepalived:1.4.0 image
### Extend osixia/keepalived:1.4.1 image
If you need to add your custom TLS certificate, bootstrap config or environment files the easiest way is to extends this image.
Dockerfile example:
FROM osixia/keepalived:1.4.0
FROM osixia/keepalived:1.4.1
MAINTAINER Your Name <your@name.com>
ADD keepalived.conf /container/service/keepalived/assets/keepalived.conf

2
image/Dockerfile
View File

@ -4,7 +4,7 @@ FROM osixia/alpine-light-baseimage:0.1.5
MAINTAINER Bertrand Gouny <bertrand.gouny@osixia.net>
# Keepalived version
ARG KEEPALIVED_VERSION=1.4.0
ARG KEEPALIVED_VERSION=1.4.1
# Download, build and install Keepalived
RUN apk --no-cache add \