From b6e1c3f2c70ad2f88a49e8c62afdbaf8eda9e36a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Guillot?= Date: Sat, 3 Aug 2019 19:45:42 -0700 Subject: [PATCH] Update Docker image to Alpine Linux 3.10.1 --- Dockerfile | 7 +++---- Dockerfile.arm32v6 | 6 ++---- Dockerfile.arm32v7 | 6 ++---- Dockerfile.arm64v8 | 6 ++---- 4 files changed, 9 insertions(+), 16 deletions(-) diff --git a/Dockerfile b/Dockerfile index 771bacb16..058aca881 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.10.0 +FROM alpine:3.10.1 VOLUME /var/www/app/data VOLUME /var/www/app/plugins @@ -8,12 +8,11 @@ EXPOSE 80 443 ARG VERSION -RUN apk update && \ - apk add openssl unzip nginx bash ca-certificates s6 curl ssmtp mailx php7 php7-phar php7-curl \ +RUN apk --no-cache --update add \ + openssl unzip nginx bash ca-certificates s6 curl ssmtp mailx php7 php7-phar php7-curl \ php7-fpm php7-json php7-zlib php7-xml php7-dom php7-ctype php7-opcache php7-zip php7-iconv \ php7-pdo php7-pdo_mysql php7-pdo_sqlite php7-pdo_pgsql php7-mbstring php7-session php7-bcmath \ php7-gd php7-mcrypt php7-openssl php7-sockets php7-posix php7-ldap php7-simplexml && \ - rm -rf /var/cache/apk/* && \ rm -rf /var/www/localhost && \ rm -f /etc/php7/php-fpm.d/www.conf diff --git a/Dockerfile.arm32v6 b/Dockerfile.arm32v6 index b615272d9..4d6a6c1fa 100644 --- a/Dockerfile.arm32v6 +++ b/Dockerfile.arm32v6 @@ -1,4 +1,4 @@ -FROM arm32v6/alpine:3.10.0 +FROM arm32v6/alpine:3.10.1 VOLUME /var/www/app/data VOLUME /var/www/app/plugins @@ -8,12 +8,10 @@ EXPOSE 80 443 ARG VERSION -RUN apk update && \ - apk add openssl unzip nginx bash ca-certificates s6 curl ssmtp mailx php7 php7-phar php7-curl \ +RUN apk --no-cache --update add openssl unzip nginx bash ca-certificates s6 curl ssmtp mailx php7 php7-phar php7-curl \ php7-fpm php7-json php7-zlib php7-xml php7-dom php7-ctype php7-opcache php7-zip php7-iconv \ php7-pdo php7-pdo_mysql php7-pdo_sqlite php7-pdo_pgsql php7-mbstring php7-session php7-bcmath \ php7-gd php7-mcrypt php7-openssl php7-sockets php7-posix php7-ldap php7-simplexml && \ - rm -rf /var/cache/apk/* && \ rm -rf /var/www/localhost && \ rm -f /etc/php7/php-fpm.d/www.conf diff --git a/Dockerfile.arm32v7 b/Dockerfile.arm32v7 index df9ca656f..252c739c2 100644 --- a/Dockerfile.arm32v7 +++ b/Dockerfile.arm32v7 @@ -1,4 +1,4 @@ -FROM arm32v7/alpine:3.10.0 +FROM arm32v7/alpine:3.10.1 VOLUME /var/www/app/data VOLUME /var/www/app/plugins @@ -8,12 +8,10 @@ EXPOSE 80 443 ARG VERSION -RUN apk update && \ - apk add openssl unzip nginx bash ca-certificates s6 curl ssmtp mailx php7 php7-phar php7-curl \ +RUN apk --no-cache --update add openssl unzip nginx bash ca-certificates s6 curl ssmtp mailx php7 php7-phar php7-curl \ php7-fpm php7-json php7-zlib php7-xml php7-dom php7-ctype php7-opcache php7-zip php7-iconv \ php7-pdo php7-pdo_mysql php7-pdo_sqlite php7-pdo_pgsql php7-mbstring php7-session php7-bcmath \ php7-gd php7-mcrypt php7-openssl php7-sockets php7-posix php7-ldap php7-simplexml && \ - rm -rf /var/cache/apk/* && \ rm -rf /var/www/localhost && \ rm -f /etc/php7/php-fpm.d/www.conf diff --git a/Dockerfile.arm64v8 b/Dockerfile.arm64v8 index 46aa8d721..46d527f14 100644 --- a/Dockerfile.arm64v8 +++ b/Dockerfile.arm64v8 @@ -1,4 +1,4 @@ -FROM arm64v8/alpine:3.10.0 +FROM arm64v8/alpine:3.10.1 VOLUME /var/www/app/data VOLUME /var/www/app/plugins @@ -8,12 +8,10 @@ EXPOSE 80 443 ARG VERSION -RUN apk update && \ - apk add openssl unzip nginx bash ca-certificates s6 curl ssmtp mailx php7 php7-phar php7-curl \ +RUN apk --no-cache --update add openssl unzip nginx bash ca-certificates s6 curl ssmtp mailx php7 php7-phar php7-curl \ php7-fpm php7-json php7-zlib php7-xml php7-dom php7-ctype php7-opcache php7-zip php7-iconv \ php7-pdo php7-pdo_mysql php7-pdo_sqlite php7-pdo_pgsql php7-mbstring php7-session php7-bcmath \ php7-gd php7-mcrypt php7-openssl php7-sockets php7-posix php7-ldap php7-simplexml && \ - rm -rf /var/cache/apk/* && \ rm -rf /var/www/localhost && \ rm -f /etc/php7/php-fpm.d/www.conf