From 15d8c51d28fa2245886b732df5373eedb2dde0cf Mon Sep 17 00:00:00 2001
From: startxfr <clarue@startx.fr>
Date: Mon, 7 Dec 2015 01:42:57 +0100
Subject: update container naming and fix phpmyadmin.

---
 Applications/phpmyadmin/Dockerfile              |  7 ++++---
 Applications/phpmyadmin/docker-compose-demo.yml | 22 ++++++++++++++++++++++
 Applications/phpmyadmin/docker-compose.yml      | 19 +++++++++++++++++--
 3 files changed, 43 insertions(+), 5 deletions(-)
 create mode 100644 Applications/phpmyadmin/docker-compose-demo.yml

(limited to 'Applications')

diff --git a/Applications/phpmyadmin/Dockerfile b/Applications/phpmyadmin/Dockerfile
index 21de57a..c080a1e 100644
--- a/Applications/phpmyadmin/Dockerfile
+++ b/Applications/phpmyadmin/Dockerfile
@@ -5,9 +5,10 @@ RUN cd $TMP_APP_PATH && \
     wget -q https://files.phpmyadmin.net/phpMyAdmin/4.5.2/phpMyAdmin-4.5.2-all-languages.zip && \
     unzip phpMyAdmin-4.5.2-all-languages.zip && \
     rm -f phpMyAdmin-4.5.2-all-languages.zip && \
-    mv phpMyAdmin-4.5.2-all-languages pma 
-COPY config.inc.php $TMP_APP_PATH/pma/config.inc.php
-COPY test.php $TMP_APP_PATH/pma/test.php
+    mv phpMyAdmin-4.5.2-all-languages/* ./  && \
+    rm -rf phpMyAdmin-4.5.2-all-languages 
+COPY config.inc.php $TMP_APP_PATH/config.inc.php
+COPY test.php $TMP_APP_PATH/test.php
 
 EXPOSE 80 443
 VOLUME [$APP_PATH,$LOG_PATH]
diff --git a/Applications/phpmyadmin/docker-compose-demo.yml b/Applications/phpmyadmin/docker-compose-demo.yml
new file mode 100644
index 0000000..c4b9401
--- /dev/null
+++ b/Applications/phpmyadmin/docker-compose-demo.yml
@@ -0,0 +1,22 @@
+demo_pma:
+  image: startx/sv-phpmyadmin
+  container_name: "demo-pma"
+  ports:
+    - "81:80"
+  links:
+    - demo_db:db
+  environment:
+    CONTAINER_TYPE: "application"
+    CONTAINER_SERVICE: "phpmyadmin"
+    CONTAINER_INSTANCE: "demo-pma"
+    
+demo_pma_db:
+  image: startx/sv-mariadb
+  container_name: "demo-pma-db"
+  expose:
+    - "3306"
+  environment:
+    CONTAINER_TYPE: "service"
+    CONTAINER_SERVICE: "mariadb"
+    CONTAINER_INSTANCE: "demo-pma-db"
+    MYSQL_ROOT_PASSWORD: "secretdemerde"
\ No newline at end of file
diff --git a/Applications/phpmyadmin/docker-compose.yml b/Applications/phpmyadmin/docker-compose.yml
index 9a8d4d9..7f2f747 100644
--- a/Applications/phpmyadmin/docker-compose.yml
+++ b/Applications/phpmyadmin/docker-compose.yml
@@ -8,12 +8,27 @@ server:
   ports:
     - "9215:80"
     - "9216:443"
+  links:
+    - demo_db:db
   environment:
     CONTAINER_TYPE: "application"
     CONTAINER_SERVICE: "phpmyadmin"
     CONTAINER_INSTANCE: "application-phpmyadmin"
     SERVER_NAME: "localhost"
-    DOC_ROOT: "/data/apache"
   volumes:
     - "/tmp/container/logs/phpmyadmin:/data/logs/apache_php"
-    - "/tmp/container/phpmyadmin:/data/apache_php"
\ No newline at end of file
+    - "/tmp/container/phpmyadmin:/data/apache_php"
+    
+demo_db:
+  image: startx/sv-mariadb
+  container_name: "service-mariadb"
+  expose:
+    - "3306"
+  environment:
+    CONTAINER_TYPE: "service"
+    CONTAINER_SERVICE: "mariadb"
+    CONTAINER_INSTANCE: "service-mariadb"
+    MYSQL_ROOT_PASSWORD: "secretdemerde"
+    MYSQL_USER: "user-test"
+    MYSQL_PASSWORD: "pwd-test"
+    MYSQL_DATABASE: "db_test"
\ No newline at end of file
-- 
cgit v1.2.3