refactor goreleaser images

mittwald · Mar 19, 2020 · b82ac82 · b82ac82
1 parent fb8fc76
commit b82ac82
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 13 deletions.
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -2,7 +2,6 @@ before:
   hooks:
     - go vet ./...
     - go test ./...
-    - go build
 builds:
   -
     env:
@@ -34,8 +33,9 @@ dockers:
     image_templates:
     - quay.io/mittwald/kubernetes-replicator:latest
     - quay.io/mittwald/kubernetes-replicator:stable
-    - quay.io/mittwald/kubernetes-replicator:{{ .Env.TRAVIS_BRANCH }}
-    - quay.io/mittwald/kubernetes-replicator:{{ .Env.TRAVIS_BRANCH }}-go{{ .Env.GO_VERSION }}
+    - quay.io/mittwald/kubernetes-replicator:v{{ .Major }}
+    - quay.io/mittwald/kubernetes-replicator:v{{ .Major }}.{{ .Minor }}
+    - quay.io/mittwald/kubernetes-replicator:{{ .Tag }}
     binaries:
       - kubernetes-replicator
     goos: linux
@@ -46,8 +46,9 @@ dockers:
     image_templates:
     - quay.io/mittwald/kubernetes-replicator-arm64:latest
     - quay.io/mittwald/kubernetes-replicator-arm64:stable
-    - quay.io/mittwald/kubernetes-replicator-arm64:{{ .Env.TRAVIS_BRANCH }}
-    - quay.io/mittwald/kubernetes-replicator-arm64:{{ .Env.TRAVIS_BRANCH }}-go{{ .Env.GO_VERSION }}
+    - quay.io/mittwald/kubernetes-replicator-arm64:v{{ .Major }}
+    - quay.io/mittwald/kubernetes-replicator-arm64:v{{ .Major }}.{{ .Minor }}
+    - quay.io/mittwald/kubernetes-replicator-arm64:{{ .Tag }}
     binaries:
       - kubernetes-replicator
     goos: linux
@@ -58,8 +59,9 @@ dockers:
     image_templates:
     - quay.io/mittwald/kubernetes-replicator-armv5:latest
     - quay.io/mittwald/kubernetes-replicator-armv5:stable
-    - quay.io/mittwald/kubernetes-replicator-armv5:{{ .Env.TRAVIS_BRANCH }}
-    - quay.io/mittwald/kubernetes-replicator-armv5:{{ .Env.TRAVIS_BRANCH }}-go{{ .Env.GO_VERSION }}
+    - quay.io/mittwald/kubernetes-replicator-armv5:v{{ .Major }}
+    - quay.io/mittwald/kubernetes-replicator-armv5:v{{ .Major }}.{{ .Minor }}
+    - quay.io/mittwald/kubernetes-replicator-armv5:{{ .Tag }}
     binaries:
       - kubernetes-replicator
     goos: linux
@@ -70,8 +72,9 @@ dockers:
     image_templates:
     - quay.io/mittwald/kubernetes-replicator-armv6:latest
     - quay.io/mittwald/kubernetes-replicator-armv6:stable
-    - quay.io/mittwald/kubernetes-replicator-armv6:{{ .Env.TRAVIS_BRANCH }}
-    - quay.io/mittwald/kubernetes-replicator-armv6:{{ .Env.TRAVIS_BRANCH }}-go{{ .Env.GO_VERSION }}
+    - quay.io/mittwald/kubernetes-replicator-armv6:v{{ .Major }}
+    - quay.io/mittwald/kubernetes-replicator-armv6:v{{ .Major }}.{{ .Minor }}
+    - quay.io/mittwald/kubernetes-replicator-armv6:{{ .Tag }}
     binaries:
       - kubernetes-replicator
     goos: linux
@@ -82,8 +85,9 @@ dockers:
     image_templates:
     - quay.io/mittwald/kubernetes-replicator-armv7:latest
     - quay.io/mittwald/kubernetes-replicator-armv7:stable
-    - quay.io/mittwald/kubernetes-replicator-armv7:{{ .Env.TRAVIS_BRANCH }}
-    - quay.io/mittwald/kubernetes-replicator-armv7:{{ .Env.TRAVIS_BRANCH }}-go{{ .Env.GO_VERSION }}
+    - quay.io/mittwald/kubernetes-replicator-armv7:v{{ .Major }}
+    - quay.io/mittwald/kubernetes-replicator-armv7:v{{ .Major }}.{{ .Minor }}
+    - quay.io/mittwald/kubernetes-replicator-armv7:{{ .Tag }}
     binaries:
       - kubernetes-replicator
     goos: linux

diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,9 @@
 language: go
 
+dist: bionic
+
+os: linux
+
 go:
   - '1.12'
 
@@ -32,7 +36,7 @@ before_deploy:
   - export FULL_IMAGE="${DOCKER_LOGIN_URL}/mittwald/kubernetes-replicator"
 deploy:
   - provider: script
-    skip_cleanup: true
+    cleanup: false
     script: >-
       curl -sL https://git.io/goreleaser | bash -s -- --snapshot --skip-publish --rm-dist &&
       docker push "${FULL_IMAGE}:latest" &&
@@ -45,7 +49,7 @@ deploy:
       branch: master
       condition: $TRAVIS_OS_NAME = linux
   - provider: script
-    skip_cleanup: true
+    cleanup: false
     script: curl -sL https://git.io/goreleaser | bash -s -- --rm-dist
     on:
       tags: true