Merge pull request #2447 from bunkerity/dev

Author: TheophileDiot

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -47,7 +47,7 @@ body:
       label: BunkerWeb version
       description: What version of BunkerWeb are you running?
       placeholder: Version
-      value: 1.6.2-rc6
+      value: 1.6.2-rc7
     validations:
       required: true
   - type: dropdown

.github/workflows/beta.yml

@@ -64,13 +64,14 @@ jobs:
     strategy:
       matrix:
         image: [bunkerweb, scheduler, autoconf, ui, all-in-one]
-        arch: ["linux/arm64,linux/arm/v7"]
+        arch: [linux/arm64, linux/arm/v7]
         exclude:
           - image: all-in-one
-            arch: "linux/arm64,linux/arm/v7"
+            arch: linux/arm/v7
         include:
           - release: beta
             cache: false
+            push: false
             cache_suffix: arm
           - image: bunkerweb
             dockerfile: src/bw/Dockerfile
@@ -82,7 +83,6 @@ jobs:
             dockerfile: src/ui/Dockerfile
           - image: all-in-one
             dockerfile: src/all-in-one/Dockerfile
-            arch: "linux/arm64"
     uses: ./.github/workflows/container-build.yml
     with:
       RELEASE: ${{ matrix.release }}
@@ -366,7 +366,7 @@ jobs:
   # Remove ARM VM
   rm-arm:
     if: ${{ always() }}
-    needs: [create-arm, push-images, build-packages, build-all-in-one-arm]
+    needs: [create-arm, push-images, build-packages]
     uses: ./.github/workflows/rm-arm.yml
     secrets:
       ARM_ID: ${{ needs.create-arm.outputs.id }}

.github/workflows/container-build.yml

@@ -66,14 +66,14 @@ jobs:
           SSH_IP: ${{ secrets.ARM_SSH_IP }}
           SSH_CONFIG: ${{ secrets.ARM_SSH_CONFIG }}
       - name: Setup Buildx
-        uses: docker/setup-buildx-action@18ce135bb5112fa8ce4ed6c17ab05699d7f3a5e0 # v3.11.0
+        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
         if: inputs.CACHE_SUFFIX != 'arm'
       - name: Setup Buildx (ARM)
-        uses: docker/setup-buildx-action@18ce135bb5112fa8ce4ed6c17ab05699d7f3a5e0 # v3.11.0
+        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
         if: inputs.CACHE_SUFFIX == 'arm'
         with:
           endpoint: ssh://root@arm
-          platforms: linux/arm64,linux/arm/v7,linux/arm/v6
+          platforms: linux/arm64,linux/arm/v7
       - name: Login to Docker Hub
         uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
         with:

.github/workflows/linux-build.yml

@@ -75,14 +75,14 @@ jobs:
           SSH_IP: ${{ secrets.ARM_SSH_IP }}
           SSH_CONFIG: ${{ secrets.ARM_SSH_CONFIG }}
       - name: Setup Buildx
-        uses: docker/setup-buildx-action@18ce135bb5112fa8ce4ed6c17ab05699d7f3a5e0 # v3.11.0
+        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
         if: startsWith(env.ARCH, 'arm') == false
       - name: Setup Buildx (ARM)
-        uses: docker/setup-buildx-action@18ce135bb5112fa8ce4ed6c17ab05699d7f3a5e0 # v3.11.0
+        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
         if: startsWith(env.ARCH, 'arm') == true
         with:
           endpoint: ssh://root@arm
-          platforms: linux/arm64,linux/arm/v7,linux/arm/v6
+          platforms: linux/arm64,linux/arm/v7
       - name: Login to Docker Hub
         uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
         with:

.github/workflows/push-docker.yml

@@ -58,10 +58,10 @@ jobs:
           SSH_IP: ${{ secrets.ARM_SSH_IP }}
           SSH_CONFIG: ${{ secrets.ARM_SSH_CONFIG }}
       - name: Setup Buildx (ARM)
-        uses: docker/setup-buildx-action@18ce135bb5112fa8ce4ed6c17ab05699d7f3a5e0 # v3.11.0
+        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
         with:
           endpoint: ssh://root@arm
-          platforms: linux/arm64,linux/arm/v7,linux/arm/v6
+          platforms: linux/arm64,linux/arm/v7
           buildkitd-flags: --debug
       # Compute metadata
       - name: Extract metadata

.github/workflows/rc.yml

@@ -64,10 +64,10 @@ jobs:
     strategy:
       matrix:
         image: [bunkerweb, scheduler, autoconf, ui, all-in-one]
-        arch: ["linux/arm64,linux/arm/v7"]
+        arch: [linux/arm64, linux/arm/v7]
         exclude:
           - image: all-in-one
-            arch: "linux/arm64,linux/arm/v7"
+            arch: linux/arm/v7
         include:
           - release: rc
             cache: false
@@ -83,7 +83,6 @@ jobs:
             dockerfile: src/ui/Dockerfile
           - image: all-in-one
             dockerfile: src/all-in-one/Dockerfile
-            arch: "linux/arm64"
     uses: ./.github/workflows/container-build.yml
     with:
       RELEASE: ${{ matrix.release }}

.github/workflows/release.yml

@@ -74,10 +74,10 @@ jobs:
     strategy:
       matrix:
         image: [bunkerweb, scheduler, autoconf, ui, all-in-one]
-        arch: ["linux/arm64,linux/arm/v7"]
+        arch: [linux/arm64, linux/arm/v7]
         exclude:
           - image: all-in-one
-            arch: "linux/arm64,linux/arm/v7"
+            arch: linux/arm/v7
         include:
           - release: latest
             cache: false
@@ -93,7 +93,6 @@ jobs:
             dockerfile: src/ui/Dockerfile
           - image: all-in-one
             dockerfile: src/all-in-one/Dockerfile
-            arch: "linux/arm64"
     uses: ./.github/workflows/container-build.yml
     with:
       RELEASE: ${{ matrix.release }}
@@ -162,14 +161,7 @@ jobs:
   # Wait for all builds and extract VERSION
   wait-builds:
     runs-on: ubuntu-latest
-    needs:
-      [
-        codeql,
-        build-containers,
-        build-containers-arm,
-        build-all-in-one-arm,
-        build-packages,
-      ]
+    needs: [codeql, build-containers, build-containers-arm, build-packages]
     outputs:
       version: ${{ steps.getversion.outputs.version }}
       versionrpm: ${{ steps.getversionrpm.outputs.versionrpm }}
@@ -384,7 +376,7 @@ jobs:
   # Remove ARM VM
   rm-arm:
     if: ${{ always() }}
-    needs: [create-arm, push-images, build-packages, build-all-in-one-arm]
+    needs: [create-arm, push-images, build-packages]
     uses: ./.github/workflows/rm-arm.yml
     secrets:
       ARM_ID: ${{ needs.create-arm.outputs.id }}

.github/workflows/staging-create-infra.yml

@@ -25,7 +25,7 @@ jobs:
       - name: Install terraform
         uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # v3.1.2
       - name: Install kubectl
-        uses: azure/setup-kubectl@3e0aec4d80787158d308d7b364cb1b702e7feb7f # v4.0.0
+        uses: azure/setup-kubectl@776406bce94f63e41d621b960d78ee25c8b76ede # v4.0.1
         if: inputs.TYPE == 'k8s'
         with:
           version: "v1.29.1"

.github/workflows/staging-delete-infra.yml

@@ -34,7 +34,7 @@ jobs:
           tar xf /tmp/terraform.tar -C / && mkdir ~/.ssh && touch ~/.ssh/id_rsa.pub
         env:
           SECRET_KEY: ${{ secrets.SECRET_KEY }}
-      - uses: azure/setup-kubectl@3e0aec4d80787158d308d7b364cb1b702e7feb7f # v4.0.0
+      - uses: azure/setup-kubectl@776406bce94f63e41d621b960d78ee25c8b76ede # v4.0.1
         if: inputs.TYPE == 'k8s'
         with:
           version: "v1.29.1"

.github/workflows/staging-tests.yml

@@ -66,7 +66,7 @@ jobs:
           REG_USER: ${{ github.actor }}
           REG_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         if: inputs.TYPE == 'k8s'
-      - uses: azure/setup-kubectl@3e0aec4d80787158d308d7b364cb1b702e7feb7f # v4.0.0
+      - uses: azure/setup-kubectl@776406bce94f63e41d621b960d78ee25c8b76ede # v4.0.1
         if: inputs.TYPE == 'k8s'
         with:
           version: "v1.29.1"