From 94c66d7319f2a35f1ce83d26b3796b44702dd16b Mon Sep 17 00:00:00 2001 From: Bertrand Gouny Date: Tue, 15 Aug 2017 15:06:29 +0200 Subject: [PATCH 2/3] keepalived v1.3.6 --- 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 e24bc19..f2ab807 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ # Changelog ## 1.3.6 + - Keepalived version 1.3.6 + +## 1.3.5-1 - Fix startup.sh and finish.sh ip address removal - Use linux alpine - Add keepalived_script script user diff --git a/Makefile b/Makefile index df61483..24af0ff 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ NAME = osixia/keepalived -VERSION = 1.3.5-1 +VERSION = 1.3.6 .PHONY: build build-nocache test tag-latest push push-latest release git-tag-version diff --git a/README.md b/README.md index e16b4e1..37c280e 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ [hub]: https://hub.docker.com/r/osixia/keepalived/ -Latest release: 1.3.5-1 - Keepalived 1.3.5 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/keepalived/)  +Latest release: 1.3.6 - Keepalived 1.3.6 - [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.5-1 - Keepalived 1.3.5 - [Changelog](CHANGELOG.md) | [Docker - [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.5-1 image](#extend-osixiakeepalived135-1-image) + - [Extend osixia/keepalived:1.3.6 image](#extend-osixiakeepalived136-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.5-1 - Keepalived 1.3.5 - [Changelog](CHANGELOG.md) | [Docker 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.5-1 + docker run --cap-add=NET_ADMIN --net=host -d osixia/keepalived:1.3.6 ## 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.5-1 + docker run --volume /data/my-keepalived.conf:/container/service/keepalived/assets/keepalived.conf --detach osixia/keepalived:1.3.6 - 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.5-1 --copy-service + docker run [your options] osixia/keepalived:1.3.6 --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.5-1 --loglevel debug + docker run --detach osixia/keepalived:1.3.6 --loglevel debug See all command line options: - docker run osixia/keepalived:1.3.5-1 --help + docker run osixia/keepalived:1.3.6 --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.5-1 + docker run --env KEEPALIVED_UNICAST_PEERS="#PYTHON2BASH:['192.168.1.10', '192.168.1.11']" --detach osixia/keepalived:1.3.6 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.5-1 + --env KEEPALIVED_PRIORITY="100" --detach osixia/keepalived:1.3.6 #### 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.5-1 + --detach osixia/keepalived:1.3.6 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.5-1 image +### Extend osixia/keepalived:1.3.6 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.5-1 + FROM osixia/keepalived:1.3.6 MAINTAINER Your Name ADD keepalived.conf /container/service/keepalived/assets/keepalived.conf diff --git a/image/Dockerfile b/image/Dockerfile index ca08a7f..5e093ee 100644 --- a/image/Dockerfile +++ b/image/Dockerfile @@ -4,7 +4,7 @@ FROM osixia/alpine-light-baseimage:0.1.4 MAINTAINER Bertrand Gouny # Keepalived version -ARG KEEPALIVED_VERSION=1.3.5 +ARG KEEPALIVED_VERSION=1.3.6 RUN addgroup -S keepalived_script && adduser -D -S -G keepalived_script keepalived_script From ae2cfe0ec442481bb043265e8fcf9c78ca371a34 Mon Sep 17 00:00:00 2001 From: Bertrand Gouny Date: Tue, 15 Aug 2017 17:14:39 +0200 Subject: [PATCH 3/3] Remove keepalived_script script user, to run scripts with root user --- CHANGELOG.md | 1 + image/Dockerfile | 2 -- image/service/keepalived/startup.sh | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f2ab807..7c5687f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## 1.3.6 - Keepalived version 1.3.6 + - Remove keepalived_script script user, to run scripts with root user ## 1.3.5-1 - Fix startup.sh and finish.sh ip address removal diff --git a/image/Dockerfile b/image/Dockerfile index 5e093ee..9a7a77d 100644 --- a/image/Dockerfile +++ b/image/Dockerfile @@ -6,8 +6,6 @@ MAINTAINER Bertrand Gouny # Keepalived version ARG KEEPALIVED_VERSION=1.3.6 -RUN addgroup -S keepalived_script && adduser -D -S -G keepalived_script keepalived_script - # Download, build and install Keepalived RUN apk --no-cache add \ curl \ diff --git a/image/service/keepalived/startup.sh b/image/service/keepalived/startup.sh index 4fae6e3..5845974 100755 --- a/image/service/keepalived/startup.sh +++ b/image/service/keepalived/startup.sh @@ -17,7 +17,6 @@ if [ ! -e "$FIRST_START_DONE" ]; then if [ -n "$KEEPALIVED_NOTIFY" ]; then sed -i "s|{{ KEEPALIVED_NOTIFY }}|notify \"$KEEPALIVED_NOTIFY\"|g" ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf - chown keepalived_script:keepalived_script $KEEPALIVED_NOTIFY chmod +x $KEEPALIVED_NOTIFY else sed -i "/{{ KEEPALIVED_NOTIFY }}/d" ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf