Skip to content

Commit

Permalink
Update to fix imagemagick
Browse files Browse the repository at this point in the history
Changes to be committed:
	modified:   Dockerfile.template
	modified:   latest/apache/Dockerfile
	modified:   latest/fpm-alpine/Dockerfile
	modified:   latest/fpm/Dockerfile
  • Loading branch information
MaxWaldorf committed Jun 25, 2022
1 parent e6567fb commit 31f727e
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 4 deletions.
7 changes: 5 additions & 2 deletions Dockerfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,17 @@ RUN set -eux; \
ghostscript \
# Alpine package for "imagemagick" contains ~120 .so files
imagemagick \
# wget if not there
wget \
;
{{ ) else ( -}}
RUN set -eux; \
apt-get update; \
apt-get install -y --no-install-recommends \
# Ghostscript is required for rendering PDF previews
ghostscript \
# ImageMagick is required for advanced image processing
imagemagick \
# wget if not there
wget \
; \
Expand All @@ -55,8 +59,7 @@ RUN apk add --no-cache \
less \
mariadb-client \
nano \
postgresql-client \
wget
postgresql-client
{{ ) else "" end -}}

RUN set -ex; \
Expand Down
2 changes: 2 additions & 0 deletions latest/apache/Dockerfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions latest/fpm-alpine/Dockerfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions latest/fpm/Dockerfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 31f727e

Please sign in to comment.