Merge 325b9d0c7e into 7e1fba34d7

.github/workflows/pr.yml

@@ -0,0 +1,81 @@
+name: Publish Docker image for PR
+
+on:
+  push:
+    branches:
+      - master
+  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
+            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
+        with:
+          context: 32/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
+            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
+        with:
+          context: 32/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

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \