Cleanups & buildx

LordMike · Aug 18, 2023 · cb5ef74 · cb5ef74
1 parent 6bf876e
commit cb5ef74
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 15 deletions.
diff --git a/.env b/.env
@@ -1,2 +1,3 @@
 DOCKER_DOCKERFILE=MBW.Nemlig2MQTT/Dockerfile
 DOCKER_TAG=lordmike/nemlig2mqtt
+DOCKER_PLATFORMS=linux/amd64,linux/arm64/v8,linux/arm/v7
diff --git a/.github/workflows/docker-dev.yml b/.github/workflows/docker-dev.yml
@@ -9,12 +9,6 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - name: Prep docker experimentals
-      run: echo "DOCKER_CLI_EXPERIMENTAL=enabled" >> $GITHUB_ENV
-
-    - name: Prep GIT_TAG
-      run: echo "GIT_TAG=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
-
     - uses: actions/checkout@v2
 
     - name: Dotenv Action
@@ -38,7 +32,7 @@ jobs:
       uses: docker/build-push-action@v4
       with:
         context: .
-        platforms: linux/amd64,linux/arm64/v8,linux/arm/v7
+        platforms: ${{ env.DOCKER_PLATFORMS }}
         push: true
         tags: ${{ env.DOCKER_TAG }}:dev
         file: ${{ env.DOCKER_DOCKERFILE }}
diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml
@@ -9,12 +9,6 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - name: Prep docker experimentals
-      run: echo "DOCKER_CLI_EXPERIMENTAL=enabled" >> $GITHUB_ENV
-
-    - name: Prep GIT_TAG
-      run: echo "GIT_TAG=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
-
     - uses: actions/checkout@v2
 
     - name: Dotenv Action
@@ -38,7 +32,7 @@ jobs:
       uses: docker/build-push-action@v4
       with:
         context: .
-        platforms: linux/amd64,linux/arm64/v8,linux/arm/v7
+        platforms: ${{ env.DOCKER_PLATFORMS }}
         push: true
-        tags: "${{ env.DOCKER_TAG }}:${{ env.GIT_TAG }},${{ env.DOCKER_TAG }}:latest"
+        tags: "${{ env.DOCKER_TAG }}:${{ env.GITHUB_REF_NAME }},${{ env.DOCKER_TAG }}:latest"
         file: ${{ env.DOCKER_DOCKERFILE }}