From ffa8fa085469ba3793292c719212c46f6d6b51b6 Mon Sep 17 00:00:00 2001 From: Bertrand Gouny Date: Wed, 3 Jan 2018 12:02:56 +0100 Subject: [PATCH 2/5] keepalived 1.4.0 --- CHANGELOG.md | 3 +++ Makefile | 2 +- README.md | 24 ++++++++++++------------ image/Dockerfile | 2 +- 4 files changed, 17 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c6f46da..6ca70d0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog +## 1.4.0 + - Keepalived version 1.4.0 + ## 1.3.9 - Keepalived version 1.3.9 diff --git a/Makefile b/Makefile index 5e475c1..d43ad55 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ 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 diff --git a/README.md b/README.md index 4783ab2..31945ea 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ [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.** > [keepalived.org](http://keepalived.org/) @@ -22,7 +22,7 @@ Latest release: 1.3.9 - Keepalived 1.3.9 - [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.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) - [Tests](#tests) - [Under the hood: osixia/light-baseimage](#under-the-hood-osixialight-baseimage) @@ -32,7 +32,7 @@ Latest release: 1.3.9 - Keepalived 1.3.9 - [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.3.9 + docker run --cap-add=NET_ADMIN --net=host -d osixia/keepalived:1.4.0 ## Beginner Guide @@ -42,7 +42,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.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) @@ -52,7 +52,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.3.9 --copy-service + docker run [your options] osixia/keepalived:1.4.0 --copy-service ### Debug @@ -61,11 +61,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.3.9 --loglevel debug + docker run --detach osixia/keepalived:1.4.0 --loglevel debug See all command line options: - docker run osixia/keepalived:1.3.9 --help + docker run osixia/keepalived:1.4.0 --help ## Environment Variables @@ -85,7 +85,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.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/ @@ -107,7 +107,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.3.9 + --env KEEPALIVED_PRIORITY="100" --detach osixia/keepalived:1.4.0 #### Link environment file @@ -115,7 +115,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.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). @@ -125,13 +125,13 @@ This is the best solution if you have a private registry. Please refer to the [A ## 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. Dockerfile example: - FROM osixia/keepalived:1.3.9 + FROM osixia/keepalived:1.4.0 MAINTAINER Your Name ADD keepalived.conf /container/service/keepalived/assets/keepalived.conf diff --git a/image/Dockerfile b/image/Dockerfile index 3d3516a..34dd5da 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.3.9 +ARG KEEPALIVED_VERSION=1.4.0 # Download, build and install Keepalived RUN apk --no-cache add \ From af3427a9ce62352f34c8b963911a4f567caf1b1b Mon Sep 17 00:00:00 2001 From: Bertrand Gouny Date: Thu, 4 Jan 2018 10:24:35 +0100 Subject: [PATCH 3/5] follow keepachangelog.com --- CHANGELOG.md | 157 +++++++++++++++++++++++++++++++++------------------ 1 file changed, 101 insertions(+), 56 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6ca70d0..0c9fe2a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,89 +1,134 @@ # 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.4.0 - - Keepalived version 1.4.0 +The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) +and this project follows keepalived versioning. -## 1.3.9 - - Keepalived version 1.3.9 +## [1.4.0] +### Changed + - Upgrade keepalived version to 1.4.0 -## 1.3.8 - - Keepalived version 1.3.8 +## [1.3.9] - 2017-10-22 +### Changed + - Upgrade keepalived version to 1.3.9 -## 1.3.6-1 - - Upgrade baseimage: alpine-light-baseimage:0.1.5 +## [1.3.8] - 2017-10-16 +### Changed + - Upgrade keepalived version to 1.3.8 -## 1.3.6 - - Keepalived version 1.3.6 - - Remove keepalived_script script user, to run scripts with root user +## [1.3.6-1] - 2017-10-16 +### Changed + - Upgrade baseimage to alpine-light-baseimage:0.1.5 -## 1.3.5-1 - - Fix startup.sh and finish.sh ip address removal - - Use linux alpine +## [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 -## 1.3.5 - - Keepalived version 1.3.5 +### Changed + - Use linux alpine as baseimage -## 1.3.4 - - Keepalived version 1.3.4 +### Fixed + - startup.sh and finish.sh ip address removal -## 1.3.2 - - Keepalived version 1.3.2 +## [1.3.5] - 2017-03-21 +### Changed + - Upgrade keepalived version to 1.3.5 -## 1.3.1 - - Keepalived version 1.3.1 +## [1.3.4] - 2017-02-19 +### Changed + - Upgrade keepalived version to 1.3.4 -## 1.3.0 - - Keepalived version 1.3.0 - - Upgrade baseimage: light-baseimage:0.2.6 +## [1.3.3] - 2017-02-15 +### Changed + - Upgrade keepalived version to 1.3.3 -## 1.2.24 - - Keepalived version 1.2.24 - - We now use the keepalived version number as docker image tag +## [1.3.2] - 2016-11-29 +### Changed + - Upgrade keepalived version to 1.3.2 -## 0.2.3 - - Upgrade baseimage: light-baseimage:0.2.5 +## [1.3.1] - 2016-11-22 +### Changed + - Upgrade keepalived version to 1.3.1 -## 0.2.2 - - Upgrade baseimage: light-baseimage:0.2.4 - - Keepalived version 1.2.23 +## [1.3.0] - 2016-11-21 +### Changed + - Upgrade keepalived version to 1.3.0 + - Upgrade baseimage to light-baseimage:0.2.6 -## 0.2.1 - - Upgrade baseimage: light-baseimage:0.2.2 +## [1.2.24] - 2016-09-13 +### Changed + - Upgrade keepalived version to 1.2.24 -## 0.2.0 - - Upgrade baseimage: light-baseimage:0.2.1 +## Versions before following the keepalived versioning + +## [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 -## 0.1.9 - - Upgrade baseimage: light-baseimage:0.1.5 +### Changed + - Upgrade baseimage to light-baseimage:0.2.1 -## 0.1.8 - - Upgrade baseimage: light-baseimage:0.1.4 +## [0.1.9] - 2015-11-20 +### Changed + - Upgrade baseimage to light-baseimage:0.1.5 -## 0.1.7 - - Upgrade baseimage: light-baseimage:0.1.2 +## [0.1.8] - 2015-11-19 +### 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 + +### Changed - Improve documentation -## 0.1.5 - - Upgrade baseimage: light-baseimage:0.1.1 +## [0.1.5] - 2015-08-19 +### Changed + - Upgrade baseimage to light-baseimage:0.1.1 -## 0.1.4 +## [0.1.4] - 2015-07-23 +### Changed - Use light-baseimage -## 0.1.3 +## [0.1.3] - 2015-07-09 +### Fixed - Fix libnl dependency -## 0.1.2 - - Keepalived version 1.2.19 - - Update default config : - - Set start state to BACKUP +## [0.1.2] - 2015-07-09 +### Changed + - Upgrade keepalived version to 1.2.19 + - Upgrade default config : + - Set start state to BACKUP -## 0.1.1 - - Add notify script +## [0.1.1] - 2015-06-21 +### Added + - Notify script -## 0.1.0 - - Initial release +## [0.1.0] - 2015-06-16 +Initial release From 5685b2492d01f587dd58a244ac1c1196f9669e2c Mon Sep 17 00:00:00 2001 From: Bertrand Gouny Date: Fri, 5 Jan 2018 10:53:17 +0100 Subject: [PATCH 4/5] security note --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 31945ea..b74e092 100644 --- a/README.md +++ b/README.md @@ -26,6 +26,7 @@ Latest release: 1.4.0 - Keepalived 1.4.0 - [Changelog](CHANGELOG.md) | [Docker H - [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 @@ -182,6 +183,11 @@ Install Bats, and in this project directory run : This image is based on osixia/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 Please refer to: [CHANGELOG.md](CHANGELOG.md) From 62b4e7175acde673287c14c951449e2a254634c0 Mon Sep 17 00:00:00 2001 From: Bertrand Gouny Date: Thu, 11 Jan 2018 11:20:41 +0100 Subject: [PATCH 5/5] release date --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c9fe2a..5f8900f 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.0] +## [1.4.0] - 2018-01-11 ### Changed - Upgrade keepalived version to 1.4.0