-
Notifications
You must be signed in to change notification settings - Fork 150
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'release-1.4.2' into stable
- Loading branch information
Showing
4 changed files
with
48 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,7 +6,7 @@ | |
|
|
||
| [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/) | ||
| Latest release: 1.4.2 - Keepalived 1.4.2 - [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.1 - Keepalived 1.4.1 - [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.1 image](#extend-osixiakeepalived141-image) | ||
| - [Extend osixia/keepalived:1.4.2 image](#extend-osixiakeepalived142-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.1 - Keepalived 1.4.1 - [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.1 | ||
| docker run --cap-add=NET_ADMIN --net=host -d osixia/keepalived:1.4.2 | ||
|
|
||
| ## 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.1 | ||
| docker run --volume /data/my-keepalived.conf:/container/service/keepalived/assets/keepalived.conf --detach osixia/keepalived:1.4.2 | ||
|
|
||
| - 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.1 --copy-service | ||
| docker run [your options] osixia/keepalived:1.4.2 --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.1 --loglevel debug | ||
| docker run --detach osixia/keepalived:1.4.2 --loglevel debug | ||
|
|
||
| See all command line options: | ||
|
|
||
| docker run osixia/keepalived:1.4.1 --help | ||
| docker run osixia/keepalived:1.4.2 --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.1 | ||
| docker run --env KEEPALIVED_UNICAST_PEERS="#PYTHON2BASH:['192.168.1.10', '192.168.1.11']" --detach osixia/keepalived:1.4.2 | ||
|
|
||
| To convert yaml to python online : http://yaml-online-parser.appspot.com/ | ||
|
|
||
|
|
@@ -108,15 +108,15 @@ 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.1 | ||
| --env KEEPALIVED_PRIORITY="100" --detach osixia/keepalived:1.4.2 | ||
|
|
||
|
|
||
| #### Link environment file | ||
|
|
||
| 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.1 | ||
| --detach osixia/keepalived:1.4.2 | ||
|
|
||
| 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.1 image | ||
| ### Extend osixia/keepalived:1.4.2 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.1 | ||
| FROM osixia/keepalived:1.4.2 | ||
| MAINTAINER Your Name <[email protected]> | ||
|
|
||
| ADD keepalived.conf /container/service/keepalived/assets/keepalived.conf | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,7 +4,7 @@ FROM osixia/alpine-light-baseimage:0.1.5 | |
| MAINTAINER Bertrand Gouny <[email protected]> | ||
|
|
||
| # Keepalived version | ||
| ARG KEEPALIVED_VERSION=1.4.1 | ||
| ARG KEEPALIVED_VERSION=1.4.2 | ||
|
|
||
| # Download, build and install Keepalived | ||
| RUN apk --no-cache add \ | ||
|
|
||