From dc1398bb629e1480ecf1f7b82c446e0bcde9b463 Mon Sep 17 00:00:00 2001 From: "dave@tiredofit.ca" Date: Mon, 7 Nov 2022 13:57:41 -0800 Subject: [PATCH] Release 2.4.14 - See CHANGELOG.md --- CHANGELOG.md | 7 +++++++ Dockerfile | 10 +++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d15e710..2755bc9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## 2.4.14 2022-11-07 + + ### Added + - Collabra Online 22.05.8-1 + - Collabora Office 22.05.8-1 + + ## 2.4.13 2022-10-31 ### Added diff --git a/Dockerfile b/Dockerfile index 6f60c57..a4b7ee8 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.7-3"} \ +ENV COLLABORA_ONLINE_VERSION=${COLLABORA_ONLINE_VERSION:-"cp-22.05.8-1"} \ COLLABORA_ONLINE_REPO_URL=${COLLABORA_ONLINE_REPO_URL:-"https://github.com/CollaboraOnline/online"} \ # - LIBREOFFICE_VERSION=${LIBREOFFICE_VERSION:-"cp-22.05.7-3"} \ + LIBREOFFICE_VERSION=${LIBREOFFICE_VERSION:-"cp-22.05.8-1"} \ LIBREOFFICE_REPO_URL=${LIBREOFFICE_REPO_URL:-"https://github.com/LibreOffice/core"} \ # APP_NAME=${APP_NAME:-"Document Editor"} \ @@ -26,7 +26,7 @@ ENV COLLABORA_ONLINE_VERSION=${COLLABORA_ONLINE_VERSION:-"cp-22.05.7-3"} \ ## Uses Approximately 20mb per document open MAX_DOCUMENTS=${MAX_DOCUMENTS:-"100000"} -ADD build-assets /build-assets +COPY build-assets /build-assets RUN source /assets/functions/00-container && \ set -x && \ @@ -181,7 +181,7 @@ ENV ADMIN_USER=admin \ COPY --from=builder /opt/ /opt/ COPY CHANGELOG.md /assets/.changelogs/tiredofit_docker-collabora-online.md -ADD build-assets /build-assets +COPY build-assets /build-assets ### Install Dependencies RUN set -x && \ @@ -265,4 +265,4 @@ RUN set -x && \ EXPOSE 9980 ### Assets -ADD install / +COPY install /