Merge pull request #41 from thelamer/master

#33 update x86 and aarch64 to use old version of tidyhtml

Author: aptalca

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 && \

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 && \

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.

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." }