friendica
/
docker
mirror of https://github.com/friendica/docker
2
0
Fork 0
Code Issues Releases Wiki Activity

Deduplicate dependencies 

- Use $PHPIZE_DEPS
- remove imagemick
- remove libfreetype6
- remove freetype
- remove libpng
- remove libcurl
This commit is contained in:
Philipp Holzer 2019-09-08 21:05:53 +02:00
parent e1066901ae
commit 714883836a
No known key found for this signature in database
GPG Key ID: D8365C3D36B77D90
11 changed files with 11 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
2019.06/apache/Dockerfile
View File

@ -24,17 +24,13 @@ RUN set -ex; \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
mysql-client \ mysql-client \
bash \ bash \
autoconf \ $PHPIZE_DEPS \
g++ \
make \
libpng-dev \ libpng-dev \
libjpeg62-turbo-dev \ libjpeg62-turbo-dev \
libtool \ libtool \
imagemagick \
libmagick++-dev \ libmagick++-dev \
libmemcached-dev \ libmemcached-dev \
libgraphicsmagick1-dev \ libgraphicsmagick1-dev \
libfreetype6 \
libfreetype6-dev \ libfreetype6-dev \
librsvg2-2 \ librsvg2-2 \
libzip-dev \ libzip-dev \

11
2019.06/fpm-alpine/Dockerfile
View File

@ -16,25 +16,16 @@ RUN set -ex; \
apk add -U --no-cache --virtual .build-deps \ apk add -U --no-cache --virtual .build-deps \
mysql-client \ mysql-client \
bash \ bash \
autoconf \ $PHPIZE_DEPS \
g++ \
make \
libpng \
libpng-dev \ libpng-dev \
libjpeg-turbo-dev \ libjpeg-turbo-dev \
imagemagick-dev \ imagemagick-dev \
imagemagick \
libtool \ libtool \
libmemcached-dev \ libmemcached-dev \
cyrus-sasl-dev \ cyrus-sasl-dev \
freetype \
libpng \
libjpeg-turbo-dev \ libjpeg-turbo-dev \
freetype-dev \ freetype-dev \
librsvg \ librsvg \
libcurl \
rsync \
bzip2 \
pcre-dev \ pcre-dev \
libzip-dev \ libzip-dev \
; \ ; \

6
2019.06/fpm/Dockerfile
View File

@ -24,17 +24,13 @@ RUN set -ex; \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
mysql-client \ mysql-client \
bash \ bash \
autoconf \ $PHPIZE_DEPS \
g++ \
make \
libpng-dev \ libpng-dev \
libjpeg62-turbo-dev \ libjpeg62-turbo-dev \
libtool \ libtool \
imagemagick \
libmagick++-dev \ libmagick++-dev \
libmemcached-dev \ libmemcached-dev \
libgraphicsmagick1-dev \ libgraphicsmagick1-dev \
libfreetype6 \
libfreetype6-dev \ libfreetype6-dev \
librsvg2-2 \ librsvg2-2 \
libzip-dev \ libzip-dev \

6
2019.09-dev/apache/Dockerfile
View File

@ -24,17 +24,13 @@ RUN set -ex; \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
mysql-client \ mysql-client \
bash \ bash \
autoconf \ $PHPIZE_DEPS \
g++ \
make \
libpng-dev \ libpng-dev \
libjpeg62-turbo-dev \ libjpeg62-turbo-dev \
libtool \ libtool \
imagemagick \
libmagick++-dev \ libmagick++-dev \
libmemcached-dev \ libmemcached-dev \
libgraphicsmagick1-dev \ libgraphicsmagick1-dev \
libfreetype6 \
libfreetype6-dev \ libfreetype6-dev \
librsvg2-2 \ librsvg2-2 \
libzip-dev \ libzip-dev \

11
2019.09-dev/fpm-alpine/Dockerfile
View File

@ -16,25 +16,16 @@ RUN set -ex; \
apk add -U --no-cache --virtual .build-deps \ apk add -U --no-cache --virtual .build-deps \
mysql-client \ mysql-client \
bash \ bash \
autoconf \ $PHPIZE_DEPS \
g++ \
make \
libpng \
libpng-dev \ libpng-dev \
libjpeg-turbo-dev \ libjpeg-turbo-dev \
imagemagick-dev \ imagemagick-dev \
imagemagick \
libtool \ libtool \
libmemcached-dev \ libmemcached-dev \
cyrus-sasl-dev \ cyrus-sasl-dev \
freetype \
libpng \
libjpeg-turbo-dev \ libjpeg-turbo-dev \
freetype-dev \ freetype-dev \
librsvg \ librsvg \
libcurl \
rsync \
bzip2 \
pcre-dev \ pcre-dev \
libzip-dev \ libzip-dev \
; \ ; \

6
2019.09-dev/fpm/Dockerfile
View File

