From b6199848dee91ad3070bcc7680b647ae81550c20 Mon Sep 17 00:00:00 2001 From: Bertrand Gouny Date: Wed, 28 Feb 2018 15:00:23 +0100 Subject: [PATCH 2/3] keepalived 1.4.2 --- CHANGELOG.md | 35 ++++++++++++++++++++++++++++++++++- Makefile | 2 +- README.md | 24 ++++++++++++------------ image/Dockerfile | 2 +- 4 files changed, 48 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5be3f03..a776d7b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,10 @@ 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. +## [1.4.2] - Unreleased +### Changed + - Upgrade keepalived version to 1.4.2 + ## [1.4.1] - 2018-01-29 ### Changed - Upgrade keepalived version to 1.4.1 @@ -134,5 +138,34 @@ and this project follows keepalived versioning. ### Added - Notify script -## [0.1.0] - 2015-06-16 +## 0.1.0 - 2015-06-16 Initial release + +[1.4.2]: https://github.com/osixia/docker-keepalived/compare/v1.4.1...v1.4.2 +[1.4.1]: https://github.com/osixia/docker-keepalived/compare/v1.4.0...v1.4.1 +[1.4.0]: https://github.com/osixia/docker-keepalived/compare/v1.3.9...v1.4.0 +[1.3.9]: https://github.com/osixia/docker-keepalived/compare/v1.3.8...v1.3.9 +[1.3.8]: https://github.com/osixia/docker-keepalived/compare/v1.3.6-1...v1.3.8 +[1.3.6-1]: https://github.com/osixia/docker-keepalived/compare/v1.3.6...v1.3.6-1 +[1.3.6]: https://github.com/osixia/docker-keepalived/compare/v1.3.5-1...v1.3.6 +[1.3.5-1]: https://github.com/osixia/docker-keepalived/compare/v1.3.5...v1.3.5-1 +[1.3.5]: https://github.com/osixia/docker-keepalived/compare/v1.3.4...v1.3.5 +[1.3.4]: https://github.com/osixia/docker-keepalived/compare/v1.3.3...v1.3.4 +[1.3.3]: https://github.com/osixia/docker-keepalived/compare/v1.3.2...v1.3.3 +[1.3.2]: https://github.com/osixia/docker-keepalived/compare/v1.3.1...v1.3.2 +[1.3.1]: https://github.com/osixia/docker-keepalived/compare/v1.3.0...v1.3.1 +[1.3.0]: https://github.com/osixia/docker-keepalived/compare/v1.2.24...v1.3.0 +[1.2.24]: https://github.com/osixia/docker-keepalived/compare/v0.2.3...v1.2.24 +[0.2.3]: https://github.com/osixia/docker-keepalived/compare/v0.2.2...v0.2.3 +[0.2.2]: https://github.com/osixia/docker-keepalived/compare/v0.2.1...v0.2.2 +[0.2.1]: https://github.com/osixia/docker-keepalived/compare/v0.2.0...v0.2.1 +[0.2.0]: https://github.com/osixia/docker-keepalived/compare/v0.1.9...v0.2.0 +[0.1.9]: https://github.com/osixia/docker-keepalived/compare/v0.1.8...v0.1.9 +[0.1.8]: https://github.com/osixia/docker-keepalived/compare/v0.1.7...v0.1.8 +[0.1.7]: https://github.com/osixia/docker-keepalived/compare/v0.1.6...v0.1.7 +[0.1.6]: https://github.com/osixia/docker-keepalived/compare/v0.1.5...v0.1.6 +[0.1.5]: https://github.com/osixia/docker-keepalived/compare/v0.1.4...v0.1.5 +[0.1.4]: https://github.com/osixia/docker-keepalived/compare/v0.1.3...v0.1.4 +[0.1.3]: https://github.com/osixia/docker-keepalived/compare/v0.1.2...v0.1.3 +[0.1.2]: https://github.com/osixia/docker-keepalived/compare/v0.1.1...v0.1.2 +[0.1.1]: https://github.com/osixia/docker-keepalived/compare/v0.1.0...v0.1.1 diff --git a/Makefile b/Makefile index 099c108..2c61437 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ NAME = osixia/keepalived -VERSION = 1.4.1 +VERSION = 1.4.2 .PHONY: build build-nocache test tag-latest push push-latest release git-tag-version diff --git a/README.md b/README.md index 0ffd8fc..4d8cd7e 100644 --- a/README.md +++ b/README.md @@ -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,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: 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 @@ -116,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 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 ADD keepalived.conf /container/service/keepalived/assets/keepalived.conf diff --git a/image/Dockerfile b/image/Dockerfile index a0287b6..5b1077c 100644 --- a/image/Dockerfile +++ b/image/Dockerfile @@ -4,7 +4,7 @@ FROM osixia/alpine-light-baseimage:0.1.5 MAINTAINER Bertrand Gouny # Keepalived version -ARG KEEPALIVED_VERSION=1.4.1 +ARG KEEPALIVED_VERSION=1.4.2 # Download, build and install Keepalived RUN apk --no-cache add \ From a88196b6144897b00c207a143083fd4bd9993cd3 Mon Sep 17 00:00:00 2001 From: Bertrand Gouny Date: Sat, 3 Mar 2018 12:46:25 +0100 Subject: [PATCH 3/3] release date --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a776d7b..a151c45 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ 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. -## [1.4.2] - Unreleased +## [1.4.2] - 2018-03-03 ### Changed - Upgrade keepalived version to 1.4.2