🐛 Make it plural! (#113 )

🐛 Remove 'env' sections (#112 )
Signed-off-by: Luke Tainton <luke@tainton.uk>
2020-08-17 11:45:28 +01:00 · 2020-08-17 11:40:08 +01:00 · 2020-08-17 11:14:48 +01:00
1 changed files with 5 additions and 12 deletions
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -8,6 +8,7 @@ jobs:
    runs-on: ubuntu-latest
    outputs: 
      ver: ${{ steps.release.outputs.version }}
+      tag: ${{ steps.release.outputs.tag_name }}
    env:
      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
    steps:
@@ -30,14 +31,10 @@ jobs:
    - name: Login to DockerHub Registry
      run: echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
    - name: Build image for Docker Hub
-      env:
-        VERSION: ${{ needs.release-on-push.output.ver }}
-      run: docker build . --file Dockerfile --tag luketainton/fhed:$VERSION luketainton/fhed:latest
+      run: docker build . --file Dockerfile --build-arg VERSION=${{ needs.release-on-push.outputs.ver }} --tag luketainton/fhed:${{ needs.release-on-push.outputs.tag }} --tag luketainton/fhed:latest
    - name: Push image to Docker Hub
-      env:
-        VERSION: ${{ needs.release-on-push.output.ver }}
      run: |
-        docker push luketainton/fhed:$VERSION &&
+        docker push luketainton/fhed:${{ needs.release-on-push.outputs.tag }} &&
        docker push luketainton/fhed:latest
      
  docker-ghr:
@@ -49,14 +46,10 @@ jobs:
    - name: Login to DockerHub Registry
      run: echo ${{ secrets.GITHUB_TOKEN }} | docker login https://docker.pkg.github.com -u luketainton --password-stdin
    - name: Build image for GitHub Package Registry
-      env:
-        VERSION: ${{ needs.release-on-push.output.ver }}
-      run: docker build . --file Dockerfile --tag docker.pkg.github.com/luketainton/fhed/fhed:latest docker.pkg.github.com/luketainton/fhed/fhed:$VERSION
+      run: docker build . --file Dockerfile --build-arg VERSION=${{ needs.release-on-push.outputs.ver }} --tag docker.pkg.github.com/luketainton/fhed/fhed:latest --tag docker.pkg.github.com/luketainton/fhed/fhed:${{ needs.release-on-push.outputs.tag }}
    - name: Push image to GitHub Package Registry
-      env:
-        VERSION: ${{ needs.release-on-push.output.ver }}
      run: |
-        docker push docker.pkg.github.com/luketainton/fhed/fhed:$VERSION &&
+        docker push docker.pkg.github.com/luketainton/fhed/fhed:${{ needs.release-on-push.outputs.tag }} &&
        docker push docker.pkg.github.com/luketainton/fhed/fhed:latest

  deploy:
Author	SHA1	Message	Date
Luke Tainton	c8576aa757	🐛 Make it plural! (#113 )	2020-08-17 11:45:28 +01:00
Luke Tainton	9c05fb6392	🐛 Remove 'env' sections (#112 ) Signed-off-by: Luke Tainton <luke@tainton.uk>	2020-08-17 11:40:08 +01:00
Luke Tainton	b190776d81	Fix auto deployment and versioning (#110 ) * 🐛 Fix docker build syntax * Add tag as output	2020-08-17 11:14:48 +01:00