Merge pull request #1351 from bunkerity/tmp-fix

Merge branch "master" into branch "dev"
bunkerity · Jul 11, 2024 · f56f8ea · f56f8ea
2 parents 481ecce + 41e117e
commit f56f8ea
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml
@@ -123,9 +123,9 @@ jobs:
         if: startsWith(env.ARCH, 'arm') == true
         run: |
           docker save local/bunkerweb-${{ inputs.LINUX }}:latest | ssh -C root@arm docker load
-          scp ./src/linux/package.sh root@arm:/opt
-          ssh root@arm chmod +x /opt/package.sh
-          ssh root@arm /opt/package.sh ${{ inputs.LINUX }} ${{ env.LARCH }} "$(cat src/VERSION | tr -d '\n')"
+          scp ./src/linux/package.sh root@arm:/opt/package_${{ inputs.LINUX }}.sh
+          ssh root@arm chmod +x /opt/package_${{ inputs.LINUX }}.sh
+          ssh root@arm /opt/package_${{ inputs.LINUX }}.sh ${{ inputs.LINUX }} ${{ env.LARCH }} "$(cat src/VERSION | tr -d '\n')"
           scp -r root@arm:/root/package-${{ inputs.LINUX }} ./package-${{ inputs.LINUX }}
         env:
           LARCH: ${{ env.LARCH }}

diff --git a/src/linux/Dockerfile-ubuntu-jammy b/src/linux/Dockerfile-ubuntu-jammy
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04@sha256:2af372c1e2645779643284c7dc38775e3dbbc417b2d784a27c5a9eb784014fb8 AS builder
+FROM ubuntu:22.04@sha256:19478ce7fc2ffbce89df29fea5725a8d12e57de52eb9ea570890dc5852aac1ac as builder
 
 ENV OS=ubuntu
 ENV NGINX_VERSION=1.26.1
@@ -58,7 +58,7 @@ COPY src/scheduler scheduler
 COPY src/ui ui
 COPY src/VERSION VERSION
 
-FROM ubuntu:22.04@sha256:2af372c1e2645779643284c7dc38775e3dbbc417b2d784a27c5a9eb784014fb8
+FROM ubuntu:22.04@sha256:19478ce7fc2ffbce89df29fea5725a8d12e57de52eb9ea570890dc5852aac1ac
 
 # Set default umask to prevent huge recursive chmod increasing the final image size
 RUN umask 027