From b4a8e93dbdc6a864a0e0f9abb2cd9af3f9b049b8 Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@bitnami.com>
Date: Tue, 21 Feb 2017 18:54:10 +0530
Subject: [PATCH] dokuwiki: series 2016

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

diff --git a/bitnami/dokuwiki/.gitignore b/bitnami/dokuwiki/.gitignore
index 198748e37ba0..51b4cfda1133 100644
--- a/bitnami/dokuwiki/.gitignore
+++ b/bitnami/dokuwiki/.gitignore
@@ -1 +1 @@
-/local/
+local/
diff --git a/bitnami/dokuwiki/2016/.dockerignore b/bitnami/dokuwiki/2016/.dockerignore
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/bitnami/dokuwiki/Dockerfile b/bitnami/dokuwiki/2016/Dockerfile
similarity index 100%
rename from bitnami/dokuwiki/Dockerfile
rename to bitnami/dokuwiki/2016/Dockerfile
diff --git a/bitnami/dokuwiki/2016/docker-compose.yml b/bitnami/dokuwiki/2016/docker-compose.yml
new file mode 100644
index 000000000000..d36afadecdc0
--- /dev/null
+++ b/bitnami/dokuwiki/2016/docker-compose.yml
@@ -0,0 +1,15 @@
+version: '2'
+services:
+  dokuwiki:
+    image: 'bitnami/dokuwiki:2016'
+    ports:
+      - '80:80'
+      - '443:443'
+    volumes:
+      - 'dokuwiki_data:/bitnami/dokuwiki'
+      - 'apache_data:/bitnami/apache'
+volumes:
+  dokuwiki_data:
+    driver: local
+  apache_data:
+    driver: local
diff --git a/bitnami/dokuwiki/rootfs/apache-inputs.json b/bitnami/dokuwiki/2016/rootfs/apache-inputs.json
similarity index 100%
rename from bitnami/dokuwiki/rootfs/apache-inputs.json
rename to bitnami/dokuwiki/2016/rootfs/apache-inputs.json
diff --git a/bitnami/dokuwiki/rootfs/app-entrypoint.sh b/bitnami/dokuwiki/2016/rootfs/app-entrypoint.sh
similarity index 100%
rename from bitnami/dokuwiki/rootfs/app-entrypoint.sh
rename to bitnami/dokuwiki/2016/rootfs/app-entrypoint.sh
diff --git a/bitnami/dokuwiki/rootfs/dokuwiki-inputs.json b/bitnami/dokuwiki/2016/rootfs/dokuwiki-inputs.json
similarity index 100%
rename from bitnami/dokuwiki/rootfs/dokuwiki-inputs.json
rename to bitnami/dokuwiki/2016/rootfs/dokuwiki-inputs.json
diff --git a/bitnami/dokuwiki/circle.yml b/bitnami/dokuwiki/circle.yml
index d2088d66d53f..3e952957db59 100644
--- a/bitnami/dokuwiki/circle.yml
+++ b/bitnami/dokuwiki/circle.yml
@@ -2,6 +2,8 @@ machine:
   services:
   - docker
   environment:
+    RELEASE_SERIES_LIST: 2016
+    LATEST_STABLE: 2016
     IMAGE_NAME: dokuwiki
     CHART_NAME: dokuwiki
     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: