Skip to content

Commit de2a2c4

Browse files
authored
Update Base Image, PHP and Rainloop Version (#6)
-Alpine 3.17 -PHP 8.1 -Rainloop 1.17.0
1 parent 9267e93 commit de2a2c4

File tree

5 files changed

+28
-25
lines changed

5 files changed

+28
-25
lines changed

Dockerfile

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
1-
FROM alpine:3.14
1+
FROM alpine:3.17
22

33
LABEL description "Rainloop is a simple, modern & fast web-based client"
44

5-
ARG RAINLOOP_VER=1.16.0
5+
ARG RAINLOOP_VER=1.17.0
6+
7+
ARG PHP_VERSION=81
68

79
ARG GPG_FINGERPRINT="3B79 7ECE 694F 3B7B 70F3 11A4 ED7C 49D9 87DA 4591"
810

911
ENV UID=991 GID=991 UPLOAD_MAX_SIZE=25M LOG_TO_STDOUT=false MEMORY_LIMIT=128M
1012

11-
RUN echo "@community https://nl.alpinelinux.org/alpine/v3.13/community" >> /etc/apk/repositories \
12-
&& apk -U upgrade \
13+
RUN apk update && apk -U upgrade \
1314
&& apk add -t build-dependencies \
1415
gnupg \
1516
openssl \
@@ -19,22 +20,24 @@ RUN echo "@community https://nl.alpinelinux.org/alpine/v3.13/community" >> /etc/
1920
nginx \
2021
s6 \
2122
su-exec \
22-
php7-fpm@community \
23-
php7-curl@community \
24-
php7-iconv@community \
25-
php7-xml@community \
26-
php7-dom@community \
27-
php7-openssl@community \
28-
php7-json@community \
29-
php7-zlib@community \
30-
php7-pdo_pgsql@community \
31-
php7-pdo_mysql@community \
32-
php7-pdo_sqlite@community \
33-
php7-sqlite3@community \
34-
php7-ldap@community \
35-
php7-simplexml@community \
23+
php${PHP_VERSION}-fpm \
24+
php${PHP_VERSION}-curl \
25+
php${PHP_VERSION}-iconv \
26+
php${PHP_VERSION}-xml \
27+
php${PHP_VERSION}-dom \
28+
php${PHP_VERSION}-openssl \
29+
php${PHP_VERSION}-json \
30+
php${PHP_VERSION}-zlib \
31+
php${PHP_VERSION}-pdo_pgsql \
32+
php${PHP_VERSION}-pdo_mysql \
33+
php${PHP_VERSION}-pdo_sqlite \
34+
php${PHP_VERSION}-sqlite3 \
35+
php${PHP_VERSION}-ldap \
36+
php${PHP_VERSION}-simplexml \
3637
&& cd /tmp \
37-
&& RAINLOOP_ZIP="rainloop-community-${RAINLOOP_VER}.zip" \
38+
&& RAINLOOP_ZIP="rainloop-legacy-${RAINLOOP_VER}.zip" \
39+
&& echo "https://github.com/RainLoop/rainloop-webmail/releases/download/v${RAINLOOP_VER}/${RAINLOOP_ZIP}" \
40+
&& echo "https://github.com/RainLoop/rainloop-webmail/releases/download/v${RAINLOOP_VER}/${RAINLOOP_ZIP}.asc" \
3841
&& wget -q -O rainloop-community-latest.zip https://github.com/RainLoop/rainloop-webmail/releases/download/v${RAINLOOP_VER}/${RAINLOOP_ZIP} \
3942
&& wget -q -O rainloop-community-latest.zip.asc https://github.com/RainLoop/rainloop-webmail/releases/download/v${RAINLOOP_VER}/${RAINLOOP_ZIP}.asc \
4043
&& wget -q https://www.rainloop.net/repository/RainLoop.asc \

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ Rainloop is a simple, modern & fast web-based client. More details on the [offic
1010

1111
- Lightweight & secure image (no root process)
1212
- Based on Alpine
13-
- Latest Rainloop **Community Edition** (stable)
13+
- Latest Rainloop **Legacy Edition** (stable)
1414
- Contacts (DB) : sqlite, mysql or pgsql (server not built-in)
15-
- With Nginx and PHP7
15+
- With Nginx and PHP8.1
1616
- Postfixadmin-change-password plugin
1717

1818
### Build-time variables

rootfs/services/php/run

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#!/bin/sh
2-
exec php-fpm7
2+
exec php-fpm81

rootfs/usr/local/bin/run.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/bin/sh
22

33
# Set attachment size limit
4-
sed -i "s/<UPLOAD_MAX_SIZE>/$UPLOAD_MAX_SIZE/g" /etc/php7/php-fpm.conf /etc/nginx/nginx.conf
5-
sed -i "s/<MEMORY_LIMIT>/$MEMORY_LIMIT/g" /etc/php7/php-fpm.conf
4+
sed -i "s/<UPLOAD_MAX_SIZE>/$UPLOAD_MAX_SIZE/g" /etc/php81/php-fpm.conf /etc/nginx/nginx.conf
5+
sed -i "s/<MEMORY_LIMIT>/$MEMORY_LIMIT/g" /etc/php81/php-fpm.conf
66

77
# Remove postfixadmin-change-password plugin if exist
88
if [ -d "/rainloop/data/_data_/_default_/plugins/postfixadmin-change-password" ]; then
@@ -14,7 +14,7 @@ if [ "$LOG_TO_STDOUT" = true ]; then
1414
echo "[INFO] Logging to stdout activated"
1515
chmod o+w /dev/stdout
1616
sed -i "s/.*error_log.*$/error_log \/dev\/stdout warn;/" /etc/nginx/nginx.conf
17-
sed -i "s/.*error_log.*$/error_log = \/dev\/stdout/" /etc/php7/php-fpm.conf
17+
sed -i "s/.*error_log.*$/error_log = \/dev\/stdout/" /etc/php81/php-fpm.conf
1818
fi
1919

2020
# Add postfixadmin-change-password plugin

0 commit comments

Comments
 (0)