From b642c9c23ebf23bcbc8610ef42d1ac74b7282c9a Mon Sep 17 00:00:00 2001 From: Bertrand Gouny Date: Fri, 15 Nov 2019 12:00:50 +0100 Subject: [PATCH 2/2] keepalived 2.0.19 --- .travis.yml | 101 +++++++++++++++++++++++++++++++++++++++++++++++ CHANGELOG.md | 7 ++++ Makefile | 5 ++- README.md | 56 +++++++++++++------------- image/Dockerfile | 4 +- 5 files changed, 142 insertions(+), 31 deletions(-) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..1e10cda --- /dev/null +++ b/.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 diff --git a/CHANGELOG.md b/CHANGELOG.md index 97e6c7e..d1feb90 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,13 @@ 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.19] - 2019-11-15 +## Added + - Multiarch support + +### Changed + - Upgrade keepalived version to 2.0.19 + ## [2.0.17] - 2019-07-05 ### Added - Curl diff --git a/Makefile b/Makefile index 3fbf0bc..55de332 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ NAME = osixia/keepalived -VERSION = 2.0.17 +VERSION = 2.0.19 .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 diff --git a/README.md b/README.md index 9d9a0c4..a9c3417 100644 --- a/README.md +++ b/README.md @@ -6,35 +6,35 @@ [hub]: https://hub.docker.com/r/osixia/keepalived/ -Latest release: 2.0.17 - Keepalived 2.0.17 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/keepalived/)  +Latest release: 2.0.19 - Keepalived 2.0.19 - [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 Keepalived config](#Use-your-own-Keepalived-config) - - [Fix docker mounted file problems](#Fix-docker-mounted-file-problems) - - [Debug](#Debug) - - [Environment Variables](#Environment-Variables) - - [Set your own environment variables](#Set-your-own-environment-variables) - - [Use command line argument](#Use-command-line-argument) - - [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:2.0.17 image](#Extend-osixiakeepalived2017-image) - - [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](#quick-start) + - [Beginner Guide](#beginner-guide) + - [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) + - [Set your own environment variables](#set-your-own-environment-variables) + - [Use command line argument](#use-command-line-argument) + - [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:2.0.19 image](#extend-osixiakeepalived2019-image) + - [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 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 --cap-add=NET_BROADCAST --cap-add=NET_RAW --net=host -d osixia/keepalived:2.0.17 + docker run --cap-add=NET_ADMIN --cap-add=NET_BROADCAST --cap-add=NET_RAW --net=host -d osixia/keepalived:2.0.19 ## Beginner Guide @@ -44,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:2.0.17 + docker run --volume /data/my-keepalived.conf:/container/service/keepalived/assets/keepalived.conf --detach osixia/keepalived:2.0.19 - Add your config file by extending or cloning this image, please refer to the [Advanced User Guide](#advanced-user-guide) @@ -54,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:2.0.17 --copy-service + docker run [your options] osixia/keepalived:2.0.19 --copy-service ### Debug @@ -63,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:2.0.17 --loglevel debug + docker run --detach osixia/keepalived:2.0.19 --loglevel debug See all command line options: - docker run osixia/keepalived:2.0.17 --help + docker run osixia/keepalived:2.0.19 --help ## Environment Variables @@ -88,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:2.0.17 + docker run --env KEEPALIVED_UNICAST_PEERS="#PYTHON2BASH:['192.168.1.10', '192.168.1.11']" --detach osixia/keepalived:2.0.19 To convert yaml to python online : http://yaml-online-parser.appspot.com/ @@ -112,7 +112,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:2.0.17 + --env KEEPALIVED_PRIORITY="100" --detach osixia/keepalived:2.0.19 #### Link environment file @@ -120,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:2.0.17 + --detach osixia/keepalived:2.0.19 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). @@ -130,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:2.0.17 image +### Extend osixia/keepalived:2.0.19 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:2.0.17 + FROM osixia/keepalived:2.0.19 MAINTAINER Your Name ADD keepalived.conf /container/service/keepalived/assets/keepalived.conf diff --git a/image/Dockerfile b/image/Dockerfile index 6cae9fb..961c8a4 100644 --- a/image/Dockerfile +++ b/image/Dockerfile @@ -1,9 +1,9 @@ # Use osixia/light-baseimage # sources: https://github.com/osixia/docker-light-baseimage -FROM osixia/alpine-light-baseimage:0.1.6 +FROM osixia/light-baseimage:alpine-0.1.6-dev # Keepalived version -ARG KEEPALIVED_VERSION=2.0.17 +ARG KEEPALIVED_VERSION=2.0.19 # Download, build and install Keepalived RUN apk --no-cache add \