From 8c4d0fa1a1236fab4b7d38a47bb1bda1cb4b3bdd Mon Sep 17 00:00:00 2001 From: hackerESQ Date: Mon, 27 Jan 2025 13:23:00 -0600 Subject: [PATCH] merge --- .github/workflows/build-and-push-images.yml | 15 ++++++++++++--- docker/Dockerfile | 1 + 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-and-push-images.yml b/.github/workflows/build-and-push-images.yml index d662ca6..b702bb3 100644 --- a/.github/workflows/build-and-push-images.yml +++ b/.github/workflows/build-and-push-images.yml @@ -29,6 +29,17 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 + - name: Increase swap space + run: sudo /bin/dd if=/dev/zero of=/var/swap.1 bs=1M count=4096 && sudo /sbin/mkswap /var/swap.1 && sudo /sbin/swapon /var/swap.1 + + - name: Cache Docker layers + uses: actions/cache@v4 + with: + path: /tmp/.buildx-cache + key: ${{ runner.os }}-buildx-${{ github.sha }} + restore-keys: | + ${{ runner.os }}-buildx- + - name: Extract version from tag id: extract-version run: | @@ -44,6 +55,4 @@ jobs: investbrainapp/investbrain:latest investbrainapp/investbrain:${{ env.version }} ghcr.io/investbrainapp/investbrain:latest - ghcr.io/investbrainapp/investbrain:${{ env.version }} - - + ghcr.io/investbrainapp/investbrain:${{ env.version }} \ No newline at end of file diff --git a/docker/Dockerfile b/docker/Dockerfile index 0c90e28..bc9536d 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -10,6 +10,7 @@ ENV SELF_HOSTED=true COPY . /var/www/app WORKDIR /var/www/app +# Allow PHP installs to be built cross-platform ENV CFLAGS="-fstack-protector-strong -fpic -fPIC -fpie -O2 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" # Install required packages