Merge pull request #2255 from nextcloud/enh/noid/remove-workarounds

remove temporarily added dependencies after avatar problem was fixed
This commit is contained in:
Simon L 2023-04-03 10:29:01 +02:00 committed by GitHub
commit 409dda00bd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -27,32 +27,21 @@ RUN set -ex; \
apk add --no-cache --virtual .build-deps \ apk add --no-cache --virtual .build-deps \
$PHPIZE_DEPS \ $PHPIZE_DEPS \
autoconf \ autoconf \
libtool \
freetype-dev \ freetype-dev \
gmp-dev \
icu-dev \ icu-dev \
imagemagick-dev \
libevent-dev \ libevent-dev \
libjpeg-turbo-dev \ libjpeg-turbo-dev \
libmcrypt-dev \ libmcrypt-dev \
libpng-dev \
libmemcached-dev \ libmemcached-dev \
libpng-dev \
libwebp-dev \
libxml2-dev \ libxml2-dev \
libzip-dev \ libzip-dev \
openldap-dev \ openldap-dev \
pcre-dev \ pcre-dev \
postgresql-dev \ postgresql-dev \
libwebp-dev \
gmp-dev \
lcms2-dev \
fontconfig-dev \
freetype-dev \
ghostscript-dev \
tiff-dev \
zlib-dev \
imagemagick-dev \
libheif-dev \
librsvg-dev \
libxext-dev \
ghostscript-fonts \
; \ ; \
\ \
docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \ docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \
@ -61,6 +50,7 @@ RUN set -ex; \
bcmath \ bcmath \
exif \ exif \
gd \ gd \
gmp \
intl \ intl \
ldap \ ldap \
opcache \ opcache \
@ -68,7 +58,6 @@ RUN set -ex; \
pdo_pgsql \ pdo_pgsql \
sysvsem \ sysvsem \
zip \ zip \
gmp \
; \ ; \
\ \
# pecl will claim success even if one install fails, so we need to perform each install separately # pecl will claim success even if one install fails, so we need to perform each install separately
@ -216,12 +205,7 @@ RUN set -ex; \
mawk \ mawk \
sudo \ sudo \
grep \ grep \
coreutils \ coreutils;
libjpeg \
librsvg \
libheif \
libpng \
ghostscript-fonts;
RUN set -ex; \ RUN set -ex; \
grep -q '^pm = dynamic' /usr/local/etc/php-fpm.d/www.conf; \ grep -q '^pm = dynamic' /usr/local/etc/php-fpm.d/www.conf; \