From f5fc66d984f445515ea54f16f98bd1ea5ba60dc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= <1005065+DeepDiver1975@users.noreply.github.com> Date: Thu, 30 Jul 2026 15:32:37 +0200 Subject: [PATCH] feat(server): update 11.0.0-rc3 to 11.0.0 image from GitHub release tarball MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ownCloud 11.0.0 final is published, so point the v24.04 matrix entry at v11.0.0/owncloud-complete-20260730.tar.bz2 and rename the Trivy ignore folder to match the new tag. Two deliberate choices: - `latest` stays on 10.16.4. 11.0.0 is a new major, so an unpinned `docker pull owncloud/server` should not silently jump to it; 11.0.0 is opt-in via `owncloud/server:11.0.0`, as rc1-rc3 were. Moving `latest` (and adding `11.0`/`11`) is a separate, deliberate one-line change. - The smoke-test version assertion is enabled (`.versionstring`), where the RC entries had it disabled. The final release has a stable version string, so CI can now catch a mismatched tarball. Verified against the published tarballs: `occ status` reports versionstring 11.0.0. Signed-off-by: Thomas Müller <1005065+DeepDiver1975@users.noreply.github.com> --- .github/workflows/main.yml | 8 ++++---- CHANGELOG.md | 5 +++++ README.md | 2 +- agents.md | 4 ++-- v24.04/{11.0.0-rc3 => 11.0.0}/.trivyignore | 0 5 files changed, 12 insertions(+), 7 deletions(-) rename v24.04/{11.0.0-rc3 => 11.0.0}/.trivyignore (100%) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fac1d498..aaf07bf4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -49,11 +49,11 @@ jobs: 10 latest smoke-version-jq: ".versionstring" - - version: 11.0.0-rc3 - tarball: https://github.com/owncloud/core/releases/download/v11.0.0-rc3/owncloud-complete-20260729.tar.bz2 + - version: 11.0.0 + tarball: https://github.com/owncloud/core/releases/download/v11.0.0/owncloud-complete-20260730.tar.bz2 base: v24.04 - trivy-ignore: v24.04/11.0.0-rc3/.trivyignore - smoke-version-jq: "" + trivy-ignore: v24.04/11.0.0/.trivyignore + smoke-version-jq: ".versionstring" update-docker-hub-description: needs: build diff --git a/CHANGELOG.md b/CHANGELOG.md index 58f4a88e..0c05e63b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## 2026-07-30 + +* Changed + * Update 11.0.0-rc3 to 11.0.0 built from the GitHub release tarball + ## 2026-07-29 * Changed diff --git a/README.md b/README.md index c2577b0c..16098af9 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ ownCloud is an open-source file sync, share and content collaboration software t ## Docker Tags and respective Dockerfile links - [`10.16.4`, `10.16`, `10`, `latest`](https://github.com/owncloud-docker/server/blob/master/v22.04/Dockerfile.multiarch) available as `owncloud/server:10.16.4` -- [`11.0.0-rc3`](https://github.com/owncloud-docker/server/blob/master/v24.04/Dockerfile.multiarch) available as `owncloud/server:11.0.0-rc3` +- [`11.0.0`](https://github.com/owncloud-docker/server/blob/master/v24.04/Dockerfile.multiarch) available as `owncloud/server:11.0.0` ## Default volumes diff --git a/agents.md b/agents.md index a2339de8..6c9c0068 100644 --- a/agents.md +++ b/agents.md @@ -20,7 +20,7 @@ GitHub Actions. - `v22.04/Dockerfile.multiarch` — image definition (`FROM owncloud/base:22.04`) - `v22.04/overlay/` — files copied into the image root (`ADD overlay /`); currently empty - `v22.04//.trivyignore` — accepted-CVE exclusions for the Trivy scan -- `v24.04/` — Ubuntu 24.04 based image (ownCloud 11.0.0-rc3) +- `v24.04/` — Ubuntu 24.04 based image (ownCloud 11.0.0) - `v24.04/Dockerfile.multiarch`, `v24.04/overlay/`, `v24.04//.trivyignore` — as above - `docs/` — design/spec notes - `images/` — README screenshots @@ -39,7 +39,7 @@ There is no local application build (no Node/pnpm/Make toolchain). The image is built by `.github/workflows/main.yml`, which calls reusable workflows from [`owncloud-docker/ubuntu`](https://github.com/owncloud-docker/ubuntu): -- Matrix builds two releases: `10.16.4` (base `v22.04`) and `11.0.0-rc3` +- Matrix builds two releases: `10.16.4` (base `v22.04`) and `11.0.0` (base `v24.04`), each via `/Dockerfile.multiarch`. - The ownCloud version is injected with the `TARBALL_URL` build arg — there is no version pinned inside the Dockerfile. diff --git a/v24.04/11.0.0-rc3/.trivyignore b/v24.04/11.0.0/.trivyignore similarity index 100% rename from v24.04/11.0.0-rc3/.trivyignore rename to v24.04/11.0.0/.trivyignore