Merge branch 'release-1.4.4' into stable
This commit is contained in:
Bertrand Gouny
commit
376498f610
|
|
@ -5,6 +5,13 @@ 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.4] - 2018-05-14
|
||||
### Added
|
||||
- Router ID with environment KEEPALIVED_ROUTER_ID #16
|
||||
|
||||
### Changed
|
||||
- Upgrade keepalived version to 1.4.4
|
||||
|
||||
## [1.4.2] - 2018-03-03
|
||||
### Changed
|
||||
- Upgrade keepalived version to 1.4.2
|
||||
|
|
@ -141,6 +148,7 @@ and this project follows keepalived versioning.
|
|||
## 0.1.0 - 2015-06-16
|
||||
Initial release
|
||||
|
||||
[1.4.4]: https://github.com/osixia/docker-keepalived/compare/v1.4.2...v1.4.4
|
||||
[1.4.2]: https://github.com/osixia/docker-keepalived/compare/v1.4.1...v1.4.2
|
||||
[1.4.1]: https://github.com/osixia/docker-keepalived/compare/v1.4.0...v1.4.1
|
||||
[1.4.0]: https://github.com/osixia/docker-keepalived/compare/v1.3.9...v1.4.0
|
||||
|
|
|
|||
2
Makefile
2
Makefile
|
|
@ -1,5 +1,5 @@
|
|||
NAME = osixia/keepalived
|
||||
VERSION = 1.4.2
|
||||
VERSION = 1.4.4
|
||||
|
||||
.PHONY: build build-nocache test tag-latest push push-latest release git-tag-version
|
||||
|
||||
|
|
|
|||
25
README.md
25
README.md
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
[hub]: https://hub.docker.com/r/osixia/keepalived/
|
||||
|
||||
Latest release: 1.4.2 - Keepalived 1.4.2 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/keepalived/)
|
||||
Latest release: 1.4.4 - Keepalived 1.4.4 - [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.2 - Keepalived 1.4.2 - [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.2 image](#extend-osixiakeepalived142-image)
|
||||
- [Extend osixia/keepalived:1.4.4 image](#extend-osixiakeepalived144-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.2 - Keepalived 1.4.2 - [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.2
|
||||
docker run --cap-add=NET_ADMIN --net=host -d osixia/keepalived:1.4.4
|
||||
|
||||
## 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.2
|
||||
docker run --volume /data/my-keepalived.conf:/container/service/keepalived/assets/keepalived.conf --detach osixia/keepalived:1.4.4
|
||||
|
||||
- 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.2 --copy-service
|
||||
docker run [your options] osixia/keepalived:1.4.4 --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.2 --loglevel debug
|
||||
docker run --detach osixia/keepalived:1.4.4 --loglevel debug
|
||||
|
||||
See all command line options:
|
||||
|
||||
docker run osixia/keepalived:1.4.2 --help
|
||||
docker run osixia/keepalived:1.4.4 --help
|
||||
|
||||
|
||||
## Environment Variables
|
||||
|
|
@ -79,6 +79,7 @@ See how to [set your own environment variables](#set-your-own-environment-variab
|
|||
- **KEEPALIVED_INTERFACE**: Keepalived network interface. Defaults to `eth0`
|
||||
- **KEEPALIVED_PASSWORD**: Keepalived password. Defaults to `d0cker`
|
||||
- **KEEPALIVED_PRIORITY** Keepalived node priority. Defaults to `150`
|
||||
- **KEEPALIVED_ROUTER_ID** Keepalived virtual router ID. Defaults to `51`
|
||||
|
||||
- **KEEPALIVED_UNICAST_PEERS** Keepalived unicast peers. Defaults to :
|
||||
- 192.168.1.10
|
||||
|
|
@ -86,7 +87,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.2
|
||||
docker run --env KEEPALIVED_UNICAST_PEERS="#PYTHON2BASH:['192.168.1.10', '192.168.1.11']" --detach osixia/keepalived:1.4.4
|
||||
|
||||
To convert yaml to python online : http://yaml-online-parser.appspot.com/
|
||||
|
||||
|
|
@ -108,7 +109,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.2
|
||||
--env KEEPALIVED_PRIORITY="100" --detach osixia/keepalived:1.4.4
|
||||
|
||||
|
||||
#### Link environment file
|
||||
|
|
@ -116,7 +117,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.2
|
||||
--detach osixia/keepalived:1.4.4
|
||||
|
||||
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 +127,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.2 image
|
||||
### Extend osixia/keepalived:1.4.4 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.2
|
||||
FROM osixia/keepalived:1.4.4
|
||||
MAINTAINER Your Name <your@name.com>
|
||||
|
||||
ADD keepalived.conf /container/service/keepalived/assets/keepalived.conf
|
||||
|
|
|
|||
|
|
@ -4,10 +4,11 @@ FROM osixia/alpine-light-baseimage:0.1.5
|
|||
MAINTAINER Bertrand Gouny <bertrand.gouny@osixia.net>
|
||||
|
||||
# Keepalived version
|
||||
ARG KEEPALIVED_VERSION=1.4.2
|
||||
ARG KEEPALIVED_VERSION=1.4.4
|
||||
|
||||
# Download, build and install Keepalived
|
||||
RUN apk --no-cache add \
|
||||
autoconf \
|
||||
curl \
|
||||
gcc \
|
||||
ipset \
|
||||
|
|
@ -32,6 +33,7 @@ RUN apk --no-cache add \
|
|||
&& rm -f keepalived.tar.gz \
|
||||
&& rm -rf /container/keepalived-sources \
|
||||
&& apk --no-cache del \
|
||||
autoconf \
|
||||
curl \
|
||||
gcc \
|
||||
ipset-dev \
|
||||
|
|
|
|||
|
|
@ -16,3 +16,5 @@ KEEPALIVED_VIRTUAL_IPS:
|
|||
- 192.168.1.232
|
||||
|
||||
KEEPALIVED_NOTIFY: /container/service/keepalived/assets/notify.sh
|
||||
|
||||
KEEPALIVED_ROUTER_ID: 51
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ vrrp_instance VI_1 {
|
|||
}
|
||||
|
||||
state BACKUP
|
||||
virtual_router_id 51
|
||||
virtual_router_id {{ KEEPALIVED_ROUTER_ID }}
|
||||
priority {{ KEEPALIVED_PRIORITY }}
|
||||
nopreempt
|
||||
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ if [ ! -e "$FIRST_START_DONE" ]; then
|
|||
#
|
||||
# bootstrap config
|
||||
#
|
||||
sed -i "s|{{ KEEPALIVED_ROUTER_ID }}|$KEEPALIVED_ROUTER_ID|g" ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf
|
||||
sed -i "s|{{ KEEPALIVED_INTERFACE }}|$KEEPALIVED_INTERFACE|g" ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf
|
||||
sed -i "s|{{ KEEPALIVED_PRIORITY }}|$KEEPALIVED_PRIORITY|g" ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf
|
||||
sed -i "s|{{ KEEPALIVED_PASSWORD }}|$KEEPALIVED_PASSWORD|g" ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf
|
||||
|
|
|
|||
Loading…
Reference in New Issue