From 94796ed164cb7e1250d7b331c0e50269ccf89952 Mon Sep 17 00:00:00 2001
From: Dave Conroy <dave@tiredofit.ca>
Date: Tue, 22 Mar 2022 18:40:35 -0700
Subject: [PATCH] Release 2.3.6 - See CHANGELOG.md

---
 CHANGELOG.md | 7 +++++++
 Dockerfile   | 5 +++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0996b8f..4a84f26 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 2.3.6 2022-03-22 <dave at tiredofit dot ca>
+
+   ### Added
+      - Libreoffice Core cp-21.06.22-1
+      - Collabora Online cp-21.11.3-2
+
+
 ## 2.3.5 2022-02-10 <dave at tiredofit dot ca>
 
    ## Changed
diff --git a/Dockerfile b/Dockerfile
index 6c38f9a..8daacad 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,11 +14,11 @@ ARG APP_NAME
 
 ### Environment Variables
 ENV COLLABORA_ONLINE_BRANCH=${COLLABORA_ONLINE_BRANCH:-"master"} \
-    COLLABORA_ONLINE_VERSION=${COLLABORA_ONLINE_VERSION:-"cp-21.11.2-0"} \
+    COLLABORA_ONLINE_VERSION=${COLLABORA_ONLINE_VERSION:-"cp-21.11.3-2"} \
     COLLABORA_ONLINE_REPO_URL=${COLLABORA_ONLINE_REPO_URL:-"https://github.com/CollaboraOnline/online"} \
     #
     LIBREOFFICE_BRANCH=${LIBREOFFICE_BRANCH:-"master"} \
-    LIBREOFFICE_VERSION=${LIBREOFFICE_VERSION:-"cp-21.06.16-1"} \
+    LIBREOFFICE_VERSION=${LIBREOFFICE_VERSION:-"cp-21.06.22-1"} \
     LIBREOFFICE_REPO_URL=${LIBREOFFICE_REPO_URL:-"https://github.com/LibreOffice/core"} \
     #
     APP_NAME=${APP_NAME:-"Document Editor"} \
@@ -188,6 +188,7 @@ ENV ADMIN_USER=admin \
 
 ### Grab Compiled Assets from builder image
 COPY --from=builder /opt/ /opt/
+COPY CHANGELOG.md /assets/.changelogs/tiredofit_docker-collabora-online.md
 
 ADD build-assets /build-assets