From 222690e62c85fe185cdc19069a117feac646ed40 Mon Sep 17 00:00:00 2001 From: aptalca Date: Thu, 21 Jan 2021 12:57:42 -0500 Subject: [PATCH] fix iconv --- Dockerfile | 4 +++- Dockerfile.aarch64 | 4 +++- Dockerfile.armhf | 4 +++- README.md | 8 +++++++- readme-vars.yml | 8 +++++++- 5 files changed, 23 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 627b12a..f9b63df 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,8 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="aptalca" # environment settings -ENV NEXTCLOUD_PATH="/config/www/nextcloud" +ENV NEXTCLOUD_PATH="/config/www/nextcloud" \ + LD_PRELOAD="/usr/lib/preloadable_libiconv.so" RUN \ echo "**** install build packages ****" && \ @@ -27,6 +28,7 @@ RUN \ apk add --no-cache --upgrade \ curl \ ffmpeg \ + gnu-libiconv \ imagemagick \ libxml2 \ php7-apcu \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index dbaf9da..c072399 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -8,7 +8,8 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="aptalca" # environment settings -ENV NEXTCLOUD_PATH="/config/www/nextcloud" +ENV NEXTCLOUD_PATH="/config/www/nextcloud" \ + LD_PRELOAD="/usr/lib/preloadable_libiconv.so" RUN \ echo "**** install build packages ****" && \ @@ -27,6 +28,7 @@ RUN \ apk add --no-cache --upgrade \ curl \ ffmpeg \ + gnu-libiconv \ imagemagick \ libxml2 \ php7-apcu \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index bf6f6eb..aa6baf8 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -8,7 +8,8 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="aptalca" # environment settings -ENV NEXTCLOUD_PATH="/config/www/nextcloud" +ENV NEXTCLOUD_PATH="/config/www/nextcloud" \ + LD_PRELOAD="/usr/lib/preloadable_libiconv.so" RUN \ echo "**** install build packages ****" && \ @@ -27,6 +28,7 @@ RUN \ apk add --no-cache --upgrade \ curl \ ffmpeg \ + gnu-libiconv \ imagemagick \ libxml2 \ php7-apcu \ diff --git a/README.md b/README.md index fd20ab5..d35d10e 100644 --- a/README.md +++ b/README.md @@ -170,10 +170,15 @@ Then restart the container to replace it with the latest one. ### Collaborative Editing -Nextcloud's built-in collaborative editing packages (Collabora and OnlyOffice) only work on x86_64 systems with glibc, and therefore they are not compatible with our images. You should create separate containers for them and set them up in Nextcloud with their respective connector addons. +Nextcloud's built-in collaborative editing packages (Collabora/CODE and OnlyOffice) only work on x86_64 systems with glibc, and therefore they are not compatible with our images. You should create separate containers for them and set them up in Nextcloud with their respective connector addons. If (auto) installed, those built-in packages may cause instability and should be removed. +If you're having issues opening `Apps` or `Settings`, you can remove the default installed CODE Server via running the following command on the host machine: +``` +docker exec -it nextcloud occ app:remove richdocumentscode +``` + ## Docker Mods [![Docker Mods](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=nextcloud&query=%24.mods%5B%27nextcloud%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=nextcloud "view available mods for this container.") [![Docker Universal Mods](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=universal&query=%24.mods%5B%27universal%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=universal "view available universal mods.") @@ -246,6 +251,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **21.01.21:** - Fix php iconv (was breaking the mail addon). Update info on CODE server breaking NC. * **20.01.21:** - Increase php fcgi timeout to prevent 504 Gateway timeout errors (existing users should delete `/config/nginx/site-confs/default` and restart the container). * **16.01.21:** - Rebasing to alpine 3.13. Users with issues on 32-bit arm, [see this article](https://docs.linuxserver.io/faq#my-host-is-incompatible-with-images-based-on-ubuntu-focal-and-alpine-3-13). * **12.08.20:** - Various updates to default site config, including added support for webfinger (existing users should delete `/config/nginx/site-confs/default` and restart the container). diff --git a/readme-vars.yml b/readme-vars.yml index 46635a6..01d1062 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -68,13 +68,19 @@ app_setup_block: | ### Collaborative Editing - Nextcloud's built-in collaborative editing packages (Collabora and OnlyOffice) only work on x86_64 systems with glibc, and therefore they are not compatible with our images. You should create separate containers for them and set them up in Nextcloud with their respective connector addons. + Nextcloud's built-in collaborative editing packages (Collabora/CODE and OnlyOffice) only work on x86_64 systems with glibc, and therefore they are not compatible with our images. You should create separate containers for them and set them up in Nextcloud with their respective connector addons. If (auto) installed, those built-in packages may cause instability and should be removed. + + If you're having issues opening `Apps` or `Settings`, you can remove the default installed CODE Server via running the following command on the host machine: + ``` + docker exec -it nextcloud occ app:remove richdocumentscode + ``` # changelog changelogs: + - { date: "21.01.21:", desc: "Fix php iconv (was breaking the mail addon). Update info on CODE server breaking NC." } - { date: "20.01.21:", desc: "Increase php fcgi timeout to prevent 504 Gateway timeout errors (existing users should delete `/config/nginx/site-confs/default` and restart the container)." } - { date: "16.01.21:", desc: "Rebasing to alpine 3.13. Users with issues on 32-bit arm, [see this article](https://docs.linuxserver.io/faq#my-host-is-incompatible-with-images-based-on-ubuntu-focal-and-alpine-3-13)." } - { date: "12.08.20:", desc: "Various updates to default site config, including added support for webfinger (existing users should delete `/config/nginx/site-confs/default` and restart the container)." }