From a4f854bd8cfddb065341bfdbcdb60be4ec6008da Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Wed, 22 Jul 2020 08:52:36 +0000
Subject: [PATCH] 3.3.0-debian-10-r170 release

---
 bitnami/phpbb/3/debian-10/Dockerfile                     | 2 +-
 .../phpbb/3/debian-10/prebuildfs/usr/sbin/bitnami-pkg    | 9 +++++++++
 bitnami/phpbb/README.md                                  | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/bitnami/phpbb/3/debian-10/Dockerfile b/bitnami/phpbb/3/debian-10/Dockerfile
index 9831cb9c0104..10b38b5570a5 100644
--- a/bitnami/phpbb/3/debian-10/Dockerfile
+++ b/bitnami/phpbb/3/debian-10/Dockerfile
@@ -26,7 +26,7 @@ ENV ALLOW_EMPTY_PASSWORD="no" \
     APACHE_HTTPS_PORT_NUMBER="443" \
     APACHE_HTTP_PORT_NUMBER="80" \
     BITNAMI_APP_NAME="phpbb" \
-    BITNAMI_IMAGE_VERSION="3.3.0-debian-10-r169" \
+    BITNAMI_IMAGE_VERSION="3.3.0-debian-10-r170" \
     MARIADB_HOST="mariadb" \
     MARIADB_PORT_NUMBER="3306" \
     MARIADB_ROOT_PASSWORD="" \
diff --git a/bitnami/phpbb/3/debian-10/prebuildfs/usr/sbin/bitnami-pkg b/bitnami/phpbb/3/debian-10/prebuildfs/usr/sbin/bitnami-pkg
index eb0ea3c02952..23c94a6fd196 100755
--- a/bitnami/phpbb/3/debian-10/prebuildfs/usr/sbin/bitnami-pkg
+++ b/bitnami/phpbb/3/debian-10/prebuildfs/usr/sbin/bitnami-pkg
@@ -189,6 +189,15 @@ case "$1" in
 esac
 
 nami $1 $PACKAGE $PACKAGE_ARGS
+
+if [[ $PACKAGE =~ git-.* ]]; then
+  # Due to a nami unpack issue, git binaries are copied instead of using hard symlinks.
+  # This workaround overwrites these binaries with the original ones, preserving links
+  # and saving ~500 MB
+  info "Patching ${PACKAGE}"
+  cp -a --force "${INSTALL_ROOT}/${PACKAGE}/files/git/." "/opt/bitnami/git"
+fi
+
 rm -rf $INSTALL_ROOT
 
 if [ "$BITNAMI_PKG_EXTRA_DIRS" ]; then
diff --git a/bitnami/phpbb/README.md b/bitnami/phpbb/README.md
index 3acd40fce55d..4fa0df5052db 100644
--- a/bitnami/phpbb/README.md
+++ b/bitnami/phpbb/README.md
@@ -36,7 +36,7 @@ Bitnami containers can be used with [Kubeapps](https://kubeapps.com/) for deploy
 Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/).
 
 
-* [`3-debian-10`, `3.3.0-debian-10-r169`, `3`, `3.3.0`, `latest` (3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpbb/blob/3.3.0-debian-10-r169/3/debian-10/Dockerfile)
+* [`3-debian-10`, `3.3.0-debian-10-r170`, `3`, `3.3.0`, `latest` (3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpbb/blob/3.3.0-debian-10-r170/3/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/phpbb GitHub repo](https://github.com/bitnami/bitnami-docker-phpbb).