From cca3a97eda1d0fb7ba2e99bacb55d6181bd5fbe1 Mon Sep 17 00:00:00 2001
From: "dave@tiredofit.ca" <dave@tiredofit.ca>
Date: Mon, 8 Apr 2024 09:51:04 -0700
Subject: [PATCH] Release 24.04.1-2 - See CHANGELOG.md

---
 CHANGELOG.md | 7 +++++++
 Dockerfile   | 4 ++--
 README.md    | 7 ++++---
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 41bbe7d..22b8665 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 24.04.1-2 2024-04-08 <dave at tiredofit dot ca>
+
+   ### Added
+      - Collabora Office 24.04.1-2
+      - Collabora Online 24.04.1-2
+
+
 ## 23.05.10-1 2024-03-26 <dave at tiredofit dot ca>
 
    ### Added
diff --git a/Dockerfile b/Dockerfile
index 2af6733..82f574e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,10 +13,10 @@ ARG APP_NAME
 ARG APP_BRAND
 
 ### Environment Variables
-ENV COLLABORA_ONLINE_VERSION=${COLLABORA_ONLINE_VERSION:-"cp-23.05.10-1"} \
+ENV COLLABORA_ONLINE_VERSION=${COLLABORA_ONLINE_VERSION:-"cp-24.04.1-2"} \
     COLLABORA_ONLINE_REPO_URL=${COLLABORA_ONLINE_REPO_URL:-"https://github.com/CollaboraOnline/online"} \
     #
-    LIBREOFFICE_VERSION=${LIBREOFFICE_VERSION:-"cp-23.05.10-1"} \
+    LIBREOFFICE_VERSION=${LIBREOFFICE_VERSION:-"cp-24.04.1-2"} \
     LIBREOFFICE_REPO_URL=${LIBREOFFICE_REPO_URL:-"https://github.com/LibreOffice/core"} \
     #
     APP_NAME=${APP_NAME:-"Document Editor"} \
diff --git a/README.md b/README.md
index 46b51a6..fcc3615 100644
--- a/README.md
+++ b/README.md
@@ -87,8 +87,9 @@ The following image tags are available along with their tagged release based on
 
 | Collabora Office version | Collabora Online version | Tag        |
 | ------------------------ | ------------------------ | ---------- |
+| `2024`                   | `24.04.x`                | `24.04.xx` |
+| `2024`                   | `24.04.x`                | `latest`   |
 | `2023`                   | `23.05.x`                | `23.05.xx` |
-| `2023`                   | `23.05.x`                | `latest`   |
 | `2022`                   | `22.05.x`                | `2.4.0`    |
 | `2021`                   | `21.11.0`                | `2.3.0`    |
 | `6.4.x`                  | `6.4.x`                  | `2.1`      |
@@ -102,8 +103,8 @@ Images are built primarily for `amd64` architecture, and may also include builds
 ## Configuration
 ### Quick Start
 
-* The quickest way to get started is using [docker-compose](https://docs.docker.com/compose/). See the examples folder for a working [docker-compose.yml](examples/compose.yml) that can be modified for development or production use.
-* Set various [environment variables](#environment-variables) to understand the capabilities of this image. A Sample `docker-compose.yml` is provided that will work right out of the box for most people without any fancy optimizations.
+* The quickest way to get started is using [docker-compose](https://docs.docker.com/compose/). See the examples folder for a working [compose.yml](examples/compose.yml) that can be modified for development or production use.
+* Set various [environment variables](#environment-variables) to understand the capabilities of this image. A Sample `compose.yml` is provided that will work right out of the box for most people without any fancy optimizations.
 * Map [persistent storage](#data-volumes) for access to configuration and data files for backup.
 * Make sure you set your hostname e.g. online.example.com when starting your container to make sure the administration console urls are correct.