Compare commits

..

5 Commits

Author SHA1 Message Date
Bertrand Gouny 9dd4ca425d Merge branch 'feature/update_keepalived_2_1_5' into develop 2020-11-19 18:31:40 +01:00
Bertrand Gouny 926d6daebf feat: update to keepalived 2.1.5 2020-11-19 18:31:15 +01:00
Bertrand Gouny 6ad7db66f9 Merge branch 'linkvt-upgrade-to-2.1.5' into feature/update_keepalived_2_1_5 2020-11-19 18:22:42 +01:00
Bertrand Gouny d365872fee feat: switch to gitflow 2020-11-19 18:19:43 +01:00
Vincent Link 7ed36d42ea Update keepalived to 2.1.5 2020-11-17 00:14:12 +01:00
3 changed files with 20 additions and 15 deletions

View File

@ -51,7 +51,7 @@ before_script:
- if [ -n "$TRAVIS_TAG" ]; then
VERSION=$(echo "${TRAVIS_TAG}" | sed -e 's/\(.*\)[-v]\(.*\)/\1\2/g');
fi
- if [ "${TRAVIS_BRANCH}" == 'stable' ]; then
- if [ "${TRAVIS_BRANCH}" == 'master' ]; then
VERSION="stable";
fi
@ -88,7 +88,7 @@ jobs:
docker manifest annotate ${NAME}:${VERSION} ${NAME}:${VERSION}-arm64v8 --os linux --arch arm64 --variant v8;
# The latest tag is coming from the stable branch of the repo
- if [ "${TRAVIS_BRANCH}" == 'stable' ]; then
- if [ "${TRAVIS_BRANCH}" == 'master' ]; then
docker manifest create ${NAME}:latest ${NAME}:${VERSION}-amd64 ${NAME}:${VERSION}-arm32v7 ${NAME}:${VERSION}-arm64v8;
docker manifest annotate ${NAME}:latest ${NAME}:${VERSION}-amd64 --os linux --arch amd64;
docker manifest annotate ${NAME}:latest ${NAME}:${VERSION}-arm32v7 --os linux --arch arm --variant v7;
@ -96,6 +96,6 @@ jobs:
fi
- docker manifest push ${NAME}:${VERSION};
if [ "${TRAVIS_BRANCH}" == 'stable' ]; then
if [ "${TRAVIS_BRANCH}" == 'master' ]; then
docker manifest push ${NAME}:latest;
fi

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.
## [2.1.5] - 2020-11-19
### Changed
- Upgrade keepalived version to 2.1.5. Thanks to @linkvt.
## [2.0.20] - 2020-02-07
### Changed
- Upgrade keepalived version to 2.0.20
@ -208,6 +212,7 @@ and this project follows keepalived versioning.
## 0.1.0 - 2015-06-16
Initial release
[2.1.5]: https://github.com/osixia/docker-keepalived/compare/v2.0.20...v2.1.5
[2.0.20]: https://github.com/osixia/docker-keepalived/compare/v2.0.19...v2.0.20
[2.0.19]: https://github.com/osixia/docker-keepalived/compare/v2.0.17...v2.0.19
[2.0.17]: https://github.com/osixia/docker-keepalived/compare/v2.0.16...v2.0.17

View File

@ -6,7 +6,7 @@
[hub]: https://hub.docker.com/r/osixia/keepalived/
Latest release: 2.0.20 - Keepalived 2.0.20 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/keepalived/) 
Latest release: 2.1.5 - Keepalived 2.0.20 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/keepalived/) 
**A docker image to run Keepalived.**
> [keepalived.org](http://keepalived.org/)
@ -23,7 +23,7 @@ Latest release: 2.0.20 - Keepalived 2.0.20 - [Changelog](CHANGELOG.md) | [Docker
- [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:2.0.20 image](#extend-osixiakeepalived2020-image)
- [Extend osixia/keepalived:2.1.5 image](#extend-osixiakeepalived215-image)
- [Make your own keepalived image](#make-your-own-keepalived-image)
- [Tests](#tests)
- [Under the hood: osixia/light-baseimage](#under-the-hood-osixialight-baseimage)
@ -34,7 +34,7 @@ Latest release: 2.0.20 - Keepalived 2.0.20 - [Changelog](CHANGELOG.md) | [Docker
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 --cap-add=NET_BROADCAST --cap-add=NET_RAW --net=host -d osixia/keepalived:2.0.20
docker run --cap-add=NET_ADMIN --cap-add=NET_BROADCAST --cap-add=NET_RAW --net=host -d osixia/keepalived:2.1.5
## Beginner Guide
@ -44,7 +44,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:2.0.20
docker run --volume /data/my-keepalived.conf:/container/service/keepalived/assets/keepalived.conf --detach osixia/keepalived:2.1.5
- Add your config file by extending or cloning this image, please refer to the [Advanced User Guide](#advanced-user-guide)
@ -54,7 +54,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:2.0.20 --copy-service
docker run [your options] osixia/keepalived:2.1.5 --copy-service
### Debug
@ -63,11 +63,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:2.0.20 --loglevel debug
docker run --detach osixia/keepalived:2.1.5 --loglevel debug
See all command line options:
docker run osixia/keepalived:2.0.20 --help
docker run osixia/keepalived:2.1.5 --help
## Environment Variables
@ -88,7 +88,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:2.0.20
docker run --env KEEPALIVED_UNICAST_PEERS="#PYTHON2BASH:['192.168.1.10', '192.168.1.11']" --detach osixia/keepalived:2.1.5
To convert yaml to python online : http://yaml-online-parser.appspot.com/
@ -112,7 +112,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:2.0.20
--env KEEPALIVED_PRIORITY="100" --detach osixia/keepalived:2.1.5
#### Link environment file
@ -120,7 +120,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:2.0.20
--detach osixia/keepalived:2.1.5
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).
@ -130,13 +130,13 @@ This is the best solution if you have a private registry. Please refer to the [A
## Advanced User Guide
### Extend osixia/keepalived:2.0.20 image
### Extend osixia/keepalived:2.1.5 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:2.0.20
FROM osixia/keepalived:2.1.5
MAINTAINER Your Name <your@name.com>
ADD keepalived.conf /container/service/keepalived/assets/keepalived.conf