From 305cade97bc30c71c644a1ba79ae2dd21af0bca5 Mon Sep 17 00:00:00 2001 From: kouinkouin Date: Fri, 13 May 2022 15:30:53 +0200 Subject: [PATCH 1/3] chore(git): ignore *.zip resulted from release.php --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index ae906552b..46428042c 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,7 @@ /.docker/dev/mail/config /.docker/dev/nginx/ssl/* !/.docker/dev/nginx/ssl/.gitempty +/.docker/release/snappymail-*.zip /dist /data /MULTIPLY From 7f8ed04fb40642e6d0e512206493f05ca334665b Mon Sep 17 00:00:00 2001 From: kouinkouin Date: Fri, 13 May 2022 15:32:18 +0200 Subject: [PATCH 2/3] feat(docker): use php:8.1-fpm-bullseye as base iamge instead of php:7.4-fpm-buster --- .docker/release/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.docker/release/Dockerfile b/.docker/release/Dockerfile index f1ba85139..5d9d57e7b 100644 --- a/.docker/release/Dockerfile +++ b/.docker/release/Dockerfile @@ -1,5 +1,5 @@ # Inspired by the original Rainloop dockerfile from youtous on GitLab -FROM php:7.4-fpm-buster +FROM php:8.1-fpm-bullseye ARG FILES_ZIP LABEL org.label-schema.description="SnappyMail webmail client image using nginx, php-fpm based on Debian Buster" From c6099f98630ee12c5b6a1380c226d85363e8ec67 Mon Sep 17 00:00:00 2001 From: kouinkouin Date: Fri, 13 May 2022 15:37:51 +0200 Subject: [PATCH 3/3] feat(docker): use --build-arg=aarch64 to build for arm64 --- .docker/release/Dockerfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.docker/release/Dockerfile b/.docker/release/Dockerfile index 5d9d57e7b..52333c89e 100644 --- a/.docker/release/Dockerfile +++ b/.docker/release/Dockerfile @@ -2,6 +2,10 @@ FROM php:8.1-fpm-bullseye ARG FILES_ZIP + +# can be x86_64 or aarch64 +ARG ARCH=x86_64 + LABEL org.label-schema.description="SnappyMail webmail client image using nginx, php-fpm based on Debian Buster" ENV UID=991 GID=991 UPLOAD_MAX_SIZE=25M LOG_TO_STDERR=true MEMORY_LIMIT=128M SECURE_COOKIES=true @@ -25,7 +29,7 @@ RUN mkdir -p /usr/share/man/man1/ /usr/share/man/man3/ /usr/share/man/man7/ && \ # Install PHP extensions RUN php -m && \ - docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ && \ + docker-php-ext-configure ldap --with-libdir=lib/$ARCH-linux-gnu/ && \ docker-php-ext-configure intl && \ docker-php-ext-configure gd --with-freetype --with-jpeg && \ docker-php-ext-install ldap opcache pdo_mysql pdo_pgsql zip intl gd && \