Merge pull request #32 from MedAziz11/develop

Develop

Author: MedAziz11

.github/workflows/main.yml

@@ -21,14 +21,6 @@ env:
 jobs:
   build-test-push:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        platform: [linux/amd64, linux/arm64]
-        include:
-          - target_branch: main
-            branch: main
-          - target_branch: develop
-            branch: develop
     steps:
       # Check out the repository code
       - name: Checkout code
@@ -43,10 +35,9 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{ env.CACHE_PATH }}
-          key: ${{ runner.os }}-buildx-${{ matrix.branch }}-${{ matrix.platform }}-${{ hashFiles('**/Dockerfile') }}
+          key: ${{ runner.os }}-buildx-${{ github.ref }}-${{ hashFiles('**/Dockerfile') }}
           restore-keys: |
-            ${{ runner.os }}-buildx-${{ matrix.branch }}-${{ matrix.platform }}-
-            ${{ runner.os }}-buildx-${{ matrix.branch }}-
+            ${{ runner.os }}-buildx-${{ github.ref }}-
             ${{ runner.os }}-buildx-
 
       # Log in to Docker Hub using the provided secrets
@@ -62,6 +53,7 @@ jobs:
         run: |
           REPO=${{ env.DOCKERHUB_REPO }}
           IMAGE=${{ env.DOCKERHUB_IMAGE }}
+          BRANCH=$(echo ${GITHUB_REF#refs/heads/} | sed 's/\//-/g')
 
           if [ "${{ github.event_name }}" == "pull_request" ]; then
             PR_NUMBER=${{ github.event.number }}
@@ -85,7 +77,7 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: .
-          platforms: ${{ matrix.platform }}
+          platforms: linux/amd64,linux/arm64
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.image_tags.outputs.tags }}
           cache-from: type=local,src=${{ env.CACHE_PATH }}
@@ -110,14 +102,5 @@ jobs:
       #       --exit-code 1 \
       #       --severity CRITICAL,HIGH \
       #       --ignore-unfixed \
-      #       ${{ env.DOCKERHUB_REPO }}/${{ env.DOCKERHUB_IMAGE }}:${IMAGE_TAG}
+      #       ${{ env.DOCKERHUB_REPO }}
 
-            
-      # # Create an issue if the build fails
-      # - name: Create issue if build fails
-      #   if: failure()
-      #   uses: peter-evans/create-issue-from-file@v2
-      #   with:
-      #     title: "Docker Image CI failed for ${{ env.DOCKERHUB_REPO }}/${{ env.DOCKERHUB_IMAGE }}:${{ matrix.branch }}-${{ matrix.platform }}"
-      #     content-filepath: .github/issue_templates/build_failure.md
-      #     token: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -37,7 +37,7 @@ You will connect with those credentials:
 - Easy to use REST API with most of the Uptime-Kuma features
 - Swagger Docs
 - Dockerized [UptimeKuma_RestAPI Image](https://hub.docker.com/repository/docker/medaziz11/uptimekuma_restapi)
-- Multi-architecture support (amd64, arm64, arm/v7, arm/v6)
+- Multi-architecture support (amd64, arm64)
 
 ### Example :