From 9ae4bd0f7ec295d3e41d4103de8867f6fc24b621 Mon Sep 17 00:00:00 2001
From: "dave@tiredofit.ca" <dave@tiredofit.ca>
Date: Fri, 19 May 2023 08:23:04 -0700
Subject: [PATCH] Release 23.05.0-1 - See CHANGELOG.md

---
 CHANGELOG.md |  9 +++++++++
 Dockerfile   |  4 ++--
 README.md    | 19 ++++++++++---------
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fc7b631..fceefc7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+## 23.05.0-1 2023-05-19 <dave at tiredofit dot ca>
+
+New versioning scheme
+
+   ### Added
+      - Collabora Online 23.05.0-1
+      - Collabora Office 23.05.0-1
+
+
 ## 2.4.34 2023-05-05 <dave at tiredofit dot ca>
 
    ### Added
diff --git a/Dockerfile b/Dockerfile
index 5bb2eb4..2a0eb4c 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-22.05.14-3"} \
+ENV COLLABORA_ONLINE_VERSION=${COLLABORA_ONLINE_VERSION:-"cp-23.05.0-1"} \
     COLLABORA_ONLINE_REPO_URL=${COLLABORA_ONLINE_REPO_URL:-"https://github.com/CollaboraOnline/online"} \
     #
-    LIBREOFFICE_VERSION=${LIBREOFFICE_VERSION:-"cp-22.05.14-4"} \
+    LIBREOFFICE_VERSION=${LIBREOFFICE_VERSION:-"cp-23.05.0-1"} \
     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 e983003..90711a3 100644
--- a/README.md
+++ b/README.md
@@ -84,15 +84,16 @@ docker pull tiredofit/collabora-online:(imagetag)
 
 The following image tags are available along with their tagged release based on what's written in the [Changelog](CHANGELOG.md):
 
-| LibreOffice version | Collabora Online version | Tag      |
-| ------------------- | ------------------------ | -------- |
-| `2022`              | `22.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`    |
-| `6.4.x`             | `6.4.x`                  | `2.0`    |
-| `6.0.x`             | `4.0.x`                  | `1.6`    |
-| `5.3.x`             | `3.4.x`                  | `1.1`    |
+| Collabora Office version | Collabora Online version | Tag        |
+| ------------------------ | ------------------------ | ---------- |
+| `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`      |
+| `6.4.x`                  | `6.4.x`                  | `2.0`      |
+| `6.0.x`                  | `4.0.x`                  | `1.6`      |
+| `5.3.x`                  | `3.4.x`                  | `1.1`      |
 
 #### Multi Architecture
 Images are built primarily for `amd64` architecture, and may also include builds for `arm/v7`, `arm64` and others. These variants are all unsupported. Consider [sponsoring](https://github.com/sponsors/tiredofit) my work so that I can work with various hardware. To see if this image supports multiple architecures, type `docker manifest (image):(tag)`