From cb809b86cf5bf55660b3e0892772e9231cee447c Mon Sep 17 00:00:00 2001 From: Jari Kolehmainen Date: Sun, 14 Jun 2020 20:05:19 +0300 Subject: [PATCH 1/6] v0.3.2 Signed-off-by: Jari Kolehmainen --- lib/flying_shuttle.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/flying_shuttle.rb b/lib/flying_shuttle.rb index 41d43e9..90cfc84 100644 --- a/lib/flying_shuttle.rb +++ b/lib/flying_shuttle.rb @@ -3,7 +3,7 @@ require 'concurrent' module FlyingShuttle - VERSION = '0.3.1' + VERSION = '0.3.2' REGION_LABEL = 'failure-domain.beta.kubernetes.io/region' end From 7d16bbd31b72c25dd8cf4ac7adcef1aaebbff743 Mon Sep 17 00:00:00 2001 From: Jari Kolehmainen Date: Sun, 14 Jun 2020 21:16:04 +0300 Subject: [PATCH 2/6] tweak drone Signed-off-by: Jari Kolehmainen --- .drone.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/.drone.yml b/.drone.yml index b3cb5f7..e56631c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -49,3 +49,26 @@ steps: auto_tag: true when: event: [tag, push] +--- +kind: pipeline +name: arm64 +platform: + os: linux + arch: amd64 +steps: + - name: manifest + image: plugins/manifest + settings: + username: + from_secret: hub_username + password: + from_secret: hub_password + target: docker.io/kontenapharos/weave-flying-shuttle:${DRONE_TAG} + template: quay.io/kontena/weave-flying-shuttle-ARCH:${DRONE_TAG} + platforms: + - linux/amd64 + - linux/arm64 + ignore_missing: true +depends_on: + - amd64 + - arm64 From 7d839b3506ffeac4232c64d21345eb3fb94e8017 Mon Sep 17 00:00:00 2001 From: Jari Kolehmainen Date: Sun, 14 Jun 2020 21:18:09 +0300 Subject: [PATCH 3/6] tweak drone Signed-off-by: Jari Kolehmainen --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index e56631c..252fbcf 100644 --- a/.drone.yml +++ b/.drone.yml @@ -51,7 +51,7 @@ steps: event: [tag, push] --- kind: pipeline -name: arm64 +name: manifest platform: os: linux arch: amd64 From 8ff95cf562e9d058b7b098aa6e5436bbbefdf421 Mon Sep 17 00:00:00 2001 From: Jari Kolehmainen Date: Sun, 14 Jun 2020 21:23:30 +0300 Subject: [PATCH 4/6] tweak drone Signed-off-by: Jari Kolehmainen --- .drone.yml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/.drone.yml b/.drone.yml index 252fbcf..b62c345 100644 --- a/.drone.yml +++ b/.drone.yml @@ -13,12 +13,11 @@ steps: - name: docker image: plugins/docker settings: - registry: quay.io username: - from_secret: docker_username + from_secret: hub_username password: - from_secret: docker_password - repo: quay.io/kontena/weave-flying-shuttle-amd64 + from_secret: hub_password + repo: docker.io/kontenapharos/weave-flying-shuttle-amd64 dockerfile: Dockerfile auto_tag: true when: @@ -39,12 +38,11 @@ steps: - name: docker image: plugins/docker settings: - registry: quay.io username: - from_secret: docker_username + from_secret: hub_username password: - from_secret: docker_password - repo: quay.io/kontena/weave-flying-shuttle-arm64 + from_secret: hub_password + repo: docker.io/kontenapharos/weave-flying-shuttle-arm64 dockerfile: Dockerfile auto_tag: true when: @@ -64,7 +62,7 @@ steps: password: from_secret: hub_password target: docker.io/kontenapharos/weave-flying-shuttle:${DRONE_TAG} - template: quay.io/kontena/weave-flying-shuttle-ARCH:${DRONE_TAG} + template: docker.io/kontenapharos/weave-flying-shuttle-ARCH:${DRONE_TAG} platforms: - linux/amd64 - linux/arm64 From cec8960b010ba8679289496b6b416bbda1a1abf0 Mon Sep 17 00:00:00 2001 From: Jari Kolehmainen Date: Sun, 14 Jun 2020 21:26:32 +0300 Subject: [PATCH 5/6] tweak drone Signed-off-by: Jari Kolehmainen --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index b62c345..a8cf265 100644 --- a/.drone.yml +++ b/.drone.yml @@ -61,8 +61,8 @@ steps: from_secret: hub_username password: from_secret: hub_password - target: docker.io/kontenapharos/weave-flying-shuttle:${DRONE_TAG} - template: docker.io/kontenapharos/weave-flying-shuttle-ARCH:${DRONE_TAG} + target: docker.io/kontenapharos/weave-flying-shuttle:${DRONE_TAG##v} + template: docker.io/kontenapharos/weave-flying-shuttle-ARCH:${DRONE_TAG##v} platforms: - linux/amd64 - linux/arm64 From 1b99d522b3225f1a75a10ba368cb63ce18b980f5 Mon Sep 17 00:00:00 2001 From: Jari Kolehmainen Date: Mon, 15 Jun 2020 07:53:12 +0300 Subject: [PATCH 6/6] fix dockerfile Signed-off-by: Jari Kolehmainen --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6ca04a8..2a3edfa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,8 @@ FROM alpine:3.8 LABEL maintainer="Kontena, Inc. " RUN apk update && apk --update add tzdata ruby ruby-irb ruby-bigdecimal \ - ruby-io-console ruby-json ca-certificates openssl iptables iproute2 + ruby-io-console ruby-json ruby-etc \ + ca-certificates openssl iptables iproute2 ADD Gemfile /app/ ADD Gemfile.lock /app/