From 5c90943af46cd32631ac8cac173c74f0645630b5 Mon Sep 17 00:00:00 2001 From: CrazyMax Date: Sun, 18 Jun 2023 19:35:02 +0200 Subject: [PATCH 1/2] Nextcloud 25.0.7, 26.0.2, 27.0.0 --- .github/workflows/build.yml | 2 +- .github/workflows/test.yml | 2 +- Dockerfile-25 | 2 +- Dockerfile-26 | 2 +- Dockerfile-24 => Dockerfile-27 | 3 ++- docker-bake.hcl | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) rename Dockerfile-24 => Dockerfile-27 (98%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5e332df..3262a41 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,7 +19,7 @@ on: - '**.md' env: - LATEST_DOCKERFILE: Dockerfile-26 + LATEST_DOCKERFILE: Dockerfile-27 DOCKERHUB_SLUG: crazymax/nextcloud GHCR_SLUG: ghcr.io/crazy-max/nextcloud diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 980a500..b60d816 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -25,9 +25,9 @@ jobs: fail-fast: false matrix: docker_file: - - Dockerfile-24 - Dockerfile-25 - Dockerfile-26 + - Dockerfile-27 steps: - name: Checkout diff --git a/Dockerfile-25 b/Dockerfile-25 index 066df7b..b9e7648 100644 --- a/Dockerfile-25 +++ b/Dockerfile-25 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG NEXTCLOUD_VERSION=25.0.6 +ARG NEXTCLOUD_VERSION=25.0.7 ARG ALPINE_VERSION=3.17 ARG SMBCLIENT_VERSION=1.0.6 diff --git a/Dockerfile-26 b/Dockerfile-26 index 99f689a..081ea7a 100644 --- a/Dockerfile-26 +++ b/Dockerfile-26 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG NEXTCLOUD_VERSION=26.0.1 +ARG NEXTCLOUD_VERSION=26.0.2 ARG ALPINE_VERSION=3.17 ARG SMBCLIENT_VERSION=1.0.6 diff --git a/Dockerfile-24 b/Dockerfile-27 similarity index 98% rename from Dockerfile-24 rename to Dockerfile-27 index 3e2593c..03a2676 100644 --- a/Dockerfile-24 +++ b/Dockerfile-27 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG NEXTCLOUD_VERSION=24.0.12 +ARG NEXTCLOUD_VERSION=27.0.0 ARG ALPINE_VERSION=3.17 ARG SMBCLIENT_VERSION=1.0.6 @@ -65,6 +65,7 @@ RUN apk --update --no-cache add \ php81-session \ php81-simplexml \ php81-sqlite3 \ + php81-sysvsem \ php81-xml \ php81-xmlreader \ php81-xmlwriter \ diff --git a/docker-bake.hcl b/docker-bake.hcl index 538745f..06bcb30 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -3,7 +3,7 @@ variable "DEFAULT_TAG" { } variable "DOCKERFILE" { - default = "Dockerfile-26" + default = "Dockerfile-27" } // Special target: https://github.com/docker/metadata-action#bake-definition From b7c3841ac322c3cb3fedf9596c856c265578be17 Mon Sep 17 00:00:00 2001 From: CrazyMax Date: Sun, 18 Jun 2023 19:39:39 +0200 Subject: [PATCH 2/2] Alpine Linux 3.18 --- Dockerfile-25 | 2 +- Dockerfile-26 | 2 +- Dockerfile-27 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile-25 b/Dockerfile-25 index b9e7648..b505051 100644 --- a/Dockerfile-25 +++ b/Dockerfile-25 @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 ARG NEXTCLOUD_VERSION=25.0.7 -ARG ALPINE_VERSION=3.17 +ARG ALPINE_VERSION=3.18 ARG SMBCLIENT_VERSION=1.0.6 FROM crazymax/yasu:latest AS yasu diff --git a/Dockerfile-26 b/Dockerfile-26 index 081ea7a..b1234f0 100644 --- a/Dockerfile-26 +++ b/Dockerfile-26 @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 ARG NEXTCLOUD_VERSION=26.0.2 -ARG ALPINE_VERSION=3.17 +ARG ALPINE_VERSION=3.18 ARG SMBCLIENT_VERSION=1.0.6 FROM crazymax/yasu:latest AS yasu diff --git a/Dockerfile-27 b/Dockerfile-27 index 03a2676..d9e926c 100644 --- a/Dockerfile-27 +++ b/Dockerfile-27 @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 ARG NEXTCLOUD_VERSION=27.0.0 -ARG ALPINE_VERSION=3.17 +ARG ALPINE_VERSION=3.18 ARG SMBCLIENT_VERSION=1.0.6 FROM crazymax/yasu:latest AS yasu