Merge branch 'release-2.0.20' into stable

keeping curl

.travis.yml

@@ -0,0 +1,101 @@
+language: bash
+
+services:
+  - docker
+env:
+  global:
+    - NAME="osixia/keepalived"
+    - VERSION="${TRAVIS_BRANCH}-dev"
+  matrix:
+    - TARGET_ARCH=amd64 QEMU_ARCH=x86_64
+    - TARGET_ARCH=arm32v7 QEMU_ARCH=arm
+    - TARGET_ARCH=arm64v8 QEMU_ARCH=aarch64
+
+addons:
+  apt:
+    # The docker manifest command was added in docker-ee version 18.x
+    # So update our current installation and we also have to enable the experimental features.
+    sources:
+      - sourceline: "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
+        key_url: "https://download.docker.com/linux/ubuntu/gpg"
+    packages:
+      - docker-ce
+
+before_install:
+  - docker --version
+  - mkdir $HOME/.docker
+  - 'echo "{" > $HOME/.docker/config.json'
+  - 'echo "  \"experimental\": \"enabled\"" >> $HOME/.docker/config.json'
+  - 'echo "}" >> $HOME/.docker/config.json'
+  - sudo service docker restart
+
+install:
+  # For cross buidling our images
+  # This is necessary because travis-ci.org has only x86_64 machines.
+  # If travis-ci.org gets native arm builds, probably this step is not
+  # necessary any more.
+  - docker run --rm --privileged multiarch/qemu-user-static:register --reset
+    # Bats is necessary for the UT
+  - curl -o bats.tar.gz -SL https://github.com/bats-core/bats-core/archive/v1.1.0.tar.gz
+  - mkdir bats-core && tar -xf bats.tar.gz -C bats-core --strip-components=1
+  - cd bats-core/
+  - sudo ./install.sh /usr/local
+  - cd ..
+
+before_script:
+  # Set baseimage.
+  - sed -i -e "s/FROM \(.*\)/FROM \1-${TARGET_ARCH}/g" image/Dockerfile;
+  - cat image/Dockerfile;
+  # If this is a tag then change the VERSION variable to only have the
+  # tag name and not also the commit hash.
+  - if [ -n "$TRAVIS_TAG" ]; then
+    VERSION=$(echo "${TRAVIS_TAG}" | sed -e 's/\(.*\)[-v]\(.*\)/\1\2/g');
+    fi
+  - if [ "${TRAVIS_BRANCH}" == 'stable' ]; then
+    VERSION="stable";
+    fi
+
+script:
+  - make build-nocache NAME=${NAME} VERSION=${VERSION}-${TARGET_ARCH}
+  # Run the test and if the test fails mark the build as failed.
+  - make test NAME=${NAME} VERSION=${VERSION}-${TARGET_ARCH}
+
+before_deploy:
+  - docker run -d --name test_image ${NAME}:${VERSION}-${TARGET_ARCH} sleep 10
+  - sleep 5
+  - sudo docker ps | grep -q test_image
+  # To have `DOCKER_USER` and `DOCKER_PASS`
+  # use `travis env set`.
+  - docker login -u "$DOCKER_USER" -p "$DOCKER_PASS";
+  - make tag NAME=${NAME} VERSION=${VERSION}-${TARGET_ARCH}
+
+deploy:
+  provider: script
+  on:
+    all_branches: true
+  script: make push NAME=${NAME} VERSION=${VERSION}-${TARGET_ARCH}
+
+jobs:
+  include:
+    - stage: Manifest creation
+      install: skip
+      script: skip
+      after_deploy:
+        - docker login -u "$DOCKER_USER" -p "$DOCKER_PASS";
+        - docker manifest create ${NAME}:${VERSION} ${NAME}:${VERSION}-amd64 ${NAME}:${VERSION}-arm32v7 ${NAME}:${VERSION}-arm64v8;
+          docker manifest annotate ${NAME}:${VERSION} ${NAME}:${VERSION}-amd64 --os linux --arch amd64;
+          docker manifest annotate ${NAME}:${VERSION} ${NAME}:${VERSION}-arm32v7 --os linux --arch arm --variant v7;
+          docker manifest annotate ${NAME}:${VERSION} ${NAME}:${VERSION}-arm64v8 --os linux --arch arm64 --variant v8;
+
+        # The latest tag is coming from the stable branch of the repo
+        - if [ "${TRAVIS_BRANCH}" == 'stable' ]; then
+          docker manifest create ${NAME}:latest ${NAME}:${VERSION}-amd64 ${NAME}:${VERSION}-arm32v7 ${NAME}:${VERSION}-arm64v8;
+          docker manifest annotate ${NAME}:latest ${NAME}:${VERSION}-amd64 --os linux --arch amd64;
+          docker manifest annotate ${NAME}:latest ${NAME}:${VERSION}-arm32v7 --os linux --arch arm --variant v7;
+          docker manifest annotate ${NAME}:latest ${NAME}:${VERSION}-arm64v8 --os linux --arch arm64 --variant v8;
+          fi
+
+        - docker manifest push ${NAME}:${VERSION};
+          if [ "${TRAVIS_BRANCH}" == 'stable' ]; then
+          docker manifest push ${NAME}:latest;
+          fi

CHANGELOG.md

@@ -5,6 +5,66 @@ 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.20] - 2020-02-07
+### Changed
+  - Upgrade keepalived version to 2.0.20
+
+### Fixed
+  - When system reboot or unexpected shutdown, keepalived never start up again #18 #25
+
+## [2.0.19] - 2019-11-15
+## Added
+  - Multiarch support
+
+### Changed
+  - Upgrade keepalived version to 2.0.19
+
+## [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
+
+### Changed
+  - Upgrade keepalived version to 2.0.16
+
+
+## [2.0.15] - 2019-04-05
+### Changed
+  - Upgrade keepalived version to 2.0.15
+
+## [2.0.13] - 2019-02-27
+### Changed
+  - Upgrade keepalived version to 2.0.13
+
+## [2.0.12] - 2019-01-30
+### Changed
+  - Upgrade keepalived version to 2.0.12
+
+## [2.0.11] - 2019-01-21
+### Added
+  - KEEPALIVED_STATE environment variable
+
+### Changed
+  - Upgrade keepalived version to 2.0.11
+
+## [2.0.10] - 2018-11-13
+### Changed
+  - Upgrade keepalived version to 2.0.10
+
+### Removed 
+  - track_interface in keepalived.conf
+
+## [1.4.5] - 2018-06-02
+### Changed
+  - Upgrade keepalived version to 1.4.5
+
 ## [1.4.4] - 2018-05-14
 ### Added
   - Router ID with environment KEEPALIVED_ROUTER_ID #16
@@ -148,6 +208,16 @@ and this project follows keepalived versioning.
 ## 0.1.0 - 2015-06-16
 Initial release
 
+[2.0.20]: https://github.com/osixia/docker-keepalived/compare/v2.0.19...v2.0.20
+[2.0.19]: https://github.com/osixia/docker-keepalived/compare/v2.0.17...v2.0.19
+[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.0.12]: https://github.com/osixia/docker-keepalived/compare/v2.0.11...v2.0.12
+[2.0.11]: https://github.com/osixia/docker-keepalived/compare/v2.0.10...v2.0.11
+[2.0.10]: https://github.com/osixia/docker-keepalived/compare/v1.4.5...v2.0.10
+[1.4.5]: https://github.com/osixia/docker-keepalived/compare/v1.4.4...v1.4.5
 [1.4.4]: https://github.com/osixia/docker-keepalived/compare/v1.4.2...v1.4.4
 [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

Makefile

@@ -1,5 +1,5 @@
 NAME = osixia/keepalived
-VERSION = 1.4.4
+VERSION = 2.0.20
 
 .PHONY: build build-nocache test tag-latest push push-latest release git-tag-version
 
@@ -12,6 +12,9 @@ build-nocache:
 test:
 	env NAME=$(NAME) VERSION=$(VERSION) bats test/test.bats
 
+tag:
+	docker tag $(NAME):$(VERSION) $(NAME):$(VERSION)
+
 tag-latest:
 	docker tag $(NAME):$(VERSION) $(NAME):latest
 

README.md

@@ -6,14 +6,15 @@
 
 [hub]: https://hub.docker.com/r/osixia/keepalived/
 
-Latest release: 1.4.4 - Keepalived 1.4.4 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/keepalived/) 
+Latest release: 2.0.20 - Keepalived 2.0.20 - [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 Backup Manager config](#use-your-own-backup-manager-config)
+		- [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)
@@ -22,7 +23,7 @@ Latest release: 1.4.4 - Keepalived 1.4.4 - [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.4 image](#extend-osixiakeepalived144-image)
+		- [Extend osixia/keepalived:2.0.20 image](#extend-osixiakeepalived2020-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 +34,7 @@ Latest release: 1.4.4 - Keepalived 1.4.4 - [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.4
+    docker run --cap-add=NET_ADMIN --cap-add=NET_BROADCAST --cap-add=NET_RAW --net=host -d osixia/keepalived:2.0.20
 
 ## Beginner Guide
 
@@ -43,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:1.4.4
+      docker run --volume /data/my-keepalived.conf:/container/service/keepalived/assets/keepalived.conf --detach osixia/keepalived:2.0.20
 
 - Add your config file by extending or cloning this image, please refer to the [Advanced User Guide](#advanced-user-guide)
 
@@ -53,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:1.4.4 --copy-service
+		docker run [your options] osixia/keepalived:2.0.20 --copy-service
 
 ### Debug
 
@@ -62,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:1.4.4 --loglevel debug
+	docker run --detach osixia/keepalived:2.0.20 --loglevel debug
 
 See all command line options:
 
-	docker run osixia/keepalived:1.4.4 --help
+	docker run osixia/keepalived:2.0.20 --help
 
 
 ## Environment Variables
@@ -87,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:1.4.4
+      docker run --env KEEPALIVED_UNICAST_PEERS="#PYTHON2BASH:['192.168.1.10', '192.168.1.11']" --detach osixia/keepalived:2.0.20
 
   To convert yaml to python online : http://yaml-online-parser.appspot.com/
 
@@ -103,13 +104,15 @@ See how to [set your own environment variables](#set-your-own-environment-variab
 
 - **KEEPALIVED_COMMAND_LINE_ARGUMENTS** Keepalived command line arguments; Defaults to `--log-detail --dump-conf`
 
+- **KEEPALIVED_STATE** The starting state of keepalived; it can either be MASTER or BACKUP.
+
 ### Set your own environment variables
 
 #### Use command line argument
 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.4
+    --env KEEPALIVED_PRIORITY="100" --detach osixia/keepalived:2.0.20
 
 
 #### Link environment file
@@ -117,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:1.4.4
+	--detach osixia/keepalived:2.0.20
 
 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).
 
@@ -127,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:1.4.4 image
+### Extend osixia/keepalived:2.0.20 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.4
+    FROM osixia/keepalived:2.0.20
     MAINTAINER Your Name <your@name.com>
 
     ADD keepalived.conf /container/service/keepalived/assets/keepalived.conf
@@ -172,7 +175,7 @@ Run your image :
 
 We use **Bats** (Bash Automated Testing System) to test this image:
 
-> [https://github.com/sstephenson/bats](https://github.com/sstephenson/bats)
+> [https://github.com/bats-core/bats-core](https://github.com/bats-core/bats-core)
 
 Install Bats, and in this project directory run :
 

image/Dockerfile

@@ -1,10 +1,9 @@
 # Use osixia/light-baseimage
 # sources: https://github.com/osixia/docker-light-baseimage
-FROM osixia/alpine-light-baseimage:0.1.5
+FROM osixia/light-baseimage:alpine-0.1.6-dev
-MAINTAINER Bertrand Gouny <bertrand.gouny@osixia.net>
 
 # Keepalived version
-ARG KEEPALIVED_VERSION=1.4.4
+ARG KEEPALIVED_VERSION=2.0.20
 
 # Download, build and install Keepalived
 RUN apk --no-cache add \
@@ -34,7 +33,6 @@ RUN apk --no-cache add \
     && rm -rf /container/keepalived-sources \
     && apk --no-cache del \
     autoconf \
-        curl \
     gcc \
     ipset-dev \
     iptables-dev \
@@ -44,7 +42,6 @@ RUN apk --no-cache add \
     musl-dev \
     openssl-dev
 
-
 # Add service directory to /container/service
 ADD service /container/service
 

image/environment/default.yaml

@@ -18,3 +18,5 @@ KEEPALIVED_VIRTUAL_IPS:
 KEEPALIVED_NOTIFY: /container/service/keepalived/assets/notify.sh
 
 KEEPALIVED_ROUTER_ID: 51
+
+KEEPALIVED_STATE: BACKUP

image/service/keepalived/assets/keepalived.conf

@@ -5,11 +5,7 @@ global_defs {
 vrrp_instance VI_1 {
   interface {{ KEEPALIVED_INTERFACE }}
 
-  track_interface {
+  state {{ KEEPALIVED_STATE }}
-    {{ KEEPALIVED_INTERFACE }}
-  }
-
-  state BACKUP
   virtual_router_id {{ KEEPALIVED_ROUTER_ID }}
   priority {{ KEEPALIVED_PRIORITY }}
   nopreempt

image/service/keepalived/startup.sh

@@ -11,6 +11,7 @@ if [ ! -e "$FIRST_START_DONE" ]; then
   #
   # bootstrap config
   #
+  sed -i "s|{{ KEEPALIVED_STATE }}|$KEEPALIVED_STATE|g" ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf
   sed -i "s|{{ KEEPALIVED_ROUTER_ID }}|$KEEPALIVED_ROUTER_ID|g" ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf
   sed -i "s|{{ KEEPALIVED_INTERFACE }}|$KEEPALIVED_INTERFACE|g" ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf
   sed -i "s|{{ KEEPALIVED_PRIORITY }}|$KEEPALIVED_PRIORITY|g" ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf
@@ -63,4 +64,6 @@ if [ ! -e "/usr/local/etc/keepalived/keepalived.conf" ]; then
   ln -sf ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf /usr/local/etc/keepalived/keepalived.conf
 fi
 
+rm -f /run/keepalived.pid || true
+
 exit 0