Commit 0e44e0b0 authored by Ludwig Ruderstaller's avatar Ludwig Ruderstaller

last 8.0 fix

parent 9e66681a
......@@ -66,11 +66,7 @@ RUN set -xe \
bcmath \
redis \
mcrypt \
&& pecl install mongodb \
&& docker-php-ext-enable mongodb \
&& apk del .build-deps \
&& apk del .build-deps \
&& rm -rf /tmp/* /var/cache/apk/*
RUN echo "memory_limit = -1" > /usr/local/etc/php/conf.d/custom.ini \
......
......@@ -66,11 +66,7 @@ RUN set -xe \
bcmath \
redis \
mcrypt \
&& pecl install mongodb \
&& docker-php-ext-enable mongodb \
&& apk del .build-deps \
&& apk del .build-deps \
&& rm -rf /tmp/* /var/cache/apk/*
RUN echo "memory_limit = 128M" > /usr/local/etc/php/conf.d/custom.ini \
......
......@@ -63,11 +63,7 @@ RUN set -xe \
soap \
bcmath \
redis \
&& docker-php-ext-install sodium \
&& pecl install mongodb \
&& docker-php-ext-enable mongodb \
&& docker-php-ext-install sodium \
&& apk del .build-deps \
&& rm -rf /tmp/* /var/cache/apk/*
......
......@@ -63,11 +63,7 @@ RUN set -xe \
soap \
bcmath \
redis \
&& docker-php-ext-install sodium \
&& pecl install mongodb \
&& docker-php-ext-enable mongodb \
&& docker-php-ext-install sodium \
&& apk del .build-deps \
&& rm -rf /tmp/* /var/cache/apk/*
......
......@@ -64,11 +64,7 @@ RUN set -xe \
soap \
bcmath \
redis \
&& docker-php-ext-install sodium \
&& pecl install mongodb \
&& docker-php-ext-enable mongodb \
&& docker-php-ext-install sodium \
&& apk del .build-deps \
&& rm -rf /tmp/* /var/cache/apk/*
......
......@@ -64,11 +64,7 @@ RUN set -xe \
soap \
bcmath \
redis \
&& docker-php-ext-install sodium \
&& pecl install mongodb \
&& docker-php-ext-enable mongodb \
&& docker-php-ext-install sodium \
&& apk del .build-deps \
&& rm -rf /tmp/* /var/cache/apk/*
......
......@@ -32,8 +32,6 @@ RUN set -xe \
postgresql-client \
postgresql-dev \
openssh-client \
libmcrypt-dev \
libmcrypt \
libzip-dev \
libgcrypt-dev \
oniguruma-dev \
......@@ -65,9 +63,7 @@ RUN set -xe \
soap \
bcmath \
redis \
&& docker-php-ext-install sodium \
&& docker-php-ext-install sodium \
&& apk del .build-deps \
&& rm -rf /tmp/* /var/cache/apk/*
......
......@@ -32,8 +32,6 @@ RUN set -xe \
postgresql-client \
postgresql-dev \
openssh-client \
libmcrypt-dev \
libmcrypt \
libzip-dev \
libgcrypt-dev \
oniguruma-dev \
......@@ -65,9 +63,7 @@ RUN set -xe \
soap \
bcmath \
redis \
&& docker-php-ext-install sodium \
&& docker-php-ext-install sodium \
&& apk del .build-deps \
&& rm -rf /tmp/* /var/cache/apk/*
......
......@@ -32,8 +32,6 @@ RUN set -xe \
postgresql-client \
postgresql-dev \
openssh-client \
libmcrypt-dev \
libmcrypt \
&& apk --update --no-cache add grep \
&& docker-php-ext-configure gd \
--with-freetype=/usr/include/ \
......@@ -58,11 +56,7 @@ RUN set -xe \
simplexml \
soap \
bcmath \
mcrypt \
&& pecl install mongodb \
&& docker-php-ext-enable mongodb \
&& docker-php-ext-install sodium \
&& apk del .build-deps \
&& rm -rf /tmp/* /var/cache/apk/*
......
......@@ -32,8 +32,6 @@ RUN set -xe \
postgresql-client \
postgresql-dev \
openssh-client \
libmcrypt-dev \
libmcrypt \
&& apk --update --no-cache add grep \
&& docker-php-ext-configure gd \
--with-freetype=/usr/include/ \
......@@ -58,11 +56,7 @@ RUN set -xe \
simplexml \
soap \
bcmath \
mcrypt \
&& pecl install mongodb \
&& docker-php-ext-enable mongodb \
&& docker-php-ext-install sodium \
&& apk del .build-deps \
&& rm -rf /tmp/* /var/cache/apk/*
......
......@@ -32,7 +32,7 @@ RUN set -xe \
postgresql-client \
postgresql-dev \
openssh-client \
{% if not isPHP72 and not isPHP73 %}
{% if not isPHP72 and not isPHP73 and not isPHP74 and not isPHP80 %}
libmcrypt-dev \
libmcrypt \
{% endif %}
......@@ -87,18 +87,12 @@ RUN set -xe \
{% if not isPHP80 %}
redis \
{% endif %}
{% if not isPHP72 and not isPHP73 and not isPHP74 %}
{% if not isPHP72 and not isPHP73 and not isPHP74 and not isPHP80 %}
mcrypt \
{% endif %}
{% if isPHP72 or isPHP73 or isPHP74 %}
{% if isPHP72 or isPHP73 or isPHP74 or isPHP80 %}
&& docker-php-ext-install sodium \
{% endif %}
{% if not isPHP74 %}{# no pecl - and we dont need mongodb #}
&& pecl install mongodb \
&& docker-php-ext-enable mongodb \
{% endif %}
&& apk del .build-deps \
&& rm -rf /tmp/* /var/cache/apk/*
......
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