@ -24,17 +24,13 @@ RUN set -ex; \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
mysql-client \ mysql-client \
bash \ bash \
autoconf \ $PHPIZE_DEPS \
g++ \
make \
libpng-dev \ libpng-dev \
libjpeg62-turbo-dev \ libjpeg62-turbo-dev \
libtool \ libtool \
imagemagick \
libmagick++-dev \ libmagick++-dev \
libmemcached-dev \ libmemcached-dev \
libgraphicsmagick1-dev \ libgraphicsmagick1-dev \
libfreetype6 \
libfreetype6-dev \ libfreetype6-dev \
librsvg2-2 \ librsvg2-2 \
libzip-dev \ libzip-dev \

6
2019.09-rc/apache/Dockerfile
View File

@ -24,17 +24,13 @@ RUN set -ex; \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
mysql-client \ mysql-client \
bash \ bash \
autoconf \ $PHPIZE_DEPS \
g++ \
make \
libpng-dev \ libpng-dev \
libjpeg62-turbo-dev \ libjpeg62-turbo-dev \
libtool \ libtool \
imagemagick \
libmagick++-dev \ libmagick++-dev \
libmemcached-dev \ libmemcached-dev \
libgraphicsmagick1-dev \ libgraphicsmagick1-dev \
libfreetype6 \
libfreetype6-dev \ libfreetype6-dev \
librsvg2-2 \ librsvg2-2 \
libzip-dev \ libzip-dev \

11
2019.09-rc/fpm-alpine/Dockerfile
View File

@ -16,25 +16,16 @@ RUN set -ex; \
apk add -U --no-cache --virtual .build-deps \ apk add -U --no-cache --virtual .build-deps \
mysql-client \ mysql-client \
bash \ bash \
autoconf \ $PHPIZE_DEPS \
g++ \
make \
libpng \
libpng-dev \ libpng-dev \
libjpeg-turbo-dev \ libjpeg-turbo-dev \
imagemagick-dev \ imagemagick-dev \
imagemagick \
libtool \ libtool \
libmemcached-dev \ libmemcached-dev \
cyrus-sasl-dev \ cyrus-sasl-dev \
freetype \
libpng \
libjpeg-turbo-dev \ libjpeg-turbo-dev \
freetype-dev \ freetype-dev \
librsvg \ librsvg \
libcurl \
rsync \
bzip2 \
pcre-dev \ pcre-dev \
libzip-dev \ libzip-dev \
; \ ; \

6
2019.09-rc/fpm/Dockerfile
View File

@ -24,17 +24,13 @@ RUN set -ex; \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
mysql-client \ mysql-client \
bash \ bash \
autoconf \ $PHPIZE_DEPS \
g++ \
make \
libpng-dev \ libpng-dev \
libjpeg62-turbo-dev \ libjpeg62-turbo-dev \
libtool \ libtool \
imagemagick \
libmagick++-dev \ libmagick++-dev \
libmemcached-dev \ libmemcached-dev \
libgraphicsmagick1-dev \ libgraphicsmagick1-dev \
libfreetype6 \
libfreetype6-dev \ libfreetype6-dev \
librsvg2-2 \ librsvg2-2 \
libzip-dev \ libzip-dev \

11
Dockerfile-alpine.template
View File

@ -15,25 +15,16 @@ RUN set -ex; \
apk add -U --no-cache --virtual .build-deps \ apk add -U --no-cache --virtual .build-deps \
mysql-client \ mysql-client \
bash \ bash \
autoconf \ $PHPIZE_DEPS \
g++ \
make \
libpng \
libpng-dev \ libpng-dev \
libjpeg-turbo-dev \ libjpeg-turbo-dev \
imagemagick-dev \ imagemagick-dev \
imagemagick \
libtool \ libtool \
libmemcached-dev \ libmemcached-dev \
cyrus-sasl-dev \ cyrus-sasl-dev \
freetype \
libpng \
libjpeg-turbo-dev \ libjpeg-turbo-dev \
freetype-dev \ freetype-dev \
librsvg \ librsvg \
libcurl \
rsync \
bzip2 \
pcre-dev \ pcre-dev \
libzip-dev \ libzip-dev \
; \ ; \

6
Dockerfile-debian.template
View File

@ -23,17 +23,13 @@ RUN set -ex; \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
mysql-client \ mysql-client \
bash \ bash \
autoconf \ $PHPIZE_DEPS \
g++ \
make \
libpng-dev \ libpng-dev \
libjpeg62-turbo-dev \ libjpeg62-turbo-dev \
libtool \ libtool \
imagemagick \
libmagick++-dev \ libmagick++-dev \
libmemcached-dev \ libmemcached-dev \
libgraphicsmagick1-dev \ libgraphicsmagick1-dev \
libfreetype6 \
libfreetype6-dev \ libfreetype6-dev \
librsvg2-2 \ librsvg2-2 \
libzip-dev \ libzip-dev \