From 961ed484a08de8f370dc6ab5f79b8eacb1bde886 Mon Sep 17 00:00:00 2001 From: Bertrand Gouny Date: Mon, 21 Nov 2016 10:27:01 +0100 Subject: [PATCH 2/7] keepalived 1.3.0 --- CHANGELOG.md | 4 ++++ Makefile | 2 +- README.md | 26 +++++++++++++------------- image/Dockerfile | 2 +- 4 files changed, 19 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 18a5e93..f453ece 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 1.3.0 + - Keepalived version 1.3.0 + - Upgrade baseimage: light-baseimage:0.2.6 + ## 1.2.24 - Keepalived version 1.2.24 - We now use the keepalived version number as docker image tag diff --git a/Makefile b/Makefile index e929884..fb93a69 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ NAME = osixia/keepalived -VERSION = 1.2.24 +VERSION = 1.3.0 .PHONY: all build build-nocache test tag_latest release diff --git a/README.md b/README.md index 9e9ec50..0ae44c1 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ [hub]: https://hub.docker.com/r/osixia/keepalived/ -Latest release: 1.2.24 - Keepalived 1.2.24 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/keepalived/)  +Latest release: 1.3.0 - Keepalived 1.3.0 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/keepalived/)  A docker image to run Keepalived. > [keepalived.org](http://keepalived.org/) @@ -21,7 +21,7 @@ A docker image to run Keepalived. - [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.2.24 image](#extend-osixiakeepalived1224-image) + - [Extend osixia/keepalived:1.3.0 image](#extend-osixiakeepalived130-image) - [Make your own keepalived image](#make-your-own-keepalived-image) - [Tests](#tests) - [Under the hood: osixia/light-baseimage](#under-the-hood-osixialight-baseimage) @@ -31,7 +31,7 @@ A docker image to run Keepalived. 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.2.24 + docker run --cap-add=NET_ADMIN --net=host -d osixia/keepalived:1.3.0 ## Beginner Guide @@ -41,7 +41,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.2.24 + docker run --volume /data/my-keepalived.conf:/container/service/keepalived/assets/keepalived.conf --detach osixia/keepalived:1.3.0 - Add your config file by extending or cloning this image, please refer to the [Advanced User Guide](#advanced-user-guide) @@ -51,7 +51,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.2.24 --copy-service + docker run [your options] osixia/keepalived:1.3.0 --copy-service ### Debug @@ -60,11 +60,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.2.24 --loglevel debug + docker run --detach osixia/keepalived:1.3.0 --loglevel debug See all command line options: - docker run osixia/keepalived:1.2.24 --help + docker run osixia/keepalived:1.3.0 --help ## Environment Variables @@ -84,7 +84,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.2.24 + docker run --env KEEPALIVED_UNICAST_PEERS="#PYTHON2BASH:['192.168.1.10', '192.168.1.11']" --detach osixia/keepalived:1.3.0 To convert yaml to python online : http://yaml-online-parser.appspot.com/ @@ -106,7 +106,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.2.24 + --env KEEPALIVED_PRIORITY="100" --detach osixia/keepalived:1.3.0 #### Link environment file @@ -114,7 +114,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.2.24 + --detach osixia/keepalived:1.3.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). @@ -124,13 +124,13 @@ This is the best solution if you have a private registry. Please refer to the [A ## Advanced User Guide -### Extend osixia/keepalived:1.2.24 image +### Extend osixia/keepalived:1.3.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/osixia/keepalived:1.2.24 + FROM osixia/osixia/keepalived:1.3.0 MAINTAINER Your Name ADD keepalived.conf /container/service/keepalived/assets/keepalived.conf @@ -149,7 +149,7 @@ Clone this project : Adapt Makefile, set your image NAME and VERSION, for example : NAME = osixia/keepalived - VERSION = 1.2.24 + VERSION = 1.3.0 becomes : NAME = billy-the-king/keepalived diff --git a/image/Dockerfile b/image/Dockerfile index 47f158e..0023e6d 100644 --- a/image/Dockerfile +++ b/image/Dockerfile @@ -4,7 +4,7 @@ FROM osixia/light-baseimage:0.2.5 MAINTAINER Bertrand Gouny # Keepalived version -ENV KEEPALIVED_VERSION 1.2.24 +ENV KEEPALIVED_VERSION 1.3.0 # Download, build and install Keepalived RUN apt-get -y update \ From db8f6bcf6b6f60035e7d2a0318805d9c9627a043 Mon Sep 17 00:00:00 2001 From: Bertrand Gouny Date: Mon, 21 Nov 2016 10:27:23 +0100 Subject: [PATCH 3/7] light-baseimage:0.2.6 --- image/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image/Dockerfile b/image/Dockerfile index 0023e6d..c04d153 100644 --- a/image/Dockerfile +++ b/image/Dockerfile @@ -1,6 +1,6 @@ # Use osixia/light-baseimage # sources: https://github.com/osixia/docker-light-baseimage -FROM osixia/light-baseimage:0.2.5 +FROM osixia/light-baseimage:0.2.6 MAINTAINER Bertrand Gouny # Keepalived version From 7f4d922e6ab26fe74d4f4ccf591f6b9e1e131656 Mon Sep 17 00:00:00 2001 From: Bertrand Gouny Date: Mon, 21 Nov 2016 10:31:42 +0100 Subject: [PATCH 4/7] libnl-route-3-dev --- image/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/image/Dockerfile b/image/Dockerfile index c04d153..e4eed37 100644 --- a/image/Dockerfile +++ b/image/Dockerfile @@ -12,6 +12,7 @@ RUN apt-get -y update \ curl \ gcc \ libnl-3-dev \ + libnl-route-3-dev \ libnl-genl-3-dev \ libssl-dev \ make \ From e31cf435e9d8ae4aaab4be51828d62507c3b5021 Mon Sep 17 00:00:00 2001 From: Bertrand Gouny Date: Mon, 21 Nov 2016 10:33:49 +0100 Subject: [PATCH 5/7] libnfnetlink --- image/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/image/Dockerfile b/image/Dockerfile index e4eed37..f930220 100644 --- a/image/Dockerfile +++ b/image/Dockerfile @@ -12,8 +12,9 @@ RUN apt-get -y update \ curl \ gcc \ libnl-3-dev \ - libnl-route-3-dev \ libnl-genl-3-dev \ + libnl-route-3-dev \ + libnfnetlink \ libssl-dev \ make \ pkg-config \ From 84ce87e02b96baffaa7edaa4b7b16a9bddfb636c Mon Sep 17 00:00:00 2001 From: Bertrand Gouny Date: Mon, 21 Nov 2016 10:35:11 +0100 Subject: [PATCH 6/7] libnfnetlink-dev --- image/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image/Dockerfile b/image/Dockerfile index f930220..8f4b6ab 100644 --- a/image/Dockerfile +++ b/image/Dockerfile @@ -14,7 +14,7 @@ RUN apt-get -y update \ libnl-3-dev \ libnl-genl-3-dev \ libnl-route-3-dev \ - libnfnetlink \ + libnfnetlink-dev \ libssl-dev \ make \ pkg-config \ From 6c7a9d15d99fd21f6e90e458c25b98eb833cf6be Mon Sep 17 00:00:00 2001 From: Bertrand Gouny Date: Mon, 21 Nov 2016 10:39:19 +0100 Subject: [PATCH 7/7] let libssl --- image/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image/Dockerfile b/image/Dockerfile index 8f4b6ab..5191443 100644 --- a/image/Dockerfile +++ b/image/Dockerfile @@ -25,7 +25,7 @@ RUN apt-get -y update \ && ./configure --with-kernel-dir=/lib/modules/$(uname -r)/build \ && make && make install \ && cd - && mkdir -p /etc/keepalived \ - && apt-get remove -y --purge --auto-remove curl make gcc pkg-config libssl-dev \ + && apt-get remove -y --purge --auto-remove curl make gcc pkg-config \ && rm -f keepalived.tar.gz \ && rm -rf /container/keepalived-sources \ && apt-get clean \