Merge pull request #2207 from rvolosatovs/fix/goreleaser-docker

Fix goreleaser Docker configuration
TheThingsNetwork · Mar 20, 2020 · 406d9e4 · 406d9e4
2 parents 7597832 + ac900f3
commit 406d9e4
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -176,13 +176,24 @@ blobs:
 dockers:
   - goos: linux
     goarch: amd64
+    dockerfile: Dockerfile
     binaries:
       - ttn-lw-cli
       - ttn-lw-stack
     image_templates:
-      - '{{ or (index .Env "DOCKER_IMAGE") "lorawan-stack" }}:latest'
       - '{{ or (index .Env "DOCKER_IMAGE") "lorawan-stack" }}:{{ .Major }}.{{ .Minor }}'
       - '{{ or (index .Env "DOCKER_IMAGE") "lorawan-stack" }}:{{ .Version }}'
     skip_push: auto
     extra_files:
       - public
+
+  - goos: linux
+    goarch: amd64
+    dockerfile: Dockerfile
+    binaries:
+      - ttn-lw-cli
+      - ttn-lw-stack
+    image_templates:
+      - '{{ or (index .Env "DOCKER_IMAGE_DEV") "lorawan-stack-dev" }}:{{ .FullCommit }}'
+    extra_files:
+      - public
diff --git a/.travis.yml b/.travis.yml
@@ -140,10 +140,7 @@ after_success:
       GO111MODULE=on go run github.com/goreleaser/goreleaser --release-notes <(printf "[Release notes](https://github.com/TheThingsNetwork/lorawan-stack/blob/${TRAVIS_TAG}/CHANGELOG.md#$(echo ${TRAVIS_TAG} | sed "s/v\([1-9]\+\)\.\([1-9]\+\)\.\([1-9]\+\)/\1\2\3---$(date +%Y-%m-%d)/"))")
     else
       GO111MODULE=on go run github.com/goreleaser/goreleaser --snapshot
-      if [[ ! -z "$DOCKER_IMAGE_DEV" ]]; then
-        docker tag $DOCKER_IMAGE:latest $DOCKER_IMAGE_DEV:$TRAVIS_COMMIT
-        docker push $DOCKER_IMAGE_DEV:$TRAVIS_COMMIT
-      fi
+      docker push $DOCKER_IMAGE_DEV:$TRAVIS_COMMIT
     fi
   fi
 deploy: