From a73701a8090c41e08227dd05d46b98b6f9dcbf84 Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@bitnami.com>
Date: Mon, 20 Feb 2017 16:10:28 +0530
Subject: [PATCH] phpmyadmin: series 4

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

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