Update calibre-fullserver-build.yml

ridgarou · Dec 19, 2021 · 4f34e1e · 4f34e1e
1 parent e252d13
commit 4f34e1e
Showing 1 changed file with 27 additions and 15 deletions.
diff --git a/.github/workflows/calibre-fullserver-build.yml b/.github/workflows/calibre-fullserver-build.yml
@@ -18,17 +18,17 @@ jobs:
       - name: Checkout Code
         uses: actions/checkout@v2
 
-      - name: Create image Flag
-        run: |
-          # disable command workflow processing
-          echo "::stop-commands::`echo -n ${{ github.token }} | sha256sum | head -c 64`"
-
-          # log untrusted output
-          export FLAG=$(date +%s)
-          echo "::set-env name=FLAG::$FLAG"
-
-          # enable workflow command processing
-          echo "::`echo -n ${{ github.token }} | sha256sum | head -c 64`::"
+      #- name: Create image Flag
+      #  run: |
+      #    # disable command workflow processing
+      #    echo "::stop-commands::`echo -n ${{ github.token }} | sha256sum | head -c 64`"
+      #
+      #    # log untrusted output
+      #    export FLAG=$(date +%s)
+      #    echo "::set-env name=FLAG::$FLAG"
+      #
+      #    # enable workflow command processing
+      #    echo "::`echo -n ${{ github.token }} | sha256sum | head -c 64`::"
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
@@ -61,17 +61,29 @@ jobs:
           password: ${{ env.DOCKER_PASSWORD }} 
           # Log out from the Docker registry at the end of a job
           logout: true # optional, default is true
-
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v3
+        with:
+          images: |
+            ${{ env.DOCKER_IMAGE_NAME }}
+          tags: |
+            latest
+            type=sha
+            
       - name: Build and push Docker images
         uses: docker/build-push-action@v2
         with:
           # Path to the build context
           context: . # optional, default is .
           # Path to the Dockerfile (Default is '{path}/Dockerfile')
           file: ./Dockerfile # optional
-          tags: |
-            ${{ env.DOCKER_IMAGE_NAME }}:latest
-            ${{ env.DOCKER_IMAGE_NAME }}:${{ env.FLAG }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          #tags: |
+          #  ${{ env.DOCKER_IMAGE_NAME }}:latest
+          #  ${{ env.DOCKER_IMAGE_NAME }}:${{ env.FLAG }}
           platforms: |
             linux/arm64
             linux/arm/v7