Add 30.0.0, Upgrade to 29.0.7 28.0.10, Remove 27

crazy-max · Sep 23, 2024 · fd80e6e · fd80e6e
1 parent d7537a6
commit fd80e6e
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -19,7 +19,7 @@ on:
       - '**.md'
 
 env:
-  LATEST_DOCKERFILE: Dockerfile-29
+  LATEST_DOCKERFILE: Dockerfile-30
   DOCKERHUB_SLUG: crazymax/nextcloud
   GHCR_SLUG: ghcr.io/crazy-max/nextcloud
 

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -27,9 +27,9 @@ jobs:
       fail-fast: false
       matrix:
         docker_file:
-          - Dockerfile-27
           - Dockerfile-28
           - Dockerfile-29
+          - Dockerfile-30
         dir:
           - mysql
           - pgsql

diff --git a/Dockerfile-28 b/Dockerfile-28
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-ARG NEXTCLOUD_VERSION=28.0.9
+ARG NEXTCLOUD_VERSION=28.0.10
 ARG ALPINE_VERSION=3.20
 
 FROM crazymax/yasu:latest AS yasu

diff --git a/Dockerfile-29 b/Dockerfile-29
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-ARG NEXTCLOUD_VERSION=29.0.5
+ARG NEXTCLOUD_VERSION=29.0.7
 ARG ALPINE_VERSION=3.20
 
 FROM crazymax/yasu:latest AS yasu

diff --git a/Dockerfile-27 → Dockerfile-30 b/Dockerfile-27 → Dockerfile-30
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-ARG NEXTCLOUD_VERSION=27.1.11
+ARG NEXTCLOUD_VERSION=30.0.0
 ARG ALPINE_VERSION=3.20
 
 FROM crazymax/yasu:latest AS yasu
@@ -23,9 +23,10 @@ RUN apk --update --no-cache add \
     ca-certificates \
     curl \
     ffmpeg \
+    util-linux \
     imagemagick \
-    imagemagick-heic \
     imagemagick-pdf \
+    imagemagick-heic \
     imagemagick-svg \
     ghostscript \
     libxml2 \
@@ -66,8 +67,8 @@ RUN apk --update --no-cache add \
     php83-posix \
     php83-redis \
     php83-session \
-    php83-sodium \
     php83-simplexml \
+    php83-sodium \
     php83-sqlite3 \
     php83-sysvsem \
     php83-xml \

diff --git a/docker-bake.hcl b/docker-bake.hcl
@@ -3,7 +3,7 @@ variable "DEFAULT_TAG" {
 }
 
 variable "DOCKERFILE" {
-  default = "Dockerfile-29"
+  default = "Dockerfile-30"
 }
 
 // Special target: https://github.com/docker/metadata-action#bake-definition