Merge pull request #1360 from bunkerity/dev

Merge branch "dev" into branch "staging"

.github/workflows/container-build.yml

@@ -92,7 +92,7 @@ jobs:
       # Build cached image
       - name: Build image
         if: inputs.CACHE == true
-        uses: docker/build-push-action@1a162644f9a7e87d8f4b053101d1d9a712edc18c # v6.3.0
+        uses: docker/build-push-action@a254f8ca60a858f3136a2f1f23a60969f2c402dd # v6.4.0
         with:
           context: .
           file: ${{ inputs.DOCKERFILE }}
@@ -105,7 +105,7 @@ jobs:
       # Build non-cached image
       - name: Build image
         if: inputs.CACHE != true
-        uses: docker/build-push-action@1a162644f9a7e87d8f4b053101d1d9a712edc18c # v6.3.0
+        uses: docker/build-push-action@a254f8ca60a858f3136a2f1f23a60969f2c402dd # v6.4.0
         with:
           context: .
           file: ${{ inputs.DOCKERFILE }}

.github/workflows/linux-build.yml

@@ -94,7 +94,7 @@ jobs:
       # Build testing package image
       - name: Build package image
         if: inputs.RELEASE == 'testing' || inputs.RELEASE == 'dev' || inputs.RELEASE == 'ui'
-        uses: docker/build-push-action@1a162644f9a7e87d8f4b053101d1d9a712edc18c # v6.3.0
+        uses: docker/build-push-action@a254f8ca60a858f3136a2f1f23a60969f2c402dd # v6.4.0
         with:
           context: .
           load: true
@@ -106,7 +106,7 @@ jobs:
       # Build non-testing package image
       - name: Build package image
         if: inputs.RELEASE != 'testing' && inputs.RELEASE != 'dev'
-        uses: docker/build-push-action@1a162644f9a7e87d8f4b053101d1d9a712edc18c # v6.3.0
+        uses: docker/build-push-action@a254f8ca60a858f3136a2f1f23a60969f2c402dd # v6.4.0
         with:
           context: .
           load: true
@@ -142,7 +142,7 @@ jobs:
           images: ghcr.io/bunkerity/${{ inputs.LINUX }}-tests:${{ inputs.RELEASE }}
       - name: Build test image
         if: inputs.TEST == true
-        uses: docker/build-push-action@1a162644f9a7e87d8f4b053101d1d9a712edc18c # v6.3.0
+        uses: docker/build-push-action@a254f8ca60a858f3136a2f1f23a60969f2c402dd # v6.4.0
         with:
           context: .
           file: tests/linux/Dockerfile-${{ inputs.LINUX }}

.github/workflows/push-docker.yml

@@ -70,7 +70,7 @@ jobs:
           images: bunkerity/${{ inputs.IMAGE }}
       # Build and push
       - name: Build and push
-        uses: docker/build-push-action@1a162644f9a7e87d8f4b053101d1d9a712edc18c # v6.3.0
+        uses: docker/build-push-action@a254f8ca60a858f3136a2f1f23a60969f2c402dd # v6.4.0
         with:
           context: .
           file: ${{ inputs.DOCKERFILE }}

src/linux/Dockerfile-debian

@@ -87,6 +87,7 @@ RUN cp helpers/bwcli /usr/bin/ && \
     chmod 770 /var/cache/bunkerweb/ /var/tmp/bunkerweb/ /var/run/bunkerweb/ && \
     chmod 750 gen/*.py scheduler/*.py cli/*.py ui/*.py ui/src/*.py helpers/*.sh /var/www/ && \
     find core/*/jobs/* -type f -exec chmod 750 {} \; && \
+    find core/*/bwcli/* -type f -exec chmod 750 {} \; && \
     chmod 755 .
 
 # Cleanup

src/linux/Dockerfile-fedora

@@ -83,6 +83,7 @@ RUN cp helpers/bwcli /usr/bin/ && \
     chmod 770 /var/cache/bunkerweb/ /var/tmp/bunkerweb/ /var/run/bunkerweb/ && \
     chmod 750 gen/*.py scheduler/*.py cli/*.py ui/*.py ui/src/*.py helpers/*.sh /var/www/ && \
     find core/*/jobs/* -type f -exec chmod 750 {} \; && \
+    find core/*/bwcli/* -type f -exec chmod 750 {} \; && \
     chmod 755 .
 
 # Cleanup

src/linux/Dockerfile-rhel

@@ -95,6 +95,7 @@ RUN cp helpers/bwcli /usr/bin/ && \
   chmod 770 /var/cache/bunkerweb/ /var/tmp/bunkerweb/ /var/run/bunkerweb/ && \
   chmod 750 gen/*.py scheduler/*.py cli/*.py ui/*.py ui/src/*.py helpers/*.sh /var/www/ && \
   find core/*/jobs/* -type f -exec chmod 750 {} \; && \
+  find core/*/bwcli/* -type f -exec chmod 750 {} \; && \
   chmod 755 .
 
 # Cleanup

src/linux/Dockerfile-rhel9

@@ -100,6 +100,7 @@ RUN cp helpers/bwcli /usr/bin/ && \
   chmod 770 /var/cache/bunkerweb/ /var/tmp/bunkerweb/ /var/run/bunkerweb/ && \
   chmod 750 gen/*.py scheduler/*.py cli/*.py ui/*.py ui/src/*.py helpers/*.sh /var/www/ && \
   find core/*/jobs/* -type f -exec chmod 750 {} \; && \
+  find core/*/bwcli/* -type f -exec chmod 750 {} \; && \
   chmod 755 .
 
 # Cleanup

src/linux/Dockerfile-ubuntu

@@ -87,6 +87,7 @@ RUN cp helpers/bwcli /usr/bin/ && \
     chmod 770 /var/cache/bunkerweb/ /var/tmp/bunkerweb/ /var/run/bunkerweb/ && \
     chmod 750 gen/*.py scheduler/*.py cli/*.py ui/*.py ui/src/*.py helpers/*.sh /var/www/ && \
     find core/*/jobs/* -type f -exec chmod 750 {} \; && \
+    find core/*/bwcli/* -type f -exec chmod 750 {} \; && \
     chmod 755 .
 
 # Cleanup

src/linux/Dockerfile-ubuntu-jammy

@@ -87,6 +87,7 @@ RUN cp helpers/bwcli /usr/bin/ && \
     chmod 770 /var/cache/bunkerweb/ /var/tmp/bunkerweb/ /var/run/bunkerweb/ && \
     chmod 750 gen/*.py scheduler/*.py cli/*.py ui/*.py ui/src/*.py helpers/*.sh /var/www/ && \
     find core/*/jobs/* -type f -exec chmod 750 {} \; && \
+    find core/*/bwcli/* -type f -exec chmod 750 {} \; && \
     chmod 755 .
 
 # Cleanup

src/scheduler/Dockerfile

@@ -59,6 +59,7 @@ RUN apk add --no-cache bash unzip libgcc libstdc++ libpq openssl libmagic mariad
   chown -R root:scheduler INTEGRATION /data /etc/nginx /var/cache/bunkerweb /var/lib/bunkerweb /etc/bunkerweb /var/tmp/bunkerweb /var/run/bunkerweb /var/log/bunkerweb /usr/bin/bwcli && \
   chmod -R 770 /data /etc/nginx /var/cache/bunkerweb /var/lib/bunkerweb /etc/bunkerweb /var/tmp/bunkerweb /var/run/bunkerweb /var/log/bunkerweb && \
   find core/*/jobs/* -type f -exec chmod 750 {} \; && \
+  find core/*/bwcli/* -type f -exec chmod 750 {} \; && \
   chmod 750 cli/main.py gen/*.py scheduler/main.py scheduler/entrypoint.sh helpers/*.sh deps/python/bin/* /usr/bin/bwcli && \
   chmod 660 INTEGRATION