forenkler build.yml litt (#34)

Author: martintveter

.github/workflows/build.yml

@@ -6,13 +6,14 @@ on:
     tags-ignore:
       - "**" # Don't build any tags
 
-# FIXME: Legg til docker layer caching, f.eks. https://github.com/marketplace/actions/build-docker-images-using-cache
 jobs:
   build:
     name: Build and push docker image
     runs-on: ubuntu-latest
+    env:
+      DOCKER_IMAGE: ghcr.io/${{ github.repository }}/${{ github.event.repository.name }}
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
       - name: Login to GitHub Docker Registry
         uses: docker/login-action@v1
         with:
@@ -24,15 +25,11 @@ jobs:
         uses: navikt/sosialhjelp-ci/actions/create-artifact-version@master
       - name: Create docker image tags
         run: |
-          PROJECT_NAME=$(echo $GITHUB_REPOSITORY | cut -d/ -f2)
-          echo "ghcr.io/$GITHUB_REPOSITORY/$PROJECT_NAME:$VERSION" > DOCKER_TAG
-        env:
-          VERSION: ${{ steps.artifact-version.outputs.version }}
+          echo "DOCKER_TAG=${{ env.DOCKER_IMAGE }}:${{ steps.artifact-version.outputs.version }}" >> $GITHUB_ENV
       - name: Build docker image
-        run: docker build -t $(cat DOCKER_TAG) .
+        run: docker build -t ${{ env.DOCKER_TAG }} .
       - name: Create tag and release
-        # TODO: Bytt ut med upstream når/hvis https://github.com/actions/create-release/pull/32 merges
-        uses: fleskesvor/create-release@feature/support-target-commitish
+        uses: actions/create-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -41,4 +38,4 @@ jobs:
           commitish: ${{ github.sha }}
       - name: Push docker image
         run: |
-          docker push $(cat DOCKER_TAG)
+          docker push ${{ env.DOCKER_TAG }}