Merge branch 'main' into V0.3.2

Signed-off-by: ArthurMitchell42 <[email protected]>
ArthurMitchell42 · Mar 1, 2024 · 8699bc0 · 8699bc0
2 parents 736df05 + 3536f4d
commit 8699bc0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/docker-build-latest.yml b/.github/workflows/docker-build-latest.yml
@@ -1,7 +1,9 @@
 name: Docker build latest and push
 
 on:
-  workflow_dispatch
+  push:
+    tags: [ "*_release", "*_latest" ]
+#  workflow_dispatch
 
 env:
   # Use docker.io for Docker Hub if empty
@@ -28,4 +30,4 @@ jobs:
         username: ${{ secrets.DOCKERHUB_USER }}
         password: ${{ secrets.DOCKERHUB_TOKEN }}
     - name: Build the Docker image
-      run: docker buildx build --platform linux/amd64,linux/arm64/v8 --file nutcase/docker/Dockerfile --tag ${{ env.IMAGE_NAME }}:latest --push .
+      run: docker buildx build --platform linux/amd64,linux/arm64/v8 --file nutcase/docker/Dockerfile --tag ${{ env.IMAGE_NAME }}:$GITHUB_REF_NAME --tag ${{ env.IMAGE_NAME }}:latest --push .
diff --git a/.github/workflows/docker-buildpush.yml b/.github/workflows/docker-buildpush.yml
@@ -5,7 +5,7 @@ on:
 #    branches: 
 #      - main
 #      - V0.3*
-    tags: [ "*" ]
+    tags: [ "*_pr", "*_tag", "*_build" ]
 #  label:
 #    branches: [ "main" ]
 
@@ -34,5 +34,5 @@ jobs:
         username: ${{ secrets.DOCKERHUB_USER }}
         password: ${{ secrets.DOCKERHUB_TOKEN }}
     - name: Build the Docker image
-      run: docker buildx build --platform linux/amd64,linux/arm64/v8 --file nutcase/docker/Dockerfile --tag kronos443/nutcase:$GITHUB_REF_NAME --push .
+      run: docker buildx build --platform linux/amd64,linux/arm64/v8 --file nutcase/docker/Dockerfile --tag ${{ env.IMAGE_NAME }}:$GITHUB_REF_NAME --push .
 #  -$(date +'%Y-%m-%d_%H-%M-%S')