From 29b33142736945a4e6af51e361508eb779f8116c Mon Sep 17 00:00:00 2001 From: thelamer Date: Fri, 26 Jul 2019 13:55:45 -0700 Subject: [PATCH] #33 update x86 and aarch64 to use old version of tidyhtml --- Dockerfile | 5 +++++ Dockerfile.aarch64 | 5 +++++ README.md | 1 + readme-vars.yml | 1 + 4 files changed, 12 insertions(+) diff --git a/Dockerfile b/Dockerfile index ae2e88a..78d2251 100644 --- a/Dockerfile +++ b/Dockerfile @@ -35,6 +35,11 @@ RUN \ tar \ ttf-freefont \ wkhtmltopdf && \ + echo "**** tidy bug fix ****" && \ + curl -s \ + http://dl-cdn.alpinelinux.org/alpine/v3.7/community/x86_64/tidyhtml-libs-5.4.0-r0.apk | \ + tar xfz - -C / && \ + rm -f /usr/lib/libtidy.so.5.6.0 && \ echo "**** configure php-fpm ****" && \ sed -i 's/;clear_env = no/clear_env = no/g' /etc/php7/php-fpm.d/www.conf && \ echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php7/php-fpm.conf && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 68732e4..1bca3a1 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -35,6 +35,11 @@ RUN \ tar \ ttf-freefont \ wkhtmltopdf && \ + echo "**** tidy bug fix ****" && \ + curl -s \ + http://dl-cdn.alpinelinux.org/alpine/v3.7/community/aarch64/tidyhtml-libs-5.4.0-r0.apk | \ + tar xfz - -C / && \ + rm -f /usr/lib/libtidy.so.5.6.0 && \ echo "**** configure php-fpm ****" && \ sed -i 's/;clear_env = no/clear_env = no/g' /etc/php7/php-fpm.d/www.conf && \ echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php7/php-fpm.conf && \ diff --git a/README.md b/README.md index 849c8fb..ceaecaa 100644 --- a/README.md +++ b/README.md @@ -230,6 +230,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **26.07.19:** - Use old version of tidyhtml pending upstream fixes. * **28.06.19:** - Rebasing to alpine 3.10. * **14.06.19:** - Add wkhtmltopdf to image for PDF rendering. * **20.04.19:** - Rebase to Alpine 3.9, add MySQL init logic. diff --git a/readme-vars.yml b/readme-vars.yml index c09fbc7..22c33a7 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -100,6 +100,7 @@ app_setup_block: | # changelog changelogs: + - { date: "26.07.19:", desc: "Use old version of tidyhtml pending upstream fixes." } - { date: "28.06.19:", desc: "Rebasing to alpine 3.10." } - { date: "14.06.19:", desc: "Add wkhtmltopdf to image for PDF rendering." } - { date: "20.04.19:", desc: "Rebase to Alpine 3.9, add MySQL init logic." }