From 471f743e2087e290dc1ceb1daed44c6be4e9c621 Mon Sep 17 00:00:00 2001 From: Thomas Boerger Date: Sat, 2 Sep 2017 19:07:20 +0200 Subject: [PATCH] Simple additions like base image and microbadger webhook (#30) * Use specific plugin versions, pull latest versions and enable a microbadger webhook * Use the new plugins/base:multiarch image --- .drone.yml | 30 +++++++++++++++++++++--------- Dockerfile | 10 +--------- Dockerfile.arm | 10 +--------- Dockerfile.arm64 | 10 +--------- Dockerfile.windows | 2 -- 5 files changed, 24 insertions(+), 38 deletions(-) diff --git a/.drone.yml b/.drone.yml index 76bb8f2..72c24f4 100644 --- a/.drone.yml +++ b/.drone.yml @@ -5,12 +5,14 @@ workspace: pipeline: test: image: golang:1.9 + pull: true commands: - go vet - go test -cover -coverprofile=coverage.out build_linux_amd64: image: golang:1.9 + pull: true group: build environment: - GOOS=linux @@ -21,6 +23,7 @@ pipeline: build_linux_arm64: image: golang:1.9 + pull: true group: build environment: - GOOS=linux @@ -31,6 +34,7 @@ pipeline: build_linux_arm: image: golang:1.9 + pull: true group: build environment: - GOOS=linux @@ -42,6 +46,7 @@ pipeline: # build_windows_amd64: # image: golang:1.9-nanoserver + # pull: true # group: build # environment: # - GOOS=windows @@ -51,7 +56,8 @@ pipeline: # - go build -v -ldflags "-X main.build=${DRONE_BUILD_NUMBER}" -a -o release/windows/amd64/drone-s3-sync publish_linux_amd64: - image: plugins/docker + image: plugins/docker:17.05 + pull: true repo: plugins/s3-sync tags: [ latest, 1.1.0, 1.1, 1 ] secrets: [ docker_username, docker_password ] @@ -60,7 +66,8 @@ pipeline: event: push publish_linux_arm64: - image: plugins/docker + image: plugins/docker:17.05 + pull: true repo: plugins/s3-sync tags: [ linux-arm64 ] secrets: [ docker_username, docker_password ] @@ -70,7 +77,8 @@ pipeline: event: push publish_linux_arm: - image: plugins/docker + image: plugins/docker:17.05 + pull: true repo: plugins/s3-sync tags: [ linux-arm ] secrets: [ docker_username, docker_password ] @@ -80,7 +88,8 @@ pipeline: event: push # publish_windows_amd64: - # image: plugins/docker + # image: plugins/docker:17.05 + # pull: true # repo: plugins/s3-sync # tags: [ windows-amd64 ] # secrets: [ docker_username, docker_password ] @@ -89,8 +98,11 @@ pipeline: # branch: master # event: push - # microbadger: - # image: plugins/webhook - # secrets: [ webhook_url ] - # when: - # status: [ success ] + microbadger: + image: plugins/webhook:1 + pull: true + secrets: [ webhook_url ] + when: + branch: master + event: push + status: [ success ] diff --git a/Dockerfile b/Dockerfile index 20ab942..edef0c9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,6 @@ -FROM alpine:3.6 as alpine -RUN apk add -U --no-cache ca-certificates mailcap - -FROM scratch +FROM plugins/base:multiarch MAINTAINER Drone.IO Community -ENV GODEBUG=netdns=go - -COPY --from=alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ -COPY --from=alpine /etc/mime.types /etc/ - LABEL org.label-schema.version=latest LABEL org.label-schema.vcs-url="https://github.com/drone-plugins/drone-s3-sync.git" LABEL org.label-schema.name="Drone S3 Sync" diff --git a/Dockerfile.arm b/Dockerfile.arm index a28f4bc..8842e2c 100644 --- a/Dockerfile.arm +++ b/Dockerfile.arm @@ -1,14 +1,6 @@ -FROM alpine:3.6 as alpine -RUN apk add -U --no-cache ca-certificates mailcap - -FROM scratch +FROM plugins/base:multiarch MAINTAINER Drone.IO Community -ENV GODEBUG=netdns=go - -COPY --from=alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ -COPY --from=alpine /etc/mime.types /etc/ - LABEL org.label-schema.version=latest LABEL org.label-schema.vcs-url="https://github.com/drone-plugins/drone-s3-sync.git" LABEL org.label-schema.name="Drone S3 Sync" diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index dde72f4..1991c6a 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -1,14 +1,6 @@ -FROM alpine:3.6 as alpine -RUN apk add -U --no-cache ca-certificates mailcap - -FROM scratch +FROM plugins/base:multiarch MAINTAINER Drone.IO Community -ENV GODEBUG=netdns=go - -COPY --from=alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ -COPY --from=alpine /etc/mime.types /etc/ - LABEL org.label-schema.version=latest LABEL org.label-schema.vcs-url="https://github.com/drone-plugins/drone-s3-sync.git" LABEL org.label-schema.name="Drone S3 Sync" diff --git a/Dockerfile.windows b/Dockerfile.windows index d719383..e51e96f 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -1,8 +1,6 @@ FROM microsoft/nanoserver:latest MAINTAINER Drone.IO Community -ENV GODEBUG=netdns=go - LABEL org.label-schema.version=latest LABEL org.label-schema.vcs-url="https://github.com/drone-plugins/drone-s3-sync.git" LABEL org.label-schema.name="Drone S3 Sync"