From e39ab8a665f17dff767bc26a708df39aee1df255 Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@bitnami.com>
Date: Mon, 20 Feb 2017 15:59:59 +0530
Subject: [PATCH] drupal: series 8

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

diff --git a/bitnami/drupal/.gitignore b/bitnami/drupal/.gitignore
index 198748e37ba0..51b4cfda1133 100644
--- a/bitnami/drupal/.gitignore
+++ b/bitnami/drupal/.gitignore
@@ -1 +1 @@
-/local/
+local/
diff --git a/bitnami/drupal/8/.dockerignore b/bitnami/drupal/8/.dockerignore
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/bitnami/drupal/Dockerfile b/bitnami/drupal/8/Dockerfile
similarity index 100%
rename from bitnami/drupal/Dockerfile
rename to bitnami/drupal/8/Dockerfile
diff --git a/bitnami/drupal/8/docker-compose.yml b/bitnami/drupal/8/docker-compose.yml
new file mode 100644
index 000000000000..73538f616a83
--- /dev/null
+++ b/bitnami/drupal/8/docker-compose.yml
@@ -0,0 +1,27 @@
+version: '2'
+
+services:
+  mariadb:
+    image: 'bitnami/mariadb:latest'
+    volumes:
+      - 'mariadb_data:/bitnami/mariadb'
+  drupal:
+    image: 'bitnami/drupal:8'
+    ports:
+      - '80:80'
+      - '443:443'
+    volumes:
+      - 'drupal_data:/bitnami/drupal'
+      - 'apache_data:/bitnami/apache'
+      - 'php_data:/bitnami/php'
+    depends_on:
+      - mariadb
+volumes:
+  mariadb_data:
+    driver: local
+  drupal_data:
+    driver: local
+  apache_data:
+    driver: local
+  php_data:
+    driver: local
diff --git a/bitnami/drupal/rootfs/apache-inputs.json b/bitnami/drupal/8/rootfs/apache-inputs.json
similarity index 100%
rename from bitnami/drupal/rootfs/apache-inputs.json
rename to bitnami/drupal/8/rootfs/apache-inputs.json
diff --git a/bitnami/drupal/rootfs/app-entrypoint.sh b/bitnami/drupal/8/rootfs/app-entrypoint.sh
similarity index 100%
rename from bitnami/drupal/rootfs/app-entrypoint.sh
rename to bitnami/drupal/8/rootfs/app-entrypoint.sh
diff --git a/bitnami/drupal/rootfs/drupal-inputs.json b/bitnami/drupal/8/rootfs/drupal-inputs.json
similarity index 100%
rename from bitnami/drupal/rootfs/drupal-inputs.json
rename to bitnami/drupal/8/rootfs/drupal-inputs.json
diff --git a/bitnami/drupal/circle.yml b/bitnami/drupal/circle.yml
index ff96aeafd52a..e65ca4934cc6 100644
--- a/bitnami/drupal/circle.yml
+++ b/bitnami/drupal/circle.yml
@@ -2,6 +2,8 @@ machine:
   services:
   - docker
   environment:
+    RELEASE_SERIES_LIST: 8
+    LATEST_STABLE: 8
     IMAGE_NAME: drupal
     CHART_NAME: drupal
     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: