diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9d023ce..f7b2f9a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -88,6 +88,7 @@ jobs: sed -i "/FROM .*/a LABEL tiredofit.image.image_build_date=\"$(date +'%Y-%m-%d %H:%M:%S')\"" Dockerfile if [ -f "CHANGELOG.md" ] ; then sed -i "/FROM .*/a LABEL tiredofit.image.git_changelog_version=\"$(head -n1 ./CHANGELOG.md | awk '{print $2}')\"" Dockerfile + mkdir -p install/assets/.changelogs ; cp CHANGELOG.md install/assets/.changelogs/${GITHUB_REPOSITORY/\//_}.md fi if [[ $GITHUB_REF == refs/tags/* ]]; then diff --git a/CHANGELOG.md b/CHANGELOG.md index cd68039..d0d247b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +## 2.2.1 2021-07-26 + + ### Added + - Libreoffice Core 6.4.45 + - Collabora Online 6.4.10-5 + + ### Changed + - Bugfix for console output when adding new languages + + ## 2.2.0 2021-07-11 ### Added diff --git a/Dockerfile b/Dockerfile index d358dde..cf76578 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-6.4.10-1"} \ + COLLABORA_ONLINE_VERSION=${COLLABORA_ONLINE_VERSION:-"cp-6.4.10-5"} \ 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-44"} \ + LIBREOFFICE_VERSION=${LIBREOFFICE_VERSION:-"cp-6.4-45"} \ 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 4b5b799..97c38ed 100644 --- a/README.md +++ b/README.md @@ -158,52 +158,52 @@ Be sure to view the following repositories to understand all the customizable op The image comes with English (US, GB, Canada variants) baked into the image, however upon container startup you can add more spell check variants via environment variables. Add multiple dictionaries by seperating with a comma. -| Parameter | Value | Description | -| -------------- | ----------- | ---------------------- | -| `DICTIONARIES` | `af` | Afrikaans | -| | `an` | Aragonese | -| | `ar` | Arabic | -| | `be` | Belarusian | -| | `bg` | Bulgarian | -| | `bn` | Bengali | -| | `br` | Breton | -| | `bs` | Bosnian | -| | `ca` | Catalan | -| | `cs` | Czech | -| | `da` | Danish | -| | `de` | German | -| | `el` | Greek | -| | `en-au` | English (Australia) | -| | `en-za` | English (South Africa) | -| | `es` | Spanish | -| | `fr` | French | -| | `gd` | Gaelic | -| | `he` | Hebrew | -| | `hi` | Hindi | -| | `hu` | Hungarian | -| | `id` | Indonesian | -| | `is` | Icelandic | -| | `it` | Italian | -| | `ko` | Korean | -| | `lo` | Laotian | -| | `lt` | Lithuanian | -| | `lv` | Latvian | -| | `ne` | Nepalese | -| | `nl` | Dutch | -| | `no` | Norwegian | -| | `pl` | Polish | -| | `pt-br` | Portugese (Brazil) | -| | `pt-pt` | Portugese | -| | `ro` | Romanian | -| | `ru` | Russian | -| | `sk` | Slovak | -| | `sr` | Serbian | -| | `sv` | Swedish | -| | `sw` | Kiswahili | -| | `th` | Thai | -| | `tr` | Turkish | -| | `uk` | Ukranian | -| | `vi` | Vietnamese | +| Parameter | Value | Description | +| -------------- | ------- | ---------------------- | +| `DICTIONARIES` | `af` | Afrikaans | +| | `an` | Aragonese | +| | `ar` | Arabic | +| | `be` | Belarusian | +| | `bg` | Bulgarian | +| | `bn` | Bengali | +| | `br` | Breton | +| | `bs` | Bosnian | +| | `ca` | Catalan | +| | `cs` | Czech | +| | `da` | Danish | +| | `de` | German | +| | `el` | Greek | +| | `en-au` | English (Australia) | +| | `en-za` | English (South Africa) | +| | `es` | Spanish | +| | `fr` | French | +| | `gd` | Gaelic | +| | `he` | Hebrew | +| | `hi` | Hindi | +| | `hu` | Hungarian | +| | `id` | Indonesian | +| | `is` | Icelandic | +| | `it` | Italian | +| | `ko` | Korean | +| | `lo` | Laotian | +| | `lt` | Lithuanian | +| | `lv` | Latvian | +| | `ne` | Nepalese | +| | `nl` | Dutch | +| | `no` | Norwegian | +| | `pl` | Polish | +| | `pt-br` | Portugese (Brazil) | +| | `pt-pt` | Portugese | +| | `ro` | Romanian | +| | `ru` | Russian | +| | `sk` | Slovak | +| | `sr` | Serbian | +| | `sv` | Swedish | +| | `sw` | Kiswahili | +| | `th` | Thai | +| | `tr` | Turkish | +| | `uk` | Ukranian | +| | `vi` | Vietnamese | #### TLS Settings | Parameter | Description | Default | | -------------------------- | ------------------------------------------------------------------- | -------------------- | diff --git a/install/assets/defaults/10-loolwsd b/install/assets/defaults/10-loolwsd index d3f4ced..f4b6d96 100755 --- a/install/assets/defaults/10-loolwsd +++ b/install/assets/defaults/10-loolwsd @@ -27,6 +27,7 @@ FILE_SIZE_LIMIT=${FILE_SIZE_LIMIT:-0} IDLE_SAVE=${IDLE_SAVE:-30} IDLE_UNLOAD_TIMEOUT=${IDLE_UNLOAD_TIMEOUT:-3600} INTERFACE=${INTERFACE:-"classic"} +LANGUAGE=${LANGUAGE:-''} LOG_ANONYMIZE=${LOG_ANONYMIZE:-"FALSE"} LOG_ANONYMIZE_SALT=${LOG_ANONYMIZE_SALT:-"$(date +%s%N | cut -b12-19)"} LOG_CLIENT_CONSOLE=${LOG_CLIENT_CONSOLE:-"false"} diff --git a/install/etc/cont-init.d/10-loolwsd b/install/etc/cont-init.d/10-loolwsd index 267cc93..7217411 100755 --- a/install/etc/cont-init.d/10-loolwsd +++ b/install/etc/cont-init.d/10-loolwsd @@ -23,7 +23,7 @@ if [ -n "${DICTIONARIES}" ]; then silent apt-get update for lang in $langs do - print_notice "Adding dictionary for '{lang}' - Please wait.." + print_notice "Adding dictionary for '${lang}' - Please wait.." case "${lang}" in "de" ) silent apt-get install -y hunspell-de-de