From bf09e9bafc073f8465c49bd0057b5621591e4683 Mon Sep 17 00:00:00 2001
From: Sebastian Hugentobler <sebastian@vanwa.ch>
Date: Tue, 24 Aug 2021 11:06:25 +0200
Subject: [PATCH] use php8

---
 Dockerfile                                 | 60 +++++++++++-----------
 rootfs/etc/confd/templates/nginx.conf.tmpl |  2 +-
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a3d50e0..34bfe81 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,13 @@
 FROM alpine:3.14 AS builder
 
-ENV VERSION=1.4.11
-ENV SHA256_SUM=ac7319070c305fc2c88c7723605562d8607030732beee931cdb4091cf05e69b7
+ENV VERSION=1.5-rc
+ENV SHA256_SUM=5287fbe5cf41ff2ae71648b863b0e4726d7f932c84f3b4fb30de096dc208f40c
 RUN wget https://github.com/roundcube/roundcubemail/releases/download/$VERSION/roundcubemail-$VERSION-complete.tar.gz
 RUN echo "$SHA256_SUM  roundcubemail-$VERSION-complete.tar.gz" | sha256sum -c - || exit 1
 RUN mkdir -p /var/lib/roundcube
 RUN tar xzf roundcubemail-$VERSION-complete.tar.gz -C /var/lib/roundcube --strip 1
 
-FROM thallian/php7-fpm:latest
+FROM thallian/php8-fpm:latest
 
 COPY --from=builder /var/lib/roundcube /var/lib/roundcube
 
@@ -18,32 +18,32 @@ RUN apk add --no-cache \
     postgresql-client \
     aspell \
     ca-certificates \
-    php7 \
-    php7-imap \
-    php7-dom \
-    php7-json \
-    php7-xml \
-    php7-session \
-    php7-pdo \
-    php7-pdo_pgsql \
-    php7-sockets \
-    php7-exif \
-    php7-iconv \
-    php7-openssl \
-    php7-mbstring \
-    php7-sockets \
-    php7-mcrypt \
-    php7-zip \
-    php7-ldap \
-    php7-pspell \
-    php7-apcu \
-    php7-gd \
-    php7-ctype \
-    php7-xmlreader \
-    php7-xmlwriter \
-    php7-tokenizer \
-    php7-curl \
-    php7-simplexml \
+    php8 \
+    php8-imap \
+    php8-dom \
+    php8-json \
+    php8-xml \
+    php8-session \
+    php8-pdo \
+    php8-pdo_pgsql \
+    php8-sockets \
+    php8-exif \
+    php8-iconv \
+    php8-openssl \
+    php8-mbstring \
+    php8-sockets \
+    php8-mcrypt \
+    php8-zip \
+    php8-ldap \
+    php8-pspell \
+    php8-apcu \
+    php8-gd \
+    php8-ctype \
+    php8-xmlreader \
+    php8-xmlwriter \
+    php8-tokenizer \
+    php8-curl \
+    php8-simplexml \
     composer
 
 WORKDIR /var/lib/roundcube
@@ -54,7 +54,7 @@ RUN chown -R nginx:nginx /var/lib/roundcube
 
 ADD /rootfs /
 
-EXPOSE 80
+EXPOSE 8080
 
 ENV FPMUSER nginx
 ENV FPMGROUP nginx
diff --git a/rootfs/etc/confd/templates/nginx.conf.tmpl b/rootfs/etc/confd/templates/nginx.conf.tmpl
index bd36e5c..e4ec7f6 100644
--- a/rootfs/etc/confd/templates/nginx.conf.tmpl
+++ b/rootfs/etc/confd/templates/nginx.conf.tmpl
@@ -22,7 +22,7 @@ http {
     {{range $domain := split (getenv "DOMAINS") ";"}}
 
     server {
-       listen 80;
+       listen 8080;
 
         server_name {{ $domain }};