Skip to content

GitLab

Commit feebbf30 authored by Ludwig Ruderstaller's avatar Ludwig Ruderstaller
Browse files
Options

fixing 8.0 build

parent 2a028465
Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 55 deletions
dist/7.1/cli/Dockerfile
View file @ feebbf30
......@@ -35,11 +35,10 @@ RUN set -xe \
libmcrypt-dev \
libmcrypt \
&& apk --update --no-cache add grep \
&& mkdir -p /usr/src/php/ext/redis \
&& mkdir -p /usr/src/php/ext/redis \
&& curl -L https://github.com/phpredis/phpredis/archive/$PHPREDIS_VERSION.tar.gz | tar xvz -C /usr/src/php/ext/redis --strip 1 \
&& echo 'redis' >> /usr/src/php-available-exts \
&& docker-php-ext-configure gd \
&& docker-php-ext-configure gd \
--with-freetype-dir=/usr/include/ \
--with-png-dir=/usr/include/ \
--with-jpeg-dir=/usr/include/ \
......@@ -65,8 +64,8 @@ RUN set -xe \
simplexml \
soap \
bcmath \
redis \
mcrypt \
redis \
mcrypt \
&& pecl install mongodb \
......
dist/7.1/fpm/Dockerfile
View file @ feebbf30
......@@ -35,11 +35,10 @@ RUN set -xe \
libmcrypt-dev \
libmcrypt \
&& apk --update --no-cache add grep \
&& mkdir -p /usr/src/php/ext/redis \
&& mkdir -p /usr/src/php/ext/redis \
&& curl -L https://github.com/phpredis/phpredis/archive/$PHPREDIS_VERSION.tar.gz | tar xvz -C /usr/src/php/ext/redis --strip 1 \
&& echo 'redis' >> /usr/src/php-available-exts \
&& docker-php-ext-configure gd \
&& docker-php-ext-configure gd \
--with-freetype-dir=/usr/include/ \
--with-png-dir=/usr/include/ \
--with-jpeg-dir=/usr/include/ \
......@@ -65,8 +64,8 @@ RUN set -xe \
simplexml \
soap \
bcmath \
redis \
mcrypt \
redis \
mcrypt \
&& pecl install mongodb \
......
dist/7.2/cli/Dockerfile
View file @ feebbf30
......@@ -33,11 +33,10 @@ RUN set -xe \
postgresql-dev \
openssh-client \
&& apk --update --no-cache add grep \
&& mkdir -p /usr/src/php/ext/redis \
&& mkdir -p /usr/src/php/ext/redis \
&& curl -L https://github.com/phpredis/phpredis/archive/$PHPREDIS_VERSION.tar.gz | tar xvz -C /usr/src/php/ext/redis --strip 1 \
&& echo 'redis' >> /usr/src/php-available-exts \
&& docker-php-ext-configure gd \
&& docker-php-ext-configure gd \
--with-freetype-dir=/usr/include/ \
--with-png-dir=/usr/include/ \
--with-jpeg-dir=/usr/include/ \
......@@ -63,8 +62,8 @@ RUN set -xe \
simplexml \
soap \
bcmath \
redis \
redis \
&& docker-php-ext-install sodium \
&& pecl install mongodb \
......
dist/7.2/fpm/Dockerfile
View file @ feebbf30
......@@ -33,11 +33,10 @@ RUN set -xe \
postgresql-dev \
openssh-client \
&& apk --update --no-cache add grep \
&& mkdir -p /usr/src/php/ext/redis \
&& mkdir -p /usr/src/php/ext/redis \
&& curl -L https://github.com/phpredis/phpredis/archive/$PHPREDIS_VERSION.tar.gz | tar xvz -C /usr/src/php/ext/redis --strip 1 \
&& echo 'redis' >> /usr/src/php-available-exts \
&& docker-php-ext-configure gd \
&& docker-php-ext-configure gd \
--with-freetype-dir=/usr/include/ \
--with-png-dir=/usr/include/ \
--with-jpeg-dir=/usr/include/ \
......@@ -63,8 +62,8 @@ RUN set -xe \
simplexml \
soap \
bcmath \
redis \
redis \
&& docker-php-ext-install sodium \
&& pecl install mongodb \
......
dist/7.3/cli/Dockerfile
View file @ feebbf30
......@@ -34,11 +34,10 @@ RUN set -xe \
openssh-client \
libzip-dev \
&& apk --update --no-cache add grep \
&& mkdir -p /usr/src/php/ext/redis \
&& mkdir -p /usr/src/php/ext/redis \
&& curl -L https://github.com/phpredis/phpredis/archive/$PHPREDIS_VERSION.tar.gz | tar xvz -C /usr/src/php/ext/redis --strip 1 \
&& echo 'redis' >> /usr/src/php-available-exts \
&& docker-php-ext-configure gd \
&& docker-php-ext-configure gd \
--with-freetype-dir=/usr/include/ \
--with-png-dir=/usr/include/ \
--with-jpeg-dir=/usr/include/ \
......@@ -64,8 +63,8 @@ RUN set -xe \
simplexml \
soap \
bcmath \
redis \
redis \
&& docker-php-ext-install sodium \
&& pecl install mongodb \
......
dist/7.3/fpm/Dockerfile
View file @ feebbf30
......@@ -34,11 +34,10 @@ RUN set -xe \
openssh-client \
libzip-dev \
&& apk --update --no-cache add grep \
&& mkdir -p /usr/src/php/ext/redis \
&& mkdir -p /usr/src/php/ext/redis \
&& curl -L https://github.com/phpredis/phpredis/archive/$PHPREDIS_VERSION.tar.gz | tar xvz -C /usr/src/php/ext/redis --strip 1 \
&& echo 'redis' >> /usr/src/php-available-exts \
&& docker-php-ext-configure gd \
&& docker-php-ext-configure gd \
--with-freetype-dir=/usr/include/ \
--with-png-dir=/usr/include/ \
--with-jpeg-dir=/usr/include/ \
......@@ -64,8 +63,8 @@ RUN set -xe \
simplexml \
soap \
bcmath \
redis \
redis \
&& docker-php-ext-install sodium \
&& pecl install mongodb \
......
dist/7.4/cli/Dockerfile
View file @ feebbf30
......@@ -38,11 +38,10 @@ RUN set -xe \
libgcrypt-dev \
oniguruma-dev \
&& apk --update --no-cache add grep \
&& mkdir -p /usr/src/php/ext/redis \
&& mkdir -p /usr/src/php/ext/redis \
&& curl -L https://github.com/phpredis/phpredis/archive/$PHPREDIS_VERSION.tar.gz | tar xvz -C /usr/src/php/ext/redis --strip 1 \
&& echo 'redis' >> /usr/src/php-available-exts \
&& docker-php-ext-configure gd \
&& docker-php-ext-configure gd \
--with-freetype=/usr/include/ \
&& docker-php-ext-install -j$(grep -c ^processor /proc/cpuinfo 2>/dev/null || 1)\
......@@ -65,8 +64,8 @@ RUN set -xe \
simplexml \
soap \
bcmath \
redis \
redis \
&& docker-php-ext-install sodium \
&& apk del .build-deps \
......
dist/7.4/fpm/Dockerfile
View file @ feebbf30
......@@ -38,11 +38,10 @@ RUN set -xe \
libgcrypt-dev \
oniguruma-dev \
&& apk --update --no-cache add grep \
&& mkdir -p /usr/src/php/ext/redis \
&& mkdir -p /usr/src/php/ext/redis \
&& curl -L https://github.com/phpredis/phpredis/archive/$PHPREDIS_VERSION.tar.gz | tar xvz -C /usr/src/php/ext/redis --strip 1 \
&& echo 'redis' >> /usr/src/php-available-exts \
&& docker-php-ext-configure gd \
&& docker-php-ext-configure gd \
--with-freetype=/usr/include/ \
&& docker-php-ext-install -j$(grep -c ^processor /proc/cpuinfo 2>/dev/null || 1)\
......@@ -65,8 +64,8 @@ RUN set -xe \
simplexml \
soap \
bcmath \
redis \
redis \
&& docker-php-ext-install sodium \
&& apk del .build-deps \
......
dist/8.0/cli/Dockerfile
View file @ feebbf30
......@@ -38,11 +38,7 @@ RUN set -xe \
libgcrypt-dev \
oniguruma-dev \
&& apk --update --no-cache add grep \
&& mkdir -p /usr/src/php/ext/redis \
&& curl -L https://github.com/phpredis/phpredis/archive/$PHPREDIS_VERSION.tar.gz | tar xvz -C /usr/src/php/ext/redis --strip 1 \
&& echo 'redis' >> /usr/src/php-available-exts \
&& docker-php-ext-configure gd \
&& docker-php-ext-configure gd \
--with-freetype=/usr/include/ \
&& docker-php-ext-install -j$(grep -c ^processor /proc/cpuinfo 2>/dev/null || 1)\
......@@ -64,8 +60,7 @@ RUN set -xe \
simplexml \
soap \
bcmath \
redis \
&& docker-php-ext-install sodium \
&& apk del .build-deps \
......
dist/8.0/fpm/Dockerfile
View file @ feebbf30
......@@ -38,11 +38,7 @@ RUN set -xe \
libgcrypt-dev \
oniguruma-dev \
&& apk --update --no-cache add grep \
&& mkdir -p /usr/src/php/ext/redis \
&& curl -L https://github.com/phpredis/phpredis/archive/$PHPREDIS_VERSION.tar.gz | tar xvz -C /usr/src/php/ext/redis --strip 1 \
&& echo 'redis' >> /usr/src/php-available-exts \
&& docker-php-ext-configure gd \
&& docker-php-ext-configure gd \
--with-freetype=/usr/include/ \
&& docker-php-ext-install -j$(grep -c ^processor /proc/cpuinfo 2>/dev/null || 1)\
......@@ -64,8 +60,7 @@ RUN set -xe \
simplexml \
soap \
bcmath \
redis \
&& docker-php-ext-install sodium \
&& apk del .build-deps \
......
templates/Dockerfile-cli.twig
View file @ feebbf30
......@@ -44,10 +44,11 @@ RUN set -xe \
oniguruma-dev \
{% endif %}
&& apk --update --no-cache add grep \
{% if not isPHP80 %}
&& mkdir -p /usr/src/php/ext/redis \
&& curl -L https://github.com/phpredis/phpredis/archive/$PHPREDIS_VERSION.tar.gz | tar xvz -C /usr/src/php/ext/redis --strip 1 \
&& echo 'redis' >> /usr/src/php-available-exts \
{% endif %}
{% if not isPHP74 %}
&& docker-php-ext-configure gd \
--with-freetype-dir=/usr/include/ \
......@@ -83,7 +84,9 @@ RUN set -xe \
simplexml \
soap \
bcmath \
{% if not isPHP80 %}
redis \
{% endif %}
{% if not isPHP72 and not isPHP73 and not isPHP74 %}
mcrypt \
{% endif %}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment