Merge branch '0ranki-patch-1' into 25

.github/workflows/25.yaml

@@ -0,0 +1,48 @@
+# This is a basic workflow to help you get started with Actions
+
+name: Automatic Build
+
+# Controls when the workflow will run
+on:
+  # Triggers the workflow on push or pull request events but only for the "master" branch
+  push:
+    tags:
+    - "25*"
+    # branches: [ "master" ]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  build:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Build and Publish Tag Docker image
+        uses: VaultVulp/gp-docker-action@1.6.0
+        with:
+            github-token: ${{ secrets.GITHUB_TOKEN }} # Provide GITHUB_TOKEN to login into the GitHub Packages
+            image-name: nextcloud # Provide only Docker image name
+            extract-git-tag: true # Provide flag to extract Docker image tag from git reference
+            custom-args: --platform=linux/arm64,linux/amd64
+    
+#    # Steps represent a sequence of tasks that will be executed as part of the job
+#    steps:
+#      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+#      - uses: actions/checkout@v3
+#
+#      # Runs a single command using the runners shell
+#      - name: Run a one-line script
+#        run: echo Hello, world!
+#
+#      # Runs a set of commands using the runners shell
+#      - name: Run a multi-line script
+#        run: |
+#          echo Add other actions to build,
+#          echo test, and deploy your project.

.github/workflows/main.yml

@@ -6,6 +6,8 @@ name: Automatic Build
 on:
   # Triggers the workflow on push or pull request events but only for the "master" branch
   push:
+    tags:
+    - "26*"
     # branches: [ "master" ]
 
   # Allows you to run this workflow manually from the Actions tab
@@ -23,11 +25,13 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Build and Publish Tag Docker image
-        uses: VaultVulp/gp-docker-action@1.2.0
+        uses: VaultVulp/gp-docker-action@1.6.0
         with:
             github-token: ${{ secrets.GITHUB_TOKEN }} # Provide GITHUB_TOKEN to login into the GitHub Packages
             image-name: nextcloud # Provide only Docker image name
             extract-git-tag: true # Provide flag to extract Docker image tag from git reference
+            additional-image-tags: latest
+            custom-args: --platform=linux/arm64,linux/amd64 # specify target architectures via the 
     
 #    # Steps represent a sequence of tasks that will be executed as part of the job
 #    steps:

README.md

@@ -7,6 +7,12 @@ source, adding the required packages to generate video previews.
 Starting from 24.0.9 and 25.0.3 `supervisord` is no longer installed. A separate
 cron container is recommended as per upstream recommendations.
 
+**Starting from 26.0.1 and 25.0.6 the builds are multiarch for `linux/amd64` and `linux/arm64`**
+
+**The `latest` tag points to 26.0.x**
+
+I strongly recommend using a specific version in your docker-compose, kube YAML files or scripts. This will avoid accidentally updating your instance.
+
 I'll try to keep up with Nextcloud's upstream releases.
 The build itself is automated, but requires a tag to be pushed before triggering,
 so there may be a slight delay before a new image version is built. The plan is to
@@ -17,9 +23,9 @@ For instructions on using these images, go to https://github.com/nextcloud/docke
 and https://docs.nextcloud.com/.
 
 Simply use `ghcr.io/0ranki/nextcloud-previews/nextcloud:<version>`
-instead of `docker.io/library/nextcloud`. A `latest` tag is also included, but since
-the process of tagging it is manual, you should check that the digests match with the
-latest versioned image, in case I forgot to tag it.
+instead of `docker.io/library/nextcloud`.
+
+### `latest` currently points to 26.0.x
 
 To pull e.g. version 24.0.3:
 ```