From d50b45fda59a6f1989e8d5f7e9eb1f3d1856e31c Mon Sep 17 00:00:00 2001 From: "dave@tiredofit.ca" Date: Tue, 22 Nov 2022 13:06:08 -0800 Subject: [PATCH] Release 2.4.17 - See CHANGELOG.md --- .vs/docker-collabora-online/xs/UserPrefs.xml | 3 --- CHANGELOG.md | 7 +++++++ Dockerfile | 4 ++-- docker-collabora-online.sln | 17 ----------------- 4 files changed, 9 insertions(+), 22 deletions(-) delete mode 100644 .vs/docker-collabora-online/xs/UserPrefs.xml delete mode 100644 docker-collabora-online.sln diff --git a/.vs/docker-collabora-online/xs/UserPrefs.xml b/.vs/docker-collabora-online/xs/UserPrefs.xml deleted file mode 100644 index f9c3b07..0000000 --- a/.vs/docker-collabora-online/xs/UserPrefs.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index d8b6833..019b845 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## 2.4.17 2022-11-22 + + ### Added + - Collabora Office cp-22.05.8-3 + - Collabora Online cp-22.05.8-3 + + ## 2.4.16 2022-11-08 ### Added diff --git a/Dockerfile b/Dockerfile index cfcdd60..5ee218f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,10 +11,10 @@ ARG MAX_DOCUMENTS ARG APP_NAME ### Environment Variables -ENV COLLABORA_ONLINE_VERSION=${COLLABORA_ONLINE_VERSION:-"cp-22.05.8-2"} \ +ENV COLLABORA_ONLINE_VERSION=${COLLABORA_ONLINE_VERSION:-"cp-22.05.8-3"} \ COLLABORA_ONLINE_REPO_URL=${COLLABORA_ONLINE_REPO_URL:-"https://github.com/CollaboraOnline/online"} \ # - LIBREOFFICE_VERSION=${LIBREOFFICE_VERSION:-"cp-22.05.8-2"} \ + LIBREOFFICE_VERSION=${LIBREOFFICE_VERSION:-"cp-22.05.8-3"} \ LIBREOFFICE_REPO_URL=${LIBREOFFICE_REPO_URL:-"https://github.com/LibreOffice/core"} \ # APP_NAME=${APP_NAME:-"Document Editor"} \ diff --git a/docker-collabora-online.sln b/docker-collabora-online.sln deleted file mode 100644 index 70c3497..0000000 --- a/docker-collabora-online.sln +++ /dev/null @@ -1,17 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 25.0.1704.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {8F5EFA8D-1117-4BA2-8B7E-9B11AC96E1A2} - EndGlobalSection -EndGlobal