coryHawkvelt
/
docker-keepalived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'release-1.4.0' into stable

This commit is contained in:
Bertrand Gouny 2018-01-11 11:21:37 +01:00
parent 60990ba226 62b4e7175a
commit 0bd1278f7e
4 changed files with 122 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

154
CHANGELOG.md
View File

@ -1,86 +1,134 @@
# Changelog # Changelog
This file only reflects the changes that are made in this project.
Please refer to the upstream [keepalived changelog](https://github.com/acassen/keepalived/blob/master/ChangeLog) for the list of changes in keepalived.
## 1.3.9 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
- Keepalived version 1.3.9 and this project follows keepalived versioning.
## 1.3.8 ## [1.4.0] - 2018-01-11
- Keepalived version 1.3.8 ### Changed
- Upgrade keepalived version to 1.4.0
## 1.3.6-1 ## [1.3.9] - 2017-10-22
- Upgrade baseimage: alpine-light-baseimage:0.1.5 ### Changed
- Upgrade keepalived version to 1.3.9
## 1.3.6 ## [1.3.8] - 2017-10-16
- Keepalived version 1.3.6 ### Changed
- Remove keepalived_script script user, to run scripts with root user - Upgrade keepalived version to 1.3.8
## 1.3.5-1 ## [1.3.6-1] - 2017-10-16
- Fix startup.sh and finish.sh ip address removal ### Changed
- Use linux alpine - Upgrade baseimage to alpine-light-baseimage:0.1.5
## [1.3.6] - 2017-08-15
### Changed
- Upgrade keepalived version to 1.3.6
### Removed
- keepalived_script script user, scripts are now run with root user
## [1.3.5-1] - 2017-07-19
### Added
- Add keepalived_script script user - Add keepalived_script script user
## 1.3.5 ### Changed
- Keepalived version 1.3.5 - Use linux alpine as baseimage
## 1.3.4 ### Fixed
- Keepalived version 1.3.4 - startup.sh and finish.sh ip address removal
## 1.3.2 ## [1.3.5] - 2017-03-21
- Keepalived version 1.3.2 ### Changed
- Upgrade keepalived version to 1.3.5
## 1.3.1 ## [1.3.4] - 2017-02-19
- Keepalived version 1.3.1 ### Changed
- Upgrade keepalived version to 1.3.4
## 1.3.0 ## [1.3.3] - 2017-02-15
- Keepalived version 1.3.0 ### Changed
- Upgrade baseimage: light-baseimage:0.2.6 - Upgrade keepalived version to 1.3.3
## 1.2.24 ## [1.3.2] - 2016-11-29
- Keepalived version 1.2.24 ### Changed
- We now use the keepalived version number as docker image tag - Upgrade keepalived version to 1.3.2
## 0.2.3 ## [1.3.1] - 2016-11-22
- Upgrade baseimage: light-baseimage:0.2.5 ### Changed
- Upgrade keepalived version to 1.3.1
## 0.2.2 ## [1.3.0] - 2016-11-21
- Upgrade baseimage: light-baseimage:0.2.4 ### Changed
- Keepalived version 1.2.23 - Upgrade keepalived version to 1.3.0
- Upgrade baseimage to light-baseimage:0.2.6
## 0.2.1 ## [1.2.24] - 2016-09-13
- Upgrade baseimage: light-baseimage:0.2.2 ### Changed
- Upgrade keepalived version to 1.2.24
## 0.2.0 ## Versions before following the keepalived versioning
- Upgrade baseimage: light-baseimage:0.2.1
## [0.2.3] - 2016-09-03
### Changed
- Upgrade baseimage to light-baseimage:0.2.5
## [0.2.2] - 2016-07-26
### Changed
- Upgrade baseimage to light-baseimage:0.2.4
- Upgrade keepalived version to 1.2.23
## [0.2.1] - 2016-02-20
### Changed
- Upgrade baseimage to light-baseimage:0.2.2
## [0.2.0] - 2016-01-27
### Added
- Makefile with build no cache - Makefile with build no cache
## 0.1.9 ### Changed
- Upgrade baseimage: light-baseimage:0.1.5 - Upgrade baseimage to light-baseimage:0.2.1
## 0.1.8 ## [0.1.9] - 2015-11-20
- Upgrade baseimage: light-baseimage:0.1.4 ### Changed
- Upgrade baseimage to light-baseimage:0.1.5
## 0.1.7 ## [0.1.8] - 2015-11-19
- Upgrade baseimage: light-baseimage:0.1.2 ### Changed
- Upgrade baseimage to light-baseimage:0.1.4
## 0.1.6 ## [0.1.7] - 2015-10-26
### Changed
- Upgrade baseimage to light-baseimage:0.1.2
## [0.1.6] - 2015-08-21
### Added
- Better way to add custom config - Better way to add custom config
### Changed
- Improve documentation - Improve documentation
## 0.1.5 ## [0.1.5] - 2015-08-19
- Upgrade baseimage: light-baseimage:0.1.1 ### Changed
- Upgrade baseimage to light-baseimage:0.1.1
## 0.1.4 ## [0.1.4] - 2015-07-23
### Changed
- Use light-baseimage - Use light-baseimage
## 0.1.3 ## [0.1.3] - 2015-07-09
### Fixed
- Fix libnl dependency - Fix libnl dependency
## 0.1.2 ## [0.1.2] - 2015-07-09
- Keepalived version 1.2.19 ### Changed
- Update default config : - Upgrade keepalived version to 1.2.19
- Upgrade default config :
- Set start state to BACKUP - Set start state to BACKUP
## 0.1.1 ## [0.1.1] - 2015-06-21
- Add notify script ### Added
- Notify script
## 0.1.0 ## [0.1.0] - 2015-06-16
- Initial release Initial release

2
Makefile
View File

@ -1,5 +1,5 @@
NAME = osixia/keepalived NAME = osixia/keepalived
VERSION = 1.3.9 VERSION = 1.4.0
.PHONY: build build-nocache test tag-latest push push-latest release git-tag-version .PHONY: build build-nocache test tag-latest push push-latest release git-tag-version

30
README.md
View File

@ -6,7 +6,7 @@
[hub]: https://hub.docker.com/r/osixia/keepalived/ [hub]: https://hub.docker.com/r/osixia/keepalived/
Latest release: 1.3.9 - Keepalived 1.3.9 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/keepalived/)  Latest release: 1.4.0 - Keepalived 1.4.0 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/keepalived/) 
**A docker image to run Keepalived.** **A docker image to run Keepalived.**
> [keepalived.org](http://keepalived.org/) > [keepalived.org](http://keepalived.org/)
@ -22,17 +22,18 @@ Latest release: 1.3.9 - Keepalived 1.3.9 - [Changelog](CHANGELOG.md) | [Docker H
- [Link environment file](#link-environment-file) - [Link environment file](#link-environment-file)
- [Make your own image or extend this image](#make-your-own-image-or-extend-this-image) - [Make your own image or extend this image](#make-your-own-image-or-extend-this-image)
- [Advanced User Guide](#advanced-user-guide) - [Advanced User Guide](#advanced-user-guide)
- [Extend osixia/keepalived:1.3.9 image](#extend-osixiakeepalived139-image) - [Extend osixia/keepalived:1.4.0 image](#extend-osixiakeepalived140-image)
- [Make your own keepalived image](#make-your-own-keepalived-image) - [Make your own keepalived image](#make-your-own-keepalived-image)
- [Tests](#tests) - [Tests](#tests)
- [Under the hood: osixia/light-baseimage](#under-the-hood-osixialight-baseimage) - [Under the hood: osixia/light-baseimage](#under-the-hood-osixialight-baseimage)
- [Security](#security)
- [Changelog](#changelog) - [Changelog](#changelog)
## Quick start ## Quick start
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 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.3.9 docker run --cap-add=NET_ADMIN --net=host -d osixia/keepalived:1.4.0
## Beginner Guide ## Beginner Guide
@ -42,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` : - 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.3.9 docker run --volume /data/my-keepalived.conf:/container/service/keepalived/assets/keepalived.conf --detach osixia/keepalived:1.4.0
- Add your config file by extending or cloning this image, please refer to the [Advanced User Guide](#advanced-user-guide) - Add your config file by extending or cloning this image, please refer to the [Advanced User Guide](#advanced-user-guide)
@ -52,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 : To fix that run the container with `--copy-service` argument :
docker run [your options] osixia/keepalived:1.3.9 --copy-service docker run [your options] osixia/keepalived:1.4.0 --copy-service
### Debug ### Debug
@ -61,11 +62,11 @@ Available levels are: `none`, `error`, `warning`, `info`, `debug` and `trace`.
Example command to run the container in `debug` mode: Example command to run the container in `debug` mode:
docker run --detach osixia/keepalived:1.3.9 --loglevel debug docker run --detach osixia/keepalived:1.4.0 --loglevel debug
See all command line options: See all command line options:
docker run osixia/keepalived:1.3.9 --help docker run osixia/keepalived:1.4.0 --help
## Environment Variables ## Environment Variables
@ -85,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: 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.3.9 docker run --env KEEPALIVED_UNICAST_PEERS="#PYTHON2BASH:['192.168.1.10', '192.168.1.11']" --detach osixia/keepalived:1.4.0
To convert yaml to python online : http://yaml-online-parser.appspot.com/ To convert yaml to python online : http://yaml-online-parser.appspot.com/
@ -107,7 +108,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: 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!" \ docker run --env KEEPALIVED_INTERFACE="eno1" --env KEEPALIVED_PASSWORD="password!" \
--env KEEPALIVED_PRIORITY="100" --detach osixia/keepalived:1.3.9 --env KEEPALIVED_PRIORITY="100" --detach osixia/keepalived:1.4.0
#### Link environment file #### Link environment file
@ -115,7 +116,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 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 \ docker run --volume /data/environment/my-env.yaml:/container/environment/01-custom/env.yaml \
--detach osixia/keepalived:1.3.9 --detach osixia/keepalived:1.4.0
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). 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).
@ -125,13 +126,13 @@ This is the best solution if you have a private registry. Please refer to the [A
## Advanced User Guide ## Advanced User Guide
### Extend osixia/keepalived:1.3.9 image ### Extend osixia/keepalived:1.4.0 image
If you need to add your custom TLS certificate, bootstrap config or environment files the easiest way is to extends this 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: Dockerfile example:
FROM osixia/keepalived:1.3.9 FROM osixia/keepalived:1.4.0
MAINTAINER Your Name <your@name.com> MAINTAINER Your Name <your@name.com>
ADD keepalived.conf /container/service/keepalived/assets/keepalived.conf ADD keepalived.conf /container/service/keepalived/assets/keepalived.conf
@ -182,6 +183,11 @@ Install Bats, and in this project directory run :
This image is based on osixia/light-baseimage. This image is based on osixia/light-baseimage.
More info: https://github.com/osixia/docker-light-baseimage More info: https://github.com/osixia/docker-light-baseimage
## Security
If you discover a security vulnerability within this docker image, please send an email to the Osixia! team at security@osixia.net. For minor vulnerabilities feel free to add an issue here on github.
Please include as many details as possible.
## Changelog ## Changelog
Please refer to: [CHANGELOG.md](CHANGELOG.md) Please refer to: [CHANGELOG.md](CHANGELOG.md)

2
image/Dockerfile
View File

@ -4,7 +4,7 @@ FROM osixia/alpine-light-baseimage:0.1.5
MAINTAINER Bertrand Gouny <bertrand.gouny@osixia.net> MAINTAINER Bertrand Gouny <bertrand.gouny@osixia.net>
# Keepalived version # Keepalived version
ARG KEEPALIVED_VERSION=1.3.9 ARG KEEPALIVED_VERSION=1.4.0
# Download, build and install Keepalived # Download, build and install Keepalived
RUN apk --no-cache add \ RUN apk --no-cache add \