Merge branch 'release-2.0.17' into stable
This commit is contained in:
Bertrand Gouny
commit
8e007b8481
|
|
@ -5,6 +5,14 @@ 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.17] - 2019-07-05
|
||||
### Added
|
||||
- Curl
|
||||
|
||||
### Changed
|
||||
- Upgrade keepalived version to 2.0.17
|
||||
- Upgrade baseimage to alpine-light-baseimage:0.1.6
|
||||
|
||||
## [2.0.16] - 2019-05-29
|
||||
### Added
|
||||
- Add NET_BROADCAST and NET_RAW capabilities on readme. Fixes #14
|
||||
|
|
@ -186,6 +194,7 @@ and this project follows keepalived versioning.
|
|||
## 0.1.0 - 2015-06-16
|
||||
Initial release
|
||||
|
||||
[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
|
||||
[2.0.13]: https://github.com/osixia/docker-keepalived/compare/v2.0.12...v2.0.13
|
||||
|
|
|
|||
2
Makefile
2
Makefile
|
|
@ -1,5 +1,5 @@
|
|||
NAME = osixia/keepalived
|
||||
VERSION = 2.0.16
|
||||
VERSION = 2.0.17
|
||||
|
||||
.PHONY: build build-nocache test tag-latest push push-latest release git-tag-version
|
||||
|
||||
|
|
|
|||
56
README.md
56
README.md
|
|
@ -6,35 +6,35 @@
|
|||
|
||||
[hub]: https://hub.docker.com/r/osixia/keepalived/
|
||||
|
||||
Latest release: 2.0.16 - Keepalived 2.0.16 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/keepalived/)
|
||||
Latest release: 2.0.17 - Keepalived 2.0.17 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/keepalived/)
|
||||
|
||||
**A docker image to run Keepalived.**
|
||||
> [keepalived.org](http://keepalived.org/)
|
||||
|
||||
- [osixia/keepalived](#osixiakeepalived)
|
||||
- [Quick start](#quick-start)
|
||||
- [Beginner Guide](#beginner-guide)
|
||||
- [Use your own Keepalived config](#use-your-own-keepalived-config)
|
||||
- [Fix docker mounted file problems](#fix-docker-mounted-file-problems)
|
||||
- [Debug](#debug)
|
||||
- [Environment Variables](#environment-variables)
|
||||
- [Set your own environment variables](#set-your-own-environment-variables)
|
||||
- [Use command line argument](#use-command-line-argument)
|
||||
- [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.16 image](#extend-osixiakeepalived2016-image)
|
||||
- [Make your own keepalived image](#make-your-own-keepalived-image)
|
||||
- [Tests](#tests)
|
||||
- [Under the hood: osixia/light-baseimage](#under-the-hood-osixialight-baseimage)
|
||||
- [Security](#security)
|
||||
- [Changelog](#changelog)
|
||||
- [Quick start](#Quick-start)
|
||||
- [Beginner Guide](#Beginner-Guide)
|
||||
- [Use your own Keepalived config](#Use-your-own-Keepalived-config)
|
||||
- [Fix docker mounted file problems](#Fix-docker-mounted-file-problems)
|
||||
- [Debug](#Debug)
|
||||
- [Environment Variables](#Environment-Variables)
|
||||
- [Set your own environment variables](#Set-your-own-environment-variables)
|
||||
- [Use command line argument](#Use-command-line-argument)
|
||||
- [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.17 image](#Extend-osixiakeepalived2017-image)
|
||||
- [Make your own keepalived image](#Make-your-own-keepalived-image)
|
||||
- [Tests](#Tests)
|
||||
- [Under the hood: osixia/light-baseimage](#Under-the-hood-osixialight-baseimage)
|
||||
- [Security](#Security)
|
||||
- [Changelog](#Changelog)
|
||||
|
||||
## 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
|
||||
|
||||
docker run --cap-add=NET_ADMIN --cap-add=NET_BROADCAST --cap-add=NET_RAW --net=host -d osixia/keepalived:2.0.16
|
||||
docker run --cap-add=NET_ADMIN --cap-add=NET_BROADCAST --cap-add=NET_RAW --net=host -d osixia/keepalived:2.0.17
|
||||
|
||||
## 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.16
|
||||
docker run --volume /data/my-keepalived.conf:/container/service/keepalived/assets/keepalived.conf --detach osixia/keepalived:2.0.17
|
||||
|
||||
- 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.16 --copy-service
|
||||
docker run [your options] osixia/keepalived:2.0.17 --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.16 --loglevel debug
|
||||
docker run --detach osixia/keepalived:2.0.17 --loglevel debug
|
||||
|
||||
See all command line options:
|
||||
|
||||
docker run osixia/keepalived:2.0.16 --help
|
||||
docker run osixia/keepalived:2.0.17 --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.16
|
||||
docker run --env KEEPALIVED_UNICAST_PEERS="#PYTHON2BASH:['192.168.1.10', '192.168.1.11']" --detach osixia/keepalived:2.0.17
|
||||
|
||||
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.16
|
||||
--env KEEPALIVED_PRIORITY="100" --detach osixia/keepalived:2.0.17
|
||||
|
||||
|
||||
#### 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.16
|
||||
--detach osixia/keepalived:2.0.17
|
||||
|
||||
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.16 image
|
||||
### Extend osixia/keepalived:2.0.17 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.16
|
||||
FROM osixia/keepalived:2.0.17
|
||||
MAINTAINER Your Name <your@name.com>
|
||||
|
||||
ADD keepalived.conf /container/service/keepalived/assets/keepalived.conf
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
# Use osixia/light-baseimage
|
||||
# sources: https://github.com/osixia/docker-light-baseimage
|
||||
FROM osixia/alpine-light-baseimage:0.1.5
|
||||
FROM osixia/alpine-light-baseimage:0.1.6
|
||||
|
||||
# Keepalived version
|
||||
ARG KEEPALIVED_VERSION=2.0.16
|
||||
ARG KEEPALIVED_VERSION=2.0.17
|
||||
|
||||
# Download, build and install Keepalived
|
||||
RUN apk --no-cache add \
|
||||
|
|
@ -33,7 +33,6 @@ RUN apk --no-cache add \
|
|||
&& rm -rf /container/keepalived-sources \
|
||||
&& apk --no-cache del \
|
||||
autoconf \
|
||||
curl \
|
||||
gcc \
|
||||
ipset-dev \
|
||||
iptables-dev \
|
||||
|
|
|
|||
Loading…
Reference in New Issue