From 0cd6e6954afee67ddd0418bfa04b4aed78dcb7ae Mon Sep 17 00:00:00 2001 From: Simon Aronsson Date: Sun, 7 Apr 2019 16:51:37 +0200 Subject: [PATCH] minor changes to make it work with new goreleaser version --- dockerfile/amd64/Dockerfile | 7 ------- dockerfile/arm64v8/Dockerfile | 7 ------- dockerfile/armhf/Dockerfile | 7 ------- dockerfile/{386 => i386}/Dockerfile | 7 ------- goreleaser.yml | 18 ++++++++++-------- 5 files changed, 10 insertions(+), 36 deletions(-) rename dockerfile/{386 => i386}/Dockerfile (73%) diff --git a/dockerfile/amd64/Dockerfile b/dockerfile/amd64/Dockerfile index 13b19e8..7594771 100644 --- a/dockerfile/amd64/Dockerfile +++ b/dockerfile/amd64/Dockerfile @@ -1,18 +1,11 @@ -# -# Alpine image to get some needed data -# FROM alpine:latest as alpine RUN apk add --no-cache \ ca-certificates \ tzdata -# -# Image -# FROM scratch LABEL "com.centurylinklabs.watchtower"="true" -# copy files from other containers COPY --from=alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt COPY --from=alpine /usr/share/zoneinfo /usr/share/zoneinfo diff --git a/dockerfile/arm64v8/Dockerfile b/dockerfile/arm64v8/Dockerfile index 13b19e8..7594771 100644 --- a/dockerfile/arm64v8/Dockerfile +++ b/dockerfile/arm64v8/Dockerfile @@ -1,18 +1,11 @@ -# -# Alpine image to get some needed data -# FROM alpine:latest as alpine RUN apk add --no-cache \ ca-certificates \ tzdata -# -# Image -# FROM scratch LABEL "com.centurylinklabs.watchtower"="true" -# copy files from other containers COPY --from=alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt COPY --from=alpine /usr/share/zoneinfo /usr/share/zoneinfo diff --git a/dockerfile/armhf/Dockerfile b/dockerfile/armhf/Dockerfile index 13b19e8..7594771 100644 --- a/dockerfile/armhf/Dockerfile +++ b/dockerfile/armhf/Dockerfile @@ -1,18 +1,11 @@ -# -# Alpine image to get some needed data -# FROM alpine:latest as alpine RUN apk add --no-cache \ ca-certificates \ tzdata -# -# Image -# FROM scratch LABEL "com.centurylinklabs.watchtower"="true" -# copy files from other containers COPY --from=alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt COPY --from=alpine /usr/share/zoneinfo /usr/share/zoneinfo diff --git a/dockerfile/386/Dockerfile b/dockerfile/i386/Dockerfile similarity index 73% rename from dockerfile/386/Dockerfile rename to dockerfile/i386/Dockerfile index 13b19e8..7594771 100644 --- a/dockerfile/386/Dockerfile +++ b/dockerfile/i386/Dockerfile @@ -1,18 +1,11 @@ -# -# Alpine image to get some needed data -# FROM alpine:latest as alpine RUN apk add --no-cache \ ca-certificates \ tzdata -# -# Image -# FROM scratch LABEL "com.centurylinklabs.watchtower"="true" -# copy files from other containers COPY --from=alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt COPY --from=alpine /usr/share/zoneinfo /usr/share/zoneinfo diff --git a/goreleaser.yml b/goreleaser.yml index a81dbf8..695f59f 100644 --- a/goreleaser.yml +++ b/goreleaser.yml @@ -6,7 +6,7 @@ build: - windows goarch: - amd64 - - 386 + - i386 - arm - arm64 archive: @@ -16,7 +16,7 @@ archive: arm: armhf arm64: arm64v8 amd64: amd64 - 386: 386 + 386: i386 darwin: macOS linux: linux format_overrides: @@ -38,13 +38,15 @@ dockers: - watchtower - goos: linux - goarch: 386 + goarch: i386 goarm: '' - binary: watchtower - image: v2tec/watchtower - dockerfile: dockerfile/386/Dockerfile - tag_templates: - - '386-{{ .Version }}' + dockerfile: dockerfile/i386/Dockerfile + build_flag_templates: + - "--label=com.centurylinklabs.watchtower=true" + image_templates: + - containrrr/watchtower:i386-{{ .Version }} + binaries: + - watchtower - goos: linux goarch: arm