From 26e65e8a20281a4c0f2a520563b41c7d3df52532 Mon Sep 17 00:00:00 2001 From: Archimedes Trajano Date: Sat, 12 Jul 2025 10:24:06 -0400 Subject: [PATCH 1/7] PR build --- .github/workflows/pr.yml | 76 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 .github/workflows/pr.yml diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml new file mode 100644 index 000000000..e86c769f2 --- /dev/null +++ b/.github/workflows/pr.yml @@ -0,0 +1,76 @@ +name: Publish Docker image for PR + +on: + pull_request: + branches: + - "**" + +jobs: + apache: + name: Apache + runs-on: ubuntu-latest + steps: + - name: Check out the repo + uses: actions/checkout@v3 + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + - name: Log into registry ghcr.io + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + - name: Extract metadata (tags, labels) for Docker + id: meta + uses: docker/metadata-action@v5 + with: + images: ghcr.io/trajano/nextcloud + tags: | + type=ref,event=pr,suffix=-apache + + - name: Build and push Docker image + uses: docker/build-push-action@v6 + with: + context: 31/apache + platforms: linux/amd64,linux/arm64 + push: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} + cache-from: type=gha + cache-to: type=gha,mode=max + fpm: + name: FPM + runs-on: ubuntu-latest + steps: + - name: Check out the repo + uses: actions/checkout@v3 + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + - name: Log into registry ghcr.io + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + - name: Extract metadata (tags, labels) for Docker + id: meta + uses: docker/metadata-action@v5 + with: + images: ghcr.io/trajano/nextcloud + tags: | + type=ref,event=pr,suffix=-fpm + + - name: Build and push Docker image + uses: docker/build-push-action@v6 + with: + context: 31/fpm + platforms: linux/amd64,linux/arm64 + push: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} + cache-from: type=gha + cache-to: type=gha,mode=max From adfc7d521f7b1528168c6ed392538fccbdab52fe Mon Sep 17 00:00:00 2001 From: Archimedes Trajano Date: Tue, 2 Sep 2025 10:05:56 -0400 Subject: [PATCH 2/7] simple addition of ffmpeg for recognize,preview,photos --- Dockerfile-alpine.template | 1 + Dockerfile-debian.template | 1 + 2 files changed, 2 insertions(+) diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index b2c6ea5ec..84f0f92e1 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -25,6 +25,7 @@ RUN set -ex; \ apk add --no-cache --virtual .build-deps \ $PHPIZE_DEPS \ autoconf \ + ffmpeg \ freetype-dev \ gmp-dev \ icu-dev \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 5c935d87d..7016c83da 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -7,6 +7,7 @@ RUN set -ex; \ apt-get install -y --no-install-recommends \ busybox-static \ bzip2 \ + ffmpeg \ libldap-common \ libmagickcore-7.q16-10-extra \ rsync \ From e4f8a80e4b6046ac301b9f20d0a598393a8cfc34 Mon Sep 17 00:00:00 2001 From: GitHub Workflow Date: Tue, 2 Sep 2025 17:36:38 +0000 Subject: [PATCH 3/7] Runs update.sh --- 31/apache/Dockerfile | 1 + 31/fpm-alpine/Dockerfile | 1 + 31/fpm/Dockerfile | 1 + 3 files changed, 3 insertions(+) diff --git a/31/apache/Dockerfile b/31/apache/Dockerfile index 33cfd75b9..e8be010fc 100644 --- a/31/apache/Dockerfile +++ b/31/apache/Dockerfile @@ -8,6 +8,7 @@ RUN set -ex; \ apt-get install -y --no-install-recommends \ busybox-static \ bzip2 \ + ffmpeg \ libldap-common \ libmagickcore-7.q16-10-extra \ rsync \ diff --git a/31/fpm-alpine/Dockerfile b/31/fpm-alpine/Dockerfile index 10b57b1d5..e1dd6a89e 100644 --- a/31/fpm-alpine/Dockerfile +++ b/31/fpm-alpine/Dockerfile @@ -26,6 +26,7 @@ RUN set -ex; \ apk add --no-cache --virtual .build-deps \ $PHPIZE_DEPS \ autoconf \ + ffmpeg \ freetype-dev \ gmp-dev \ icu-dev \ diff --git a/31/fpm/Dockerfile b/31/fpm/Dockerfile index c4356381d..630b333f2 100644 --- a/31/fpm/Dockerfile +++ b/31/fpm/Dockerfile @@ -8,6 +8,7 @@ RUN set -ex; \ apt-get install -y --no-install-recommends \ busybox-static \ bzip2 \ + ffmpeg \ libldap-common \ libmagickcore-7.q16-10-extra \ rsync \ From 51ed53af087ae31f47326f7b60a34f64d92007c5 Mon Sep 17 00:00:00 2001 From: Archimedes Trajano Date: Tue, 2 Sep 2025 20:09:30 -0400 Subject: [PATCH 4/7] add master branch image build --- .github/workflows/pr.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index e86c769f2..19ecbb935 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -1,6 +1,9 @@ name: Publish Docker image for PR on: + push: + branches: + - master pull_request: branches: - "**" From 23f5474501f2ffbce4b08b33d6863e26b1239233 Mon Sep 17 00:00:00 2001 From: GitHub Workflow Date: Fri, 12 Sep 2025 01:57:35 +0000 Subject: [PATCH 5/7] Runs update.sh --- 32/apache/Dockerfile | 1 + 32/fpm-alpine/Dockerfile | 1 + 32/fpm/Dockerfile | 1 + 3 files changed, 3 insertions(+) diff --git a/32/apache/Dockerfile b/32/apache/Dockerfile index 52cb396ef..51697c282 100644 --- a/32/apache/Dockerfile +++ b/32/apache/Dockerfile @@ -8,6 +8,7 @@ RUN set -ex; \ apt-get install -y --no-install-recommends \ busybox-static \ bzip2 \ + ffmpeg \ libldap-common \ libmagickcore-7.q16-10-extra \ rsync \ diff --git a/32/fpm-alpine/Dockerfile b/32/fpm-alpine/Dockerfile index ab962c426..4daada234 100644 --- a/32/fpm-alpine/Dockerfile +++ b/32/fpm-alpine/Dockerfile @@ -26,6 +26,7 @@ RUN set -ex; \ apk add --no-cache --virtual .build-deps \ $PHPIZE_DEPS \ autoconf \ + ffmpeg \ freetype-dev \ gmp-dev \ icu-dev \ diff --git a/32/fpm/Dockerfile b/32/fpm/Dockerfile index 66a62c156..a613b9bad 100644 --- a/32/fpm/Dockerfile +++ b/32/fpm/Dockerfile @@ -8,6 +8,7 @@ RUN set -ex; \ apt-get install -y --no-install-recommends \ busybox-static \ bzip2 \ + ffmpeg \ libldap-common \ libmagickcore-7.q16-10-extra \ rsync \ From 5097389d11681fd1d3f48d25fc0068f8ad3efcb9 Mon Sep 17 00:00:00 2001 From: Archimedes Trajano Date: Fri, 12 Sep 2025 21:13:24 -0400 Subject: [PATCH 6/7] Update pr.yml Signed-off-by: Archimedes Trajano --- .github/workflows/pr.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 19ecbb935..8b8f28d6b 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -32,6 +32,7 @@ jobs: images: ghcr.io/trajano/nextcloud tags: | type=ref,event=pr,suffix=-apache + type=raw,value=latest,enable=${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }} - name: Build and push Docker image uses: docker/build-push-action@v6 @@ -66,6 +67,7 @@ jobs: images: ghcr.io/trajano/nextcloud tags: | type=ref,event=pr,suffix=-fpm + type=raw,value=fpm,enable=${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }} - name: Build and push Docker image uses: docker/build-push-action@v6 From 325b9d0c7ede9a4513a0b0cbe045df8cb4c8725c Mon Sep 17 00:00:00 2001 From: Archimedes Trajano Date: Wed, 1 Oct 2025 03:11:36 -0400 Subject: [PATCH 7/7] build the 32 images --- .github/workflows/pr.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 8b8f28d6b..e119132cf 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -37,7 +37,7 @@ jobs: - name: Build and push Docker image uses: docker/build-push-action@v6 with: - context: 31/apache + context: 32/apache platforms: linux/amd64,linux/arm64 push: true tags: ${{ steps.meta.outputs.tags }} @@ -72,7 +72,7 @@ jobs: - name: Build and push Docker image uses: docker/build-push-action@v6 with: - context: 31/fpm + context: 32/fpm platforms: linux/amd64,linux/arm64 push: true tags: ${{ steps.meta.outputs.tags }}