From 158ee000d5d8b83f531a922531676a6499deb8c1 Mon Sep 17 00:00:00 2001
From: Torben Nehmer <torben@nehmer.net>
Date: Tue, 18 Aug 2020 21:14:51 +0200
Subject: [PATCH] Update to RC 1.4.8 and PHP 7.4

---
 Dockerfile         | 6 +++---
 build-container.sh | 1 +
 build-rootfs.sh    | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index beb22d3..23daebb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.1-apache
+FROM php:7.4-apache
 LABEL maintainer="Torben Nehmer <torben@nehmer.net>"
 
 RUN set -ex; \
@@ -20,7 +20,7 @@ RUN set -ex; \
 	; \
 	\
 	debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
-	docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-png-dir=/usr --with-jpeg-dir=/usr; \
+	docker-php-ext-configure gd ; \
 	docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
 	docker-php-ext-install \
 		exif \
@@ -57,7 +57,7 @@ RUN set -ex; \
 VOLUME /var/roundcube/config
 
 # Define Roundcubemail version
-ENV ROUNDCUBEMAIL_VERSION 1.4.7
+ENV ROUNDCUBEMAIL_VERSION 1.4.8
 
 # Set the entry point
 ENTRYPOINT ["/docker-entrypoint.sh"]
diff --git a/build-container.sh b/build-container.sh
index 3c47418..d9d2ed5 100755
--- a/build-container.sh
+++ b/build-container.sh
@@ -2,4 +2,5 @@
 
 set -ex
 
+docker pull php:7.4-apache
 docker build --force-rm --no-cache -t nathan/roundcube -f Dockerfile build
diff --git a/build-rootfs.sh b/build-rootfs.sh
index a025111..470c69b 100755
--- a/build-rootfs.sh
+++ b/build-rootfs.sh
@@ -3,7 +3,7 @@
 set -ex
 
 # Configuration options you usually edit go here
-ROUNDCUBEMAIL_VERSION=1.4.7
+ROUNDCUBEMAIL_VERSION=1.4.8
 CHECK_GPG=false
 CLEAN_INTERMEDIATES=false
 CONTAINER_VOLUME_CONFIG=/var/roundcube/config