base.Dockerfile (tine20-2020.08.3) | : | base.Dockerfile (tine20-2020.08.4) | ||
---|---|---|---|---|
skipping to change at line 20 | skipping to change at line 20 | |||
# - - - - - - - - - - - - - - - - - - - - - - - - | # - - - - - - - - - - - - - - - - - - - - - - - - | |||
FROM alpine:3.12 as cache-invalidator | FROM alpine:3.12 as cache-invalidator | |||
ARG ALPINE_PHP_REPOSITORY_VERSION=v3.12 | ARG ALPINE_PHP_REPOSITORY_VERSION=v3.12 | |||
RUN apk add --no-cache --simulate supervisor curl bash ytnef openjdk8-jre gettex t openssl | sha256sum >> /cachehash | RUN apk add --no-cache --simulate supervisor curl bash ytnef openjdk8-jre gettex t openssl | sha256sum >> /cachehash | |||
RUN apk add --no-cache --simulate --repository http://nl.alpinelinux.org/alpine/ ${ALPINE_PHP_REPOSITORY_VERSION}/main \ | RUN apk add --no-cache --simulate --repository http://nl.alpinelinux.org/alpine/ ${ALPINE_PHP_REPOSITORY_VERSION}/main \ | |||
php7 php7-fpm php7-bcmath php7-exif php7-mysql i php7-pcntl php7-pdo_mysql php7-soap \ | php7 php7-fpm php7-bcmath php7-exif php7-mysql i php7-pcntl php7-pdo_mysql php7-soap \ | |||
php7-sockets php7-zip php7-xsl php7-intl php7- gd php7-opcache php7-gettext php7-iconv \ | php7-sockets php7-zip php7-xsl php7-intl php7- gd php7-opcache php7-gettext php7-iconv \ | |||
php7-ldap php7-pecl-igbinary php7-pecl-yaml ph p7-simplexml php7-ctype php7-xml \ | php7-ldap php7-pecl-igbinary php7-pecl-yaml ph p7-simplexml php7-ctype php7-xml \ | |||
php7-xmlreader php7-curl php7-tokenizer php7-x mlwriter php7-fileinfo php7-posix \ | php7-xmlreader php7-curl php7-tokenizer php7-x mlwriter php7-fileinfo php7-posix \ | |||
| sha256sum >> /cachehash | php7-json | sha256sum >> /cachehash | |||
RUN apk add --no-cache --simulate --repository http://dl-cdn.alpinelinux.org/alp ine/v3.10/community \ | RUN apk add --no-cache --simulate --repository http://dl-cdn.alpinelinux.org/alp ine/v3.10/community \ | |||
php7-pecl-redis=4.3.0-r2 | sha256sum >> /cache hash | php7-pecl-redis=4.3.0-r2 | sha256sum >> /cache hash | |||
RUN apk add --no-cache --simulate --repository http://dl-3.alpinelinux.org/alpin e/edge/testing gnu-libiconv \ | RUN apk add --no-cache --simulate --repository http://dl-3.alpinelinux.org/alpin e/edge/testing gnu-libiconv \ | |||
| sha256sum >> /cachehash | | sha256sum >> /cachehash | |||
RUN apk add --no-cache --simulate --repository http://nl.alpinelinux.org/alpine/ edge/main nginx nginx-mod-http-brotli \ | RUN apk add --no-cache --simulate --repository http://nl.alpinelinux.org/alpine/ edge/main nginx nginx-mod-http-brotli \ | |||
| sha256sum >> /cachehash | | sha256sum >> /cachehash | |||
# - - - - - - - - - - - - - - - - - - - - - - - - | # - - - - - - - - - - - - - - - - - - - - - - - - | |||
FROM alpine:3.12 as base | FROM alpine:3.12 as base | |||
ARG ALPINE_PHP_REPOSITORY_VERSION=v3.12 | ARG ALPINE_PHP_REPOSITORY_VERSION=v3.12 | |||
skipping to change at line 47 | skipping to change at line 47 | |||
# todo check if copy or add craetes folder | # todo check if copy or add craetes folder | |||
RUN mkdir /usr/local/lib/container | RUN mkdir /usr/local/lib/container | |||
COPY --from=cache-invalidator /cachehash /usr/local/lib/container/ | COPY --from=cache-invalidator /cachehash /usr/local/lib/container/ | |||
RUN apk add --no-cache supervisor curl bash ytnef openjdk8-jre gettext openssl | RUN apk add --no-cache supervisor curl bash ytnef openjdk8-jre gettext openssl | |||
RUN apk add --no-cache --repository http://nl.alpinelinux.org/alpine/${ALPINE_PH P_REPOSITORY_VERSION}/main \ | RUN apk add --no-cache --repository http://nl.alpinelinux.org/alpine/${ALPINE_PH P_REPOSITORY_VERSION}/main \ | |||
php7 php7-fpm php7-bcmath php7-exif php7-mysqli php7-pcnt l php7-pdo_mysql php7-soap php7-sockets \ | php7 php7-fpm php7-bcmath php7-exif php7-mysqli php7-pcnt l php7-pdo_mysql php7-soap php7-sockets \ | |||
php7-zip php7-xsl php7-intl php7-gd php7-opcache php7-get text php7-iconv php7-ldap \ | php7-zip php7-xsl php7-intl php7-gd php7-opcache php7-get text php7-iconv php7-ldap \ | |||
php7-pecl-igbinary php7-pecl-yaml php7-simplexml php7-cty pe php7-xml php7-xmlreader php7-curl \ | php7-pecl-igbinary php7-pecl-yaml php7-simplexml php7-cty pe php7-xml php7-xmlreader php7-curl \ | |||
php7-tokenizer php7-xmlwriter php7-fileinfo php7-posix | php7-tokenizer php7-xmlwriter php7-fileinfo php7-posix ph p7-json | |||
# todo check if the new redis version 5.2.2 (alpine v3.12) also works | # todo check if the new redis version 5.2.2 (alpine v3.12) also works | |||
RUN apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/v3.10/c ommunity --no-cache php7-pecl-redis=4.3.0-r2 | RUN apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/v3.10/c ommunity --no-cache php7-pecl-redis=4.3.0-r2 | |||
RUN apk add --no-cache --repository http://nl.alpinelinux.org/alpine/edge/main n ginx nginx-mod-http-brotli | RUN apk add --no-cache --repository http://nl.alpinelinux.org/alpine/edge/main n ginx nginx-mod-http-brotli | |||
# fix alpine iconv problem e.g. could not locate filter | # fix alpine iconv problem e.g. could not locate filter | |||
RUN apk add --no-cache --repository http://dl-3.alpinelinux.org/alpine/edge/test ing gnu-libiconv | RUN apk add --no-cache --repository http://dl-3.alpinelinux.org/alpine/edge/test ing gnu-libiconv | |||
ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so php | ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so php | |||
RUN addgroup -S -g 150 tine20 && \ | RUN addgroup -S -g 150 tine20 && \ | |||
End of changes. 2 change blocks. | ||||
2 lines changed or deleted | 2 lines changed or added |