From 7a6a9d2a26308ef59ec8ab928361ef3abc9c1164 Mon Sep 17 00:00:00 2001
From: kev <vimagick@gmail.com>
Date: Fri, 21 Jan 2022 19:23:05 +0800
Subject: [PATCH] update phpbb

---
 phpbb/Dockerfile         | 18 +++++++++---------
 phpbb/README.md          | 16 +++++++++-------
 phpbb/docker-compose.yml | 16 +++++++++-------
 3 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/phpbb/Dockerfile b/phpbb/Dockerfile
index 69736ef..6da7609 100644
--- a/phpbb/Dockerfile
+++ b/phpbb/Dockerfile
@@ -2,24 +2,25 @@
 # Dockerfile for phpBB
 #
 
-FROM php:7-apache
-MAINTAINER kev <noreply@easypi.pro>
+FROM php:8-apache
+MAINTAINER EasyPi Software Foundation
 
 RUN a2enmod rewrite
 
 RUN set -xe \
     && apt-get update \
-    && apt-get install -y curl unzip bzip2 libpq-dev libpng-dev libjpeg-dev \
+    && apt-get install -y curl unzip bzip2 libfreetype6-dev libjpeg-dev libpng-dev libpq-dev \
     && rm -rf /var/lib/apt/lists/* \
-    && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
+    && docker-php-ext-configure gd --with-freetype --with-jpeg \
     && docker-php-ext-install gd mysqli pgsql
 
 WORKDIR /var/www/html
 
-ENV PHPBB_VERSION 3.2.3
-ENV PHPBB_URL https://www.phpbb.com/files/release/phpBB-${PHPBB_VERSION}.tar.bz2
-ENV PHPBB_SHA a04e2f5972180d7e3cee37ae3d72552fd12e846d0e62e7b7993a6a0d317464e7
-ENV PHPBB_FILE phpBB.tar.bz2
+ENV PHPBB_VERSION=3.3.5
+ENV PHPBB_URL=https://www.phpbb.com/files/release/phpBB-${PHPBB_VERSION}.tar.bz2
+ENV PHPBB_URL=https://download.phpbb.com/pub/release/3.3/${PHPBB_VERSION}/phpBB-${PHPBB_VERSION}.tar.bz2
+ENV PHPBB_SHA=349699e0cfaf235669cdb72528982e6519c6ebd109b3c4bc31d1847ca1520d0b
+ENV PHPBB_FILE=phpBB.tar.bz2
 
 RUN set -xe \
     && curl -fSL ${PHPBB_URL} -o ${PHPBB_FILE} \
@@ -27,4 +28,3 @@ RUN set -xe \
     && tar -xjf ${PHPBB_FILE} --strip-components=1 \
     && rm ${PHPBB_FILE} \
     && chown -R www-data:www-data .
-
diff --git a/phpbb/README.md b/phpbb/README.md
index 93c6cd8..512a4ff 100644
--- a/phpbb/README.md
+++ b/phpbb/README.md
@@ -12,13 +12,15 @@ And it has no volumes, please use phpBB control panel to backup database.
 ## docker-compose.yml
 
 ```yaml
-phpbb:
-  image: vimagick/phpbb
-  ports:
-    - "8000:80"
-  volumes:
-    - ./data:/var/www/store
-  restart: always
+version: "3.8"
+services:
+  phpbb:
+    image: vimagick/phpbb
+    ports:
+      - "8000:80"
+    volumes:
+      - ./data:/var/www/store
+    restart: unless-stopped
 ```
 
 # up and running
diff --git a/phpbb/docker-compose.yml b/phpbb/docker-compose.yml
index b782e38..b69fec3 100644
--- a/phpbb/docker-compose.yml
+++ b/phpbb/docker-compose.yml
@@ -1,7 +1,9 @@
-phpbb:
-  image: vimagick/phpbb
-  ports:
-    - "8000:80"
-  volumes:
-    - ./data:/var/www/store
-  restart: always
+version: "3.8"
+services:
+  phpbb:
+    image: vimagick/phpbb
+    ports:
+      - "8000:80"
+    volumes:
+      - ./data:/var/www/store
+    restart: unless-stopped