1
0
Fork 0
mirror of https://codeberg.org/icewind/haze.git synced 2026-06-03 17:14:08 +02:00

minimize dockerfile diffs

This commit is contained in:
Robin Appelman 2021-12-15 16:06:59 +01:00
commit 406bbbc687
5 changed files with 176 additions and 166 deletions

View file

@ -4,7 +4,7 @@ versions=("7.2" "7.3" "7.4" "8.0")
for version in "${versions[@]}"; do for version in "${versions[@]}"; do
echo "building haze-php-$version" echo "building haze-php-$version"
docker build -t "icewind1991/haze-php:$version" -f "php/Dockerfile.$version" php docker build --build-arg PHP_VERSION=$version -t "icewind1991/haze-php:$version" -f "php/Dockerfile.$version" php
done done
for version in "${versions[@]}"; do for version in "${versions[@]}"; do

View file

@ -1,4 +1,5 @@
FROM php:7.2-fpm ARG PHP_VERSION
FROM php:${PHP_VERSION}-fpm
MAINTAINER Robin Appelman <robin@icewind.nl> MAINTAINER Robin Appelman <robin@icewind.nl>
RUN DEBIAN_FRONTEND=noninteractive ;\ RUN DEBIAN_FRONTEND=noninteractive ;\
@ -35,10 +36,11 @@ RUN apt-get update \
--with-png-dir \ --with-png-dir \
--with-zlib-dir \ --with-zlib-dir \
--with-freetype-dir \ --with-freetype-dir \
&& docker-php-ext-install iconv zip pdo pdo_pgsql pdo_sqlite pgsql pdo_mysql intl curl mbstring gd pcntl ldap \ && docker-php-ext-install gd \
&& pecl install imagick \ && docker-php-ext-install iconv zip pdo pdo_pgsql pdo_sqlite pgsql pdo_mysql intl curl mbstring pcntl ldap \
&& pecl install inotify \ && pecl install inotify \
&& pecl install smbclient \ && pecl install smbclient \
&& pecl install imagick \
&& apt-get remove -y \ && apt-get remove -y \
libfreetype6-dev \ libfreetype6-dev \
libjpeg62-turbo-dev \ libjpeg62-turbo-dev \
@ -74,6 +76,7 @@ RUN pecl install apcu \
&& echo "xdebug.remote_port=9000" >> $PHP_INI_DIR/conf.d/xdebug.ini \ && echo "xdebug.remote_port=9000" >> $PHP_INI_DIR/conf.d/xdebug.ini \
&& echo "xdebug.discover_client_host=true" >> $PHP_INI_DIR/conf.d/xdebug.ini \ && echo "xdebug.discover_client_host=true" >> $PHP_INI_DIR/conf.d/xdebug.ini \
&& echo "xdebug.client_host=hazehost" >> $PHP_INI_DIR/conf.d/xdebug.ini \ && echo "xdebug.client_host=hazehost" >> $PHP_INI_DIR/conf.d/xdebug.ini \
&& echo "xdebug.log_level=0" >> $PHP_INI_DIR/conf.d/xdebug.ini \
&& echo "memory_limit = 512M" > $PHP_INI_DIR/conf.d/memory_limit.ini && echo "memory_limit = 512M" > $PHP_INI_DIR/conf.d/memory_limit.ini
RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer

View file

@ -1,4 +1,5 @@
FROM php:7.3-fpm ARG PHP_VERSION
FROM php:${PHP_VERSION}-fpm
MAINTAINER Robin Appelman <robin@icewind.nl> MAINTAINER Robin Appelman <robin@icewind.nl>
RUN DEBIAN_FRONTEND=noninteractive ;\ RUN DEBIAN_FRONTEND=noninteractive ;\
@ -35,10 +36,11 @@ RUN apt-get update \
--with-png-dir \ --with-png-dir \
--with-zlib-dir \ --with-zlib-dir \
--with-freetype-dir \ --with-freetype-dir \
&& docker-php-ext-install iconv zip pdo pdo_pgsql pdo_sqlite pgsql pdo_mysql intl curl mbstring gd pcntl ldap \ && docker-php-ext-install gd \
&& pecl install imagick \ && docker-php-ext-install iconv zip pdo pdo_pgsql pdo_sqlite pgsql pdo_mysql intl curl mbstring pcntl ldap \
&& pecl install inotify \ && pecl install inotify \
&& pecl install smbclient \ && pecl install smbclient \
&& pecl install imagick \
&& apt-get remove -y \ && apt-get remove -y \
libfreetype6-dev \ libfreetype6-dev \
libjpeg62-turbo-dev \ libjpeg62-turbo-dev \
@ -74,6 +76,7 @@ RUN pecl install apcu \
&& echo "xdebug.remote_port=9000" >> $PHP_INI_DIR/conf.d/xdebug.ini \ && echo "xdebug.remote_port=9000" >> $PHP_INI_DIR/conf.d/xdebug.ini \
&& echo "xdebug.discover_client_host=true" >> $PHP_INI_DIR/conf.d/xdebug.ini \ && echo "xdebug.discover_client_host=true" >> $PHP_INI_DIR/conf.d/xdebug.ini \
&& echo "xdebug.client_host=hazehost" >> $PHP_INI_DIR/conf.d/xdebug.ini \ && echo "xdebug.client_host=hazehost" >> $PHP_INI_DIR/conf.d/xdebug.ini \
&& echo "xdebug.log_level=0" >> $PHP_INI_DIR/conf.d/xdebug.ini \
&& echo "memory_limit = 512M" > $PHP_INI_DIR/conf.d/memory_limit.ini && echo "memory_limit = 512M" > $PHP_INI_DIR/conf.d/memory_limit.ini
RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer

View file

@ -1,4 +1,5 @@
FROM php:7.4-fpm ARG PHP_VERSION
FROM php:${PHP_VERSION}-fpm
MAINTAINER Robin Appelman <robin@icewind.nl> MAINTAINER Robin Appelman <robin@icewind.nl>
RUN DEBIAN_FRONTEND=noninteractive ;\ RUN DEBIAN_FRONTEND=noninteractive ;\
@ -33,10 +34,11 @@ RUN apt-get update \
--enable-gd \ --enable-gd \
--with-jpeg \ --with-jpeg \
--with-freetype \ --with-freetype \
&& docker-php-ext-install iconv zip pdo pdo_pgsql pdo_sqlite pgsql pdo_mysql intl curl mbstring gd pcntl ldap \ && docker-php-ext-install gd \
&& pecl install imagick \ && docker-php-ext-install iconv zip pdo pdo_pgsql pdo_sqlite pgsql pdo_mysql intl curl mbstring pcntl ldap \
&& pecl install inotify \ && pecl install inotify \
&& pecl install smbclient \ && pecl install smbclient \
&& pecl install imagick \
&& apt-get remove -y \ && apt-get remove -y \
libfreetype6-dev \ libfreetype6-dev \
libjpeg62-turbo-dev \ libjpeg62-turbo-dev \

View file

@ -1,4 +1,5 @@
FROM php:8.0-fpm ARG PHP_VERSION
FROM php:${PHP_VERSION}-fpm
MAINTAINER Robin Appelman <robin@icewind.nl> MAINTAINER Robin Appelman <robin@icewind.nl>
RUN DEBIAN_FRONTEND=noninteractive ;\ RUN DEBIAN_FRONTEND=noninteractive ;\
@ -63,6 +64,7 @@ RUN pecl install apcu \
&& curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire.io/api/v1/releases/probe/php/linux/amd64/${VERSION} \ && curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire.io/api/v1/releases/probe/php/linux/amd64/${VERSION} \
&& tar zxpf /tmp/blackfire-probe.tar.gz -C /tmp \ && tar zxpf /tmp/blackfire-probe.tar.gz -C /tmp \
&& mv /tmp/blackfire-*.so `php -r "echo ini_get('extension_dir');"`/blackfire.so \ && mv /tmp/blackfire-*.so `php -r "echo ini_get('extension_dir');"`/blackfire.so \
&& echo "extension=imagick.so" > $PHP_INI_DIR/conf.d/imagick.ini \
&& echo "extension=smbclient.so" > $PHP_INI_DIR/conf.d/smbclient.ini \ && echo "extension=smbclient.so" > $PHP_INI_DIR/conf.d/smbclient.ini \
&& echo "extension=inotify.so" > $PHP_INI_DIR/conf.d/inotify.ini \ && echo "extension=inotify.so" > $PHP_INI_DIR/conf.d/inotify.ini \
&& echo "extension=blackfire.so\nblackfire.agent_socket=\${BLACKFIRE_PORT}" > $PHP_INI_DIR/conf.d/blackfire.ini \ && echo "extension=blackfire.so\nblackfire.agent_socket=\${BLACKFIRE_PORT}" > $PHP_INI_DIR/conf.d/blackfire.ini \