diff --git a/bitnami/phpbb/3/Dockerfile b/bitnami/phpbb/3/Dockerfile index 26d80fb5058c..3a5059e4e256 100644 --- a/bitnami/phpbb/3/Dockerfile +++ b/bitnami/phpbb/3/Dockerfile @@ -1,6 +1,8 @@ -FROM bitnami/minideb-extras:jessie-r15 +FROM bitnami/minideb-extras:jessie-r16 LABEL maintainer "Bitnami " + + # Install required system packages and dependencies RUN install_packages libapr1 libaprutil1 libbz2-1.0 libc6 libcomerr2 libcurl3 libexpat1 libffi6 libfreetype6 libgcc1 libgcrypt20 libgmp10 libgnutls-deb0-28 libgpg-error0 libgssapi-krb5-2 libhogweed2 libicu52 libidn11 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblzma5 libmcrypt4 libncurses5 libnettle4 libp11-kit0 libpcre3 libpng12-0 libpq5 libreadline6 librtmp1 libsasl2-2 libssh2-1 libssl1.0.0 libstdc++6 libsybdb5 libtasn1-6 libtidy-0.99-0 libtinfo5 libuuid1 libxml2 libxslt1.1 zlib1g RUN bitnami-pkg unpack apache-2.4.25-0 --checksum 8b46af7d737772d7d301da8b30a2770b7e549674e33b8a5b07480f53c39f5c3f @@ -11,13 +13,13 @@ RUN bitnami-pkg unpack phpbb-3.2.0-1 --checksum 4bf004efad547f8ec3af9f5dc0349ff4 COPY rootfs / -ENV APACHE_HTTPS_PORT="443" \ - APACHE_HTTP_PORT="80" \ +ENV APACHE_HTTPS_PORT_NUMBER="443" \ + APACHE_HTTP_PORT_NUMBER="80" \ BITNAMI_APP_NAME="phpbb" \ - BITNAMI_IMAGE_VERSION="3.2.0-r4" \ + BITNAMI_IMAGE_VERSION="3.2.0-r5" \ MARIADB_HOST="mariadb" \ MARIADB_PASSWORD="" \ - MARIADB_PORT="3306" \ + MARIADB_PORT_NUMBER="3306" \ MARIADB_USER="root" \ PATH="/opt/bitnami/apache/bin:/opt/bitnami/php/bin:/opt/bitnami/mysql/bin:$PATH" \ PHPBB_EMAIL="user@example.com" \ @@ -33,6 +35,8 @@ ENV APACHE_HTTPS_PORT="443" \ SMTP_PORT="" \ SMTP_USER="" + + VOLUME ["/bitnami/apache","/bitnami/php","/bitnami/phpbb"] EXPOSE 80 443 diff --git a/bitnami/phpbb/3/rootfs/apache-inputs.json b/bitnami/phpbb/3/rootfs/apache-inputs.json index 2351b006ed67..493f9fc7b0fa 100644 --- a/bitnami/phpbb/3/rootfs/apache-inputs.json +++ b/bitnami/phpbb/3/rootfs/apache-inputs.json @@ -1,4 +1,4 @@ { - "httpPort": "{{$global.env.APACHE_HTTP_PORT}}", - "httpsPort": "{{$global.env.APACHE_HTTPS_PORT}}" + "httpPort": "{{$global.env.APACHE_HTTP_PORT_NUMBER}}", + "httpsPort": "{{$global.env.APACHE_HTTPS_PORT_NUMBER}}" } \ No newline at end of file diff --git a/bitnami/phpbb/3/rootfs/phpbb-inputs.json b/bitnami/phpbb/3/rootfs/phpbb-inputs.json index 9d527e0aac43..04578801e7d9 100644 --- a/bitnami/phpbb/3/rootfs/phpbb-inputs.json +++ b/bitnami/phpbb/3/rootfs/phpbb-inputs.json @@ -2,7 +2,7 @@ "databaseAdminPassword": "{{$global.env.MARIADB_PASSWORD}}", "databaseAdminUser": "{{$global.env.MARIADB_USER}}", "databaseServerHost": "{{$global.env.MARIADB_HOST}}", - "databaseServerPort": "{{$global.env.MARIADB_PORT}}", + "databaseServerPort": "{{$global.env.MARIADB_PORT_NUMBER}}", "email": "{{$global.env.PHPBB_EMAIL}}", "firstName": "{{$global.env.PHPBB_FIRST_NAME}}", "forumDescription": "{{$global.env.PHPBB_FORUM_DESCRIPTION}}", diff --git a/bitnami/phpbb/README.md b/bitnami/phpbb/README.md index 23fee8e9e8fc..a2377d20ff2d 100644 --- a/bitnami/phpbb/README.md +++ b/bitnami/phpbb/README.md @@ -236,7 +236,7 @@ Available variables: - `MARIADB_USER`: Root user for the MariaDB database. Default: **root** - `MARIADB_PASSWORD`: Root password for the MariaDB. - `MARIADB_HOST`: Hostname for MariaDB server. Default: **mariadb** - - `MARIADB_PORT`: Port used by MariaDB server. Default: **3306** + - `MARIADB_PORT_NUMBER`: Port used by MariaDB server. Default: **3306** ### SMTP Configuration diff --git a/bitnami/phpbb/circle.yml b/bitnami/phpbb/circle.yml index 98edcf5ba9c6..9a8f6812107f 100644 --- a/bitnami/phpbb/circle.yml +++ b/bitnami/phpbb/circle.yml @@ -5,7 +5,7 @@ machine: RELEASE_SERIES_LIST: 3 LATEST_STABLE: 3 IMAGE_NAME: phpbb - CHART_NAME: phpbb + CHART_NAME: CHART_REPO: https://github.com/kubernetes/charts DOCKER_PROJECT: bitnami QUAY_PROJECT: bitnami