Skip to content

Commit

Permalink
Merge pull request #4048 from nextcloud/enh/4042/inverse-imagemagick
Browse files Browse the repository at this point in the history
inverse the addition of imagemagick by deleting it if it was not added
  • Loading branch information
szaimen authored Jan 17, 2024
2 parents 18237f5 + d045a00 commit c75c3a0
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 0 deletions.
1 change: 1 addition & 0 deletions Containers/nextcloud/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@ RUN set -ex; \
grep \
nodejs \
bind-tools \
imagemagick \
coreutils; \
\
grep -q '^pm = dynamic' /usr/local/etc/php-fpm.d/www.conf; \
Expand Down
4 changes: 4 additions & 0 deletions Containers/nextcloud/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@ sudo -u www-data rm -f "$NEXTCLOUD_DATA_DIR/this-is-a-test-file"
# Install additional dependencies
if [ -n "$ADDITIONAL_APKS" ]; then
if ! [ -f "/additional-apks-are-installed" ]; then
# Allow to disable imagemagick without having to download it each time
if ! echo "$ADDITIONAL_APKS" | grep -q imagemagick; then
apk del imagemagick;
fi
read -ra ADDITIONAL_APKS_ARRAY <<< "$ADDITIONAL_APKS"
for app in "${ADDITIONAL_APKS_ARRAY[@]}"; do
echo "Installing $app via apk..."
Expand Down

0 comments on commit c75c3a0

Please sign in to comment.