diff --git a/CHANGELOG.md b/CHANGELOG.md index d1feb90..9729e51 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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. +## [2.0.20] - 2020-02-07 +### Changed + - Upgrade keepalived version to 2.0.20 + +### Fixed + - When system reboot or unexpected shutdown, keepalived never start up again #18 #25 + ## [2.0.19] - 2019-11-15 ## Added - Multiarch support @@ -201,6 +208,8 @@ and this project follows keepalived versioning. ## 0.1.0 - 2015-06-16 Initial release +[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 [2.0.16]: https://github.com/osixia/docker-keepalived/compare/v2.0.15...v2.0.16 [2.0.15]: https://github.com/osixia/docker-keepalived/compare/v2.0.13...v2.0.15 diff --git a/Makefile b/Makefile index 55de332..6eab152 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ NAME = osixia/keepalived -VERSION = 2.0.19 +VERSION = 2.0.20 .PHONY: build build-nocache test tag-latest push push-latest release git-tag-version diff --git a/README.md b/README.md index a756376..6596163 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ [hub]: https://hub.docker.com/r/osixia/keepalived/ -Latest release: 2.0.19 - Keepalived 2.0.19 - [Changelog](CHANGELOG.md) | [Docker 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/)  **A docker image to run Keepalived.** > [keepalived.org](http://keepalived.org/) @@ -23,7 +23,7 @@ Latest release: 2.0.19 - Keepalived 2.0.19 - [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.19 image](#extend-osixiakeepalived2019-image) + - [Extend osixia/keepalived:2.0.20 image](#extend-osixiakeepalived2020-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.19 - Keepalived 2.0.19 - [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.19 + docker run --cap-add=NET_ADMIN --cap-add=NET_BROADCAST --cap-add=NET_RAW --net=host -d osixia/keepalived:2.0.20 ## 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.19 + docker run --volume /data/my-keepalived.conf:/container/service/keepalived/assets/keepalived.conf --detach osixia/keepalived:2.0.20 - 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.19 --copy-service + docker run [your options] osixia/keepalived:2.0.20 --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.19 --loglevel debug + docker run --detach osixia/keepalived:2.0.20 --loglevel debug See all command line options: - docker run osixia/keepalived:2.0.19 --help + docker run osixia/keepalived:2.0.20 --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.19 + docker run --env KEEPALIVED_UNICAST_PEERS="#PYTHON2BASH:['192.168.1.10', '192.168.1.11']" --detach osixia/keepalived:2.0.20 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.19 + --env KEEPALIVED_PRIORITY="100" --detach osixia/keepalived:2.0.20 #### 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.19 + --detach osixia/keepalived:2.0.20 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.19 image +### Extend osixia/keepalived:2.0.20 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.19 + FROM osixia/keepalived:2.0.20 MAINTAINER Your Name ADD keepalived.conf /container/service/keepalived/assets/keepalived.conf diff --git a/image/Dockerfile b/image/Dockerfile index 961c8a4..d20cc08 100644 --- a/image/Dockerfile +++ b/image/Dockerfile @@ -3,7 +3,7 @@ FROM osixia/light-baseimage:alpine-0.1.6-dev # Keepalived version -ARG KEEPALIVED_VERSION=2.0.19 +ARG KEEPALIVED_VERSION=2.0.20 # Download, build and install Keepalived RUN apk --no-cache add \ diff --git a/image/service/keepalived/startup.sh b/image/service/keepalived/startup.sh index 5c077ca..d5ba3b4 100755 --- a/image/service/keepalived/startup.sh +++ b/image/service/keepalived/startup.sh @@ -64,4 +64,6 @@ if [ ! -e "/usr/local/etc/keepalived/keepalived.conf" ]; then ln -sf ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf /usr/local/etc/keepalived/keepalived.conf fi +rm -f /run/keepalived.pid || true + exit 0