friendica/docker
2
0
Fork 0
mirror of https://github.com/friendica/docker synced 2025-01-19 21:41:14 +01:00
Code Issues Releases Wiki Activity

Merge pull request #78 from nupplaphil/task/docker-77-deduplicate

Browse source 
docker-77 Deduplicate dependencies
This commit is contained in:
Hypolite Petovan 2019-09-09 16:48:34 -04:00 committed by GitHub
commit 8c7f3e81cc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 11 additions and 211 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
2019.06/apache/Dockerfile
View file

@ -22,26 +22,17 @@ RUN set -ex; \
\ \
apt-get update; \ apt-get update; \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
libxml2-dev \
mysql-client \ mysql-client \
bash \ bash \
autoconf \ $PHPIZE_DEPS \
g++ \
make \
openssl \
libssl-dev \
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 \
libcurl4-openssl-dev \
curl \
libzip-dev \ libzip-dev \
; \ ; \
docker-php-ext-configure gd \ docker-php-ext-configure gd \
@ -51,18 +42,11 @@ RUN set -ex; \
--with-jpeg-dir=/usr/include/ \ --with-jpeg-dir=/usr/include/ \
; \ ; \
docker-php-ext-install -j "$(nproc)" \ docker-php-ext-install -j "$(nproc)" \
curl \
pdo \
pdo_mysql \ pdo_mysql \
xml \
gd \ gd \
zip \ zip \
opcache \ opcache \
mbstring \
posix \
ctype \ ctype \
json \
iconv \
pcntl \ pcntl \
; \ ; \
\ \

24
2019.06/fpm-alpine/Dockerfile
View file

@ -14,32 +14,18 @@ RUN set -ex; \
RUN set -ex; \ RUN set -ex; \
\ \
apk add -U --no-cache --virtual .build-deps \ apk add -U --no-cache --virtual .build-deps \
libxml2-dev \
mysql-client \ mysql-client \
bash \ bash \
autoconf \ $PHPIZE_DEPS \
g++ \
make \
openssl \
openssl-dev \
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 \
curl \
curl-dev \
rsync \
bzip2 \
pcre-dev \ pcre-dev \
libzip-dev \ libzip-dev \
; \ ; \
@ -52,18 +38,10 @@ RUN set -ex; \
; \ ; \
\ \
docker-php-ext-install -j "$(nproc)" \ docker-php-ext-install -j "$(nproc)" \
curl \
pdo \
pdo_mysql \ pdo_mysql \
xml \
gd \ gd \
zip \ zip \
opcache \ opcache \
mbstring \
posix \
ctype \
json \
iconv \
pcntl \ pcntl \
; \ ; \
\ \

18
2019.06/fpm/Dockerfile
View file

@ -22,26 +22,17 @@ RUN set -ex; \
\ \
apt-get update; \ apt-get update; \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
libxml2-dev \
mysql-client \ mysql-client \
bash \ bash \
autoconf \ $PHPIZE_DEPS \
g++ \
make \
openssl \
libssl-dev \
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 \
libcurl4-openssl-dev \
curl \
libzip-dev \ libzip-dev \
; \ ; \
docker-php-ext-configure gd \ docker-php-ext-configure gd \
@ -51,18 +42,11 @@ RUN set -ex; \
--with-jpeg-dir=/usr/include/ \ --with-jpeg-dir=/usr/include/ \
; \ ; \
docker-php-ext-install -j "$(nproc)" \ docker-php-ext-install -j "$(nproc)" \
curl \
pdo \
pdo_mysql \ pdo_mysql \
xml \
gd \ gd \
zip \ zip \
opcache \ opcache \
mbstring \
posix \
ctype \ ctype \
json \
iconv \
pcntl \ pcntl \
; \ ; \
\ \

18
2019.09-dev/apache/Dockerfile
View file

@ -22,26 +22,17 @@ RUN set -ex; \
\ \
apt-get update; \ apt-get update; \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
libxml2-dev \
mysql-client \ mysql-client \
bash \ bash \
autoconf \ $PHPIZE_DEPS \
g++ \
make \
openssl \
libssl-dev \
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 \
libcurl4-openssl-dev \
curl \
libzip-dev \ libzip-dev \
; \ ; \
docker-php-ext-configure gd \ docker-php-ext-configure gd \
@ -51,18 +42,11 @@ RUN set -ex; \
--with-jpeg-dir=/usr/include/ \ --with-jpeg-dir=/usr/include/ \
; \ ; \
docker-php-ext-install -j "$(nproc)" \ docker-php-ext-install -j "$(nproc)" \
curl \
pdo \
pdo_mysql \ pdo_mysql \
xml \
gd \ gd \
zip \ zip \
opcache \ opcache \
mbstring \
posix \
ctype \ ctype \
json \
iconv \
pcntl \ pcntl \
; \ ; \
\ \

24
2019.09-dev/fpm-alpine/Dockerfile
View file

@ -14,32 +14,18 @@ RUN set -ex; \
RUN set -ex; \ RUN set -ex; \
\ \
apk add -U --no-cache --virtual .build-deps \ apk add -U --no-cache --virtual .build-deps \
libxml2-dev \
mysql-client \ mysql-client \
bash \ bash \
autoconf \ $PHPIZE_DEPS \
g++ \
make \
openssl \
openssl-dev \
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 \
curl \
curl-dev \
rsync \
bzip2 \
pcre-dev \ pcre-dev \
libzip-dev \ libzip-dev \
; \ ; \
@ -52,18 +38,10 @@ RUN set -ex; \
; \ ; \
\ \
docker-php-ext-install -j "$(nproc)" \ docker-php-ext-install -j "$(nproc)" \
curl \
pdo \
pdo_mysql \ pdo_mysql \
xml \
gd \ gd \
zip \ zip \
opcache \ opcache \
mbstring \
posix \
ctype \
json \
iconv \
pcntl \ pcntl \
; \ ; \
\ \

18
2019.09-dev/fpm/Dockerfile
View file

@ -22,26 +22,17 @@ RUN set -ex; \
\ \
apt-get update; \ apt-get update; \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
libxml2-dev \
mysql-client \ mysql-client \
bash \ bash \
autoconf \ $PHPIZE_DEPS \
g++ \
make \
openssl \
libssl-dev \
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 \
libcurl4-openssl-dev \
curl \
libzip-dev \ libzip-dev \
; \ ; \
docker-php-ext-configure gd \ docker-php-ext-configure gd \
@ -51,18 +42,11 @@ RUN set -ex; \
--with-jpeg-dir=/usr/include/ \ --with-jpeg-dir=/usr/include/ \
; \ ; \
docker-php-ext-install -j "$(nproc)" \ docker-php-ext-install -j "$(nproc)" \
curl \
pdo \
pdo_mysql \ pdo_mysql \
xml \
gd \ gd \
zip \ zip \
opcache \ opcache \
mbstring \
posix \
ctype \ ctype \
json \
iconv \
pcntl \ pcntl \
; \ ; \
\ \

18
2019.09-rc/apache/Dockerfile
View file

@ -22,26 +22,17 @@ RUN set -ex; \
\ \
apt-get update; \ apt-get update; \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
libxml2-dev \
mysql-client \ mysql-client \
bash \ bash \
autoconf \ $PHPIZE_DEPS \
g++ \
make \
openssl \
libssl-dev \
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 \
libcurl4-openssl-dev \
curl \
libzip-dev \ libzip-dev \
; \ ; \
docker-php-ext-configure gd \ docker-php-ext-configure gd \
@ -51,18 +42,11 @@ RUN set -ex; \
--with-jpeg-dir=/usr/include/ \ --with-jpeg-dir=/usr/include/ \
; \ ; \
docker-php-ext-install -j "$(nproc)" \ docker-php-ext-install -j "$(nproc)" \
curl \
pdo \
pdo_mysql \ pdo_mysql \
xml \
gd \ gd \
zip \ zip \
opcache \ opcache \
mbstring \
posix \
ctype \ ctype \
json \
iconv \
pcntl \ pcntl \
; \ ; \
\ \

24
2019.09-rc/fpm-alpine/Dockerfile
View file

@ -14,32 +14,18 @@ RUN set -ex; \
RUN set -ex; \ RUN set -ex; \
\ \
apk add -U --no-cache --virtual .build-deps \ apk add -U --no-cache --virtual .build-deps \
libxml2-dev \
mysql-client \ mysql-client \
bash \ bash \
autoconf \ $PHPIZE_DEPS \
g++ \
make \
openssl \
openssl-dev \
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 \
curl \
curl-dev \
rsync \
bzip2 \
pcre-dev \ pcre-dev \
libzip-dev \ libzip-dev \
; \ ; \
@ -52,18 +38,10 @@ RUN set -ex; \
; \ ; \
\ \
docker-php-ext-install -j "$(nproc)" \ docker-php-ext-install -j "$(nproc)" \
curl \
pdo \
pdo_mysql \ pdo_mysql \
xml \
gd \ gd \
zip \ zip \
opcache \ opcache \
mbstring \
posix \
ctype \
json \
iconv \
pcntl \ pcntl \
; \ ; \
\ \

18
2019.09-rc/fpm/Dockerfile
View file

@ -22,26 +22,17 @@ RUN set -ex; \
\ \
apt-get update; \ apt-get update; \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
libxml2-dev \
mysql-client \ mysql-client \
bash \ bash \
autoconf \ $PHPIZE_DEPS \
g++ \
make \
openssl \
libssl-dev \
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 \
libcurl4-openssl-dev \
curl \
libzip-dev \ libzip-dev \
; \ ; \
docker-php-ext-configure gd \ docker-php-ext-configure gd \
@ -51,18 +42,11 @@ RUN set -ex; \
--with-jpeg-dir=/usr/include/ \ --with-jpeg-dir=/usr/include/ \
; \ ; \
docker-php-ext-install -j "$(nproc)" \ docker-php-ext-install -j "$(nproc)" \
curl \
pdo \
pdo_mysql \ pdo_mysql \
xml \
gd \ gd \
zip \ zip \
opcache \ opcache \
mbstring \
posix \
ctype \ ctype \
json \
iconv \
pcntl \ pcntl \
; \ ; \
\ \

24
Dockerfile-alpine.template
View file

@ -13,32 +13,18 @@ RUN set -ex; \
RUN set -ex; \ RUN set -ex; \
\ \
apk add -U --no-cache --virtual .build-deps \ apk add -U --no-cache --virtual .build-deps \
libxml2-dev \
mysql-client \ mysql-client \
bash \ bash \
autoconf \ $PHPIZE_DEPS \
g++ \
make \
openssl \
openssl-dev \
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 \
curl \
curl-dev \
rsync \
bzip2 \
pcre-dev \ pcre-dev \
libzip-dev \ libzip-dev \
; \ ; \
@ -51,18 +37,10 @@ RUN set -ex; \
; \ ; \
\ \
docker-php-ext-install -j "$(nproc)" \ docker-php-ext-install -j "$(nproc)" \
curl \
pdo \
pdo_mysql \ pdo_mysql \
xml \
gd \ gd \
zip \ zip \
opcache \ opcache \
mbstring \
posix \
ctype \
json \
iconv \
pcntl \ pcntl \
; \ ; \
\ \

18
Dockerfile-debian.template
View file

@ -21,26 +21,17 @@ RUN set -ex; \
\ \
apt-get update; \ apt-get update; \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
libxml2-dev \
mysql-client \ mysql-client \
bash \ bash \
autoconf \ $PHPIZE_DEPS \
g++ \
make \
openssl \
libssl-dev \
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 \
libcurl4-openssl-dev \
curl \
libzip-dev \ libzip-dev \
; \ ; \
docker-php-ext-configure gd \ docker-php-ext-configure gd \
@ -50,18 +41,11 @@ RUN set -ex; \
--with-jpeg-dir=/usr/include/ \ --with-jpeg-dir=/usr/include/ \
; \ ; \
docker-php-ext-install -j "$(nproc)" \ docker-php-ext-install -j "$(nproc)" \
curl \
pdo \
pdo_mysql \ pdo_mysql \
xml \
gd \ gd \
zip \ zip \
opcache \ opcache \
mbstring \
posix \
ctype \ ctype \
json \
iconv \
pcntl \ pcntl \
; \ ; \
\ \