From 3c799ee8d800f663f6c53e2103842e8d01b08c6e Mon Sep 17 00:00:00 2001
From: selim13 <selim013@gmail.com>
Date: Wed, 25 Aug 2021 15:15:35 +0300
Subject: [PATCH] bump to 3.3.4, switch to php8

---
 Dockerfile       | 45 +++++++++++++++++++++++----------------------
 README.MD        |  2 +-
 phpbb/config.php | 20 ++++++++++----------
 start.sh         |  2 +-
 4 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 28c7e4a..5cb00d7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,36 +1,37 @@
-FROM alpine:3.12
+FROM alpine:3.14
 
 LABEL maintainer="selim013@gmail.com"
 
 RUN apk add --no-cache curl \
     imagemagick \
     apache2 \
-    php7 \
-    php7-apache2 \
-    php7-ctype \
-    php7-curl \
-    php7-dom \
-    php7-ftp \
-    php7-gd \
-    php7-iconv \
-    php7-json \
-    php7-mysqli \
-    php7-opcache \
-    php7-openssl \
-    php7-pgsql \
-    php7-sqlite3 \
-    php7-tokenizer \
-    php7-xml \
-    php7-zlib \
-    php7-zip \
+    php8 \
+    php8-apache2 \
+    php8-ctype \
+    php8-curl \
+    php8-dom \
+    php8-ftp \
+    php8-gd \
+    php8-iconv \
+    php8-json \
+    php8-mbstring \
+    php8-mysqli \
+    php8-opcache \
+    php8-openssl \
+    php8-pgsql \
+    php8-sqlite3 \
+    php8-tokenizer \
+    php8-xml \
+    php8-zlib \
+    php8-zip \
     su-exec
 
 ### phpBB
-ENV PHPBB_VERSION 3.3.0
-ENV PHPBB_SHA256 'a6234ac9dcf9086c025ece29a0a235f997a92bb9a994eff0ddcf8917e841262f'
+ENV PHPBB_VERSION 3.3.4
+ENV PHPBB_SHA256 'a2436e375acf9ec8846fda82ffeda51774627967308fb3b71d395b90a1acfe8b'
 
 WORKDIR /tmp
-             
+
 RUN curl -SL https://download.phpbb.com/pub/release/3.3/${PHPBB_VERSION}/phpBB-${PHPBB_VERSION}.tar.bz2 -o phpbb.tar.bz2 \
     && echo "${PHPBB_SHA256}  phpbb.tar.bz2" | sha256sum -c - \
     && tar -xjf phpbb.tar.bz2 \
diff --git a/README.MD b/README.MD
index 0aff55e..0bb9ed5 100644
--- a/README.MD
+++ b/README.MD
@@ -1,6 +1,6 @@
 # Supported tags and respective `Dockerfile` links
 
--	[`3.3.0`, `latest`](https://github.com/selim13/docker-phpbb/blob/master/Dockerfile)
+-	[`3.3.4`, `latest`](https://github.com/selim13/docker-phpbb/blob/master/Dockerfile)
 -	[`3.2-apache`, `3-apache`, `3.2`, `3`, `apache` (*3.2-apache/Dockerfile*)](https://github.com/selim13/docker-phpbb/blob/master/3.2-apache/Dockerfile)
 -	[`3.1-apache`, `3.1` (*3.1-apache/Dockerfile*)](https://github.com/selim13/docker-phpbb/blob/master/3.1-apache/Dockerfile)
 
diff --git a/phpbb/config.php b/phpbb/config.php
index 2d40245..368484d 100644
--- a/phpbb/config.php
+++ b/phpbb/config.php
@@ -1,25 +1,25 @@
 <?php
 
-$dbms = 'phpbb\\db\\driver\\' . $_ENV['PHPBB_DB_DRIVER'];
-$dbhost = $_ENV['PHPBB_DB_HOST'];
-$dbport = $_ENV['PHPBB_DB_PORT'];
-$dbname = $_ENV['PHPBB_DB_NAME'];
-$dbuser = $_ENV['PHPBB_DB_USER'];
-$dbpasswd = $_ENV['PHPBB_DB_PASSWD'];
-$table_prefix = $_ENV['PHPBB_DB_TABLE_PREFIX'];
+$dbms = 'phpbb\\db\\driver\\' . getenv('PHPBB_DB_DRIVER');
+$dbhost = getenv('PHPBB_DB_HOST');
+$dbport = getenv('PHPBB_DB_PORT');
+$dbname = getenv('PHPBB_DB_NAME');
+$dbuser = getenv('PHPBB_DB_USER');
+$dbpasswd = getenv('PHPBB_DB_PASSWD');
+$table_prefix = getenv('PHPBB_DB_TABLE_PREFIX');
 $phpbb_adm_relative_path = 'adm/';
 $acm_type = 'phpbb\\cache\\driver\\file';
 
 @define('PHPBB_INSTALLED', true);
 
-if ($_ENV['PHPBB_DISPLAY_LOAD_TIME'] === 'true') {
+if (getenv('PHPBB_DISPLAY_LOAD_TIME') === 'true') {
 	@define('PHPBB_DISPLAY_LOAD_TIME', true);
 }
 
-if ($_ENV['PHPBB_DEBUG'] === 'true') {
+if (getenv('PHPBB_DEBUG') === 'true') {
 	@define('DEBUG', true);
 }
 
-if ($_ENV['PHPBB_DEBUG_CONTAINER'] === 'true') {
+if (getenv('PHPBB_DEBUG_CONTAINER') === 'true') {
 	@define('DEBUG_CONTAINER', true);
 }
\ No newline at end of file
diff --git a/start.sh b/start.sh
index d75cefa..383d6da 100755
--- a/start.sh
+++ b/start.sh
@@ -17,7 +17,7 @@ db_wait() {
 db_migrate() {
     if [[ "${PHPBB_DB_AUTOMIGRATE}" = "true" && "${PHPBB_INSTALL}" != "true" ]]; then
         echo "$(date) - applying migrations"
-        su-exec apache php bin/phpbbcli.php db:migrate
+        su-exec apache php8 bin/phpbbcli.php db:migrate
     fi
 }