From 61c1d3653ca5d9a2ef53a770e6ad344d78c9ce54 Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@bitnami.com>
Date: Mon, 20 Feb 2017 16:09:46 +0530
Subject: [PATCH] phpbb: series 3

---
 bitnami/phpbb/.gitignore                      |  2 +-
 bitnami/phpbb/3/.dockerignore                 |  0
 bitnami/phpbb/{ => 3}/Dockerfile              |  0
 bitnami/phpbb/3/docker-compose.yml            | 26 +++++++++++++++++++
 .../phpbb/{ => 3}/rootfs/apache-inputs.json   |  0
 .../phpbb/{ => 3}/rootfs/app-entrypoint.sh    |  0
 .../phpbb/{ => 3}/rootfs/phpbb-inputs.json    |  0
 bitnami/phpbb/circle.yml                      |  6 +++--
 8 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 bitnami/phpbb/3/.dockerignore
 rename bitnami/phpbb/{ => 3}/Dockerfile (100%)
 create mode 100644 bitnami/phpbb/3/docker-compose.yml
 rename bitnami/phpbb/{ => 3}/rootfs/apache-inputs.json (100%)
 rename bitnami/phpbb/{ => 3}/rootfs/app-entrypoint.sh (100%)
 rename bitnami/phpbb/{ => 3}/rootfs/phpbb-inputs.json (100%)

diff --git a/bitnami/phpbb/.gitignore b/bitnami/phpbb/.gitignore
index 198748e37ba0..51b4cfda1133 100644
--- a/bitnami/phpbb/.gitignore
+++ b/bitnami/phpbb/.gitignore
@@ -1 +1 @@
-/local/
+local/
diff --git a/bitnami/phpbb/3/.dockerignore b/bitnami/phpbb/3/.dockerignore
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/bitnami/phpbb/Dockerfile b/bitnami/phpbb/3/Dockerfile
similarity index 100%
rename from bitnami/phpbb/Dockerfile
rename to bitnami/phpbb/3/Dockerfile
diff --git a/bitnami/phpbb/3/docker-compose.yml b/bitnami/phpbb/3/docker-compose.yml
new file mode 100644
index 000000000000..b0f841689ca7
--- /dev/null
+++ b/bitnami/phpbb/3/docker-compose.yml
@@ -0,0 +1,26 @@
+version: '2'
+services:
+  mariadb:
+    image: 'bitnami/mariadb:latest'
+    volumes:
+      - 'mariadb_data:/bitnami/mariadb'
+  phpbb:
+    image: 'bitnami/phpbb:3'
+    ports:
+      - '80:80'
+      - '443:443'
+    volumes:
+      - 'phpbb_data:/bitnami/phpbb'
+      - 'apache_data:/bitnami/apache'
+      - 'php_data:/bitnami/php'
+    depends_on:
+      - mariadb
+volumes:
+  mariadb_data:
+    driver: local
+  phpbb_data:
+    driver: local
+  apache_data:
+    driver: local
+  php_data:
+    driver: local
diff --git a/bitnami/phpbb/rootfs/apache-inputs.json b/bitnami/phpbb/3/rootfs/apache-inputs.json
similarity index 100%
rename from bitnami/phpbb/rootfs/apache-inputs.json
rename to bitnami/phpbb/3/rootfs/apache-inputs.json
diff --git a/bitnami/phpbb/rootfs/app-entrypoint.sh b/bitnami/phpbb/3/rootfs/app-entrypoint.sh
similarity index 100%
rename from bitnami/phpbb/rootfs/app-entrypoint.sh
rename to bitnami/phpbb/3/rootfs/app-entrypoint.sh
diff --git a/bitnami/phpbb/rootfs/phpbb-inputs.json b/bitnami/phpbb/3/rootfs/phpbb-inputs.json
similarity index 100%
rename from bitnami/phpbb/rootfs/phpbb-inputs.json
rename to bitnami/phpbb/3/rootfs/phpbb-inputs.json
diff --git a/bitnami/phpbb/circle.yml b/bitnami/phpbb/circle.yml
index d5fbe2146029..73ab53fe7e53 100644
--- a/bitnami/phpbb/circle.yml
+++ b/bitnami/phpbb/circle.yml
@@ -2,6 +2,8 @@ machine:
   services:
   - docker
   environment:
+    RELEASE_SERIES_LIST: 3
+    LATEST_STABLE: 3
     IMAGE_NAME: phpbb
     CHART_NAME: phpbb
     CHART_REPO: https://github.com/kubernetes/charts
@@ -12,11 +14,11 @@ dependencies:
   override:
   - docker info
   - gcloud version
-  - docker pull $DOCKER_PROJECT/$IMAGE_NAME:_ || true
+  - curl -sL https://raw.githubusercontent.com/bitnami/test-infra/master/circle/docker-pull-cache.sh | bash -
 
 test:
   override:
-  - docker build --rm=false -t $DOCKER_PROJECT/$IMAGE_NAME:$CIRCLE_BUILD_NUM .
+  - curl -sL https://raw.githubusercontent.com/bitnami/test-infra/master/circle/docker-image-test.sh | bash -
 
 deployment:
   cache: