diff --git a/CHANGELOG.md b/CHANGELOG.md index 5368158..4922ce3 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.11] - 2019-01.21 +### Added + - KEEPALIVED_STATE environment variable + +### Changed + - Upgrade keepalived version to 2.0.11 + ## [2.0.10] - 2018-11-13 ### Changed - Upgrade keepalived version to 2.0.10 @@ -159,6 +166,8 @@ and this project follows keepalived versioning. ## 0.1.0 - 2015-06-16 Initial release +[2.0.11]: https://github.com/osixia/docker-keepalived/compare/v2.0.10...v2.0.11 +[2.0.10]: https://github.com/osixia/docker-keepalived/compare/v1.4.5...v2.0.10 [1.4.5]: https://github.com/osixia/docker-keepalived/compare/v1.4.4...v1.4.5 [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 diff --git a/Makefile b/Makefile index 736d540..8caac62 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ NAME = osixia/keepalived -VERSION = 2.0.10 +VERSION = 2.0.11 .PHONY: build build-nocache test tag-latest push push-latest release git-tag-version diff --git a/README.md b/README.md index 3cd6376..773839b 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ [hub]: https://hub.docker.com/r/osixia/keepalived/ -Latest release: 2.0.10 - Keepalived 2.0.10 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/keepalived/)  +Latest release: 2.0.11 - Keepalived 2.0.11 - [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.10 - Keepalived 2.0.10 - [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.10 image](#extend-osixiakeepalived2010-image) + - [Extend osixia/keepalived:2.0.11 image](#extend-osixiakeepalived2011-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.10 - Keepalived 2.0.10 - [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 --net=host -d osixia/keepalived:2.0.10 + docker run --cap-add=NET_ADMIN --net=host -d osixia/keepalived:2.0.11 ## 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.10 + docker run --volume /data/my-keepalived.conf:/container/service/keepalived/assets/keepalived.conf --detach osixia/keepalived:2.0.11 - 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.10 --copy-service + docker run [your options] osixia/keepalived:2.0.11 --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.10 --loglevel debug + docker run --detach osixia/keepalived:2.0.11 --loglevel debug See all command line options: - docker run osixia/keepalived:2.0.10 --help + docker run osixia/keepalived:2.0.11 --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.10 + docker run --env KEEPALIVED_UNICAST_PEERS="#PYTHON2BASH:['192.168.1.10', '192.168.1.11']" --detach osixia/keepalived:2.0.11 To convert yaml to python online : http://yaml-online-parser.appspot.com/ @@ -104,13 +104,15 @@ See how to [set your own environment variables](#set-your-own-environment-variab - **KEEPALIVED_COMMAND_LINE_ARGUMENTS** Keepalived command line arguments; Defaults to `--log-detail --dump-conf` +- **KEEPALIVED_STATE** The starting state of keepalived; it can either be MASTER or BACKUP. + ### Set your own environment variables #### Use command line argument 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.10 + --env KEEPALIVED_PRIORITY="100" --detach osixia/keepalived:2.0.11 #### Link environment file @@ -118,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.10 + --detach osixia/keepalived:2.0.11 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). @@ -128,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.10 image +### Extend osixia/keepalived:2.0.11 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.10 + FROM osixia/keepalived:2.0.11 MAINTAINER Your Name ADD keepalived.conf /container/service/keepalived/assets/keepalived.conf diff --git a/image/Dockerfile b/image/Dockerfile index 23b8c6a..9de0c86 100644 --- a/image/Dockerfile +++ b/image/Dockerfile @@ -3,7 +3,7 @@ FROM osixia/alpine-light-baseimage:0.1.5 # Keepalived version -ARG KEEPALIVED_VERSION=2.0.10 +ARG KEEPALIVED_VERSION=2.0.11 # Download, build and install Keepalived RUN apk --no-cache add \ @@ -43,7 +43,6 @@ RUN apk --no-cache add \ musl-dev \ openssl-dev - # Add service directory to /container/service ADD service /container/service diff --git a/image/environment/default.yaml b/image/environment/default.yaml index 8d7f815..69d660c 100644 --- a/image/environment/default.yaml +++ b/image/environment/default.yaml @@ -18,3 +18,5 @@ KEEPALIVED_VIRTUAL_IPS: KEEPALIVED_NOTIFY: /container/service/keepalived/assets/notify.sh KEEPALIVED_ROUTER_ID: 51 + +KEEPALIVED_STATE: BACKUP diff --git a/image/service/keepalived/assets/keepalived.conf b/image/service/keepalived/assets/keepalived.conf index 2731659..af51c0f 100644 --- a/image/service/keepalived/assets/keepalived.conf +++ b/image/service/keepalived/assets/keepalived.conf @@ -5,7 +5,7 @@ global_defs { vrrp_instance VI_1 { interface {{ KEEPALIVED_INTERFACE }} - state BACKUP + state {{ KEEPALIVED_STATE }} virtual_router_id {{ KEEPALIVED_ROUTER_ID }} priority {{ KEEPALIVED_PRIORITY }} nopreempt diff --git a/image/service/keepalived/startup.sh b/image/service/keepalived/startup.sh index cf2b08a..5c077ca 100755 --- a/image/service/keepalived/startup.sh +++ b/image/service/keepalived/startup.sh @@ -11,6 +11,7 @@ if [ ! -e "$FIRST_START_DONE" ]; then # # bootstrap config # + sed -i "s|{{ KEEPALIVED_STATE }}|$KEEPALIVED_STATE|g" ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf 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