From 067a405c4ffce341d792327aed5d0985d4e79c0e Mon Sep 17 00:00:00 2001 From: Dave Conroy Date: Fri, 29 Oct 2021 09:42:18 -0700 Subject: [PATCH] Release 2.2.4 - See CHANGELOG.md --- CHANGELOG.md | 7 +++++++ Dockerfile | 8 ++++---- README.md | 4 ++-- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 29ce75b..442994d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## 2.2.4 2021-10-29 + + ### Added + - Libreoffice Core 6.4-49 + - Collabora Online 6.4.13-3 + + ## 2.2.3 2021-09-02 ### Added diff --git a/Dockerfile b/Dockerfile index 3b4a44b..d10e4c1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM tiredofit/debian:buster as builder +FROM docker.io/tiredofit/debian:buster as builder LABEL maintainer="Dave Conroy (dave at tiredofit dot ca)" ### Buildtime arguments @@ -14,11 +14,11 @@ ARG APP_NAME ### Environment Variables ENV COLLABORA_ONLINE_BRANCH=${COLLABORA_ONLINE_BRANCH:-"master"} \ - COLLABORA_ONLINE_VERSION=${COLLABORA_ONLINE_VERSION:-"cp-6.4.11-1"} \ + COLLABORA_ONLINE_VERSION=${COLLABORA_ONLINE_VERSION:-"cp-6.4.13-3"} \ COLLABORA_ONLINE_REPO_URL=${COLLABORA_ONLINE_REPO_URL:-"https://github.com/CollaboraOnline/online"} \ # LIBREOFFICE_BRANCH=${LIBREOFFICE_BRANCH:-"master"} \ - LIBREOFFICE_VERSION=${LIBREOFFICE_VERSION:-"cp-6.4-47"} \ + LIBREOFFICE_VERSION=${LIBREOFFICE_VERSION:-"cp-6.4-49"} \ LIBREOFFICE_REPO_URL=${LIBREOFFICE_REPO_URL:-"https://github.com/LibreOffice/core"} \ # APP_NAME=${APP_NAME:-"Document Editor"} \ @@ -179,7 +179,7 @@ RUN set -x && \ rm -rf /var/lib/apt/lists/* && \ rm -rf /var/log/* -FROM tiredofit/debian:buster +FROM docker.io/tiredofit/debian:buster LABEL maintainer="Dave Conroy (dave at tiredofit dot ca)" ### Set Defaults diff --git a/README.md b/README.md index 97c38ed..3157ff1 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ This will build a Docker image for [LibreOffice Online](https://libreoffice.org/ - [Installation](#installation) - [Build from Source](#build-from-source) - [Prebuilt Images](#prebuilt-images) - - [Multi Archictecture](#multi-archictecture) + - [Multi Architecture](#multi-archictecture) - [Configuration](#configuration) - [Quick Start](#quick-start) - [Persistent Storage](#persistent-storage) @@ -88,7 +88,7 @@ The following image tags are available along with their taged release based on w | `6.0.x` | `4.0.x` | `1.6` | | `5.3.x` | `3.4.x` | 1.1 | -#### Multi Archictecture +#### Multi Architecture Images are built primarily for `amd64` architecture, and may also include builds for `arm/v6`, `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)` ## Configuration