From 8cce768b6270ec40efa0fde80c5c5b3814a38f20 Mon Sep 17 00:00:00 2001
From: startxfr <clarue@startx.fr>
Date: Wed, 10 Feb 2016 00:19:19 +0100
Subject: update phpMyAdmin

---
 Applications/phpmyadmin/Dockerfile         |  8 ++++----
 Applications/phpmyadmin/docker-compose.yml |  2 +-
 docker-compose-app.yml                     |  6 +++---
 docker-compose-images.yml                  | 26 +++++++++++++-------------
 docker-compose.yml                         |  5 +++--
 5 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/Applications/phpmyadmin/Dockerfile b/Applications/phpmyadmin/Dockerfile
index c080a1e..2b49cc2 100644
--- a/Applications/phpmyadmin/Dockerfile
+++ b/Applications/phpmyadmin/Dockerfile
@@ -1,15 +1,15 @@
 FROM startx/sv-php
 MAINTAINER Christophe LARUE <dev@startx.fr>
 
-RUN cd $TMP_APP_PATH && \
+RUN cd $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/* ./  && \
     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
+COPY config.inc.php $APP_PATH/config.inc.php
+COPY test.php $APP_PATH/test.php
 
 EXPOSE 80 443
-VOLUME [$APP_PATH,$LOG_PATH]
+VOLUME [$DATA_PATH,$LOG_PATH]
 CMD ["/bin/run.sh"]
\ No newline at end of file
diff --git a/Applications/phpmyadmin/docker-compose.yml b/Applications/phpmyadmin/docker-compose.yml
index da7e84e..0610ee1 100644
--- a/Applications/phpmyadmin/docker-compose.yml
+++ b/Applications/phpmyadmin/docker-compose.yml
@@ -1,4 +1,4 @@
-server:
+application:
   build: ./
   container_name: "application-phpmyadmin"
   mem_limit: 500m
diff --git a/docker-compose-app.yml b/docker-compose-app.yml
index b2fa236..c4eba2a 100644
--- a/docker-compose-app.yml
+++ b/docker-compose-app.yml
@@ -2,6 +2,6 @@ fedora_app_pma:
   build: Applications/phpmyadmin/
   container_name: "application-phpmyadmin"
 
-fedora_app_rockmongo:
-  build: Applications/rockmongo/
-  container_name: "application-rockmongo"
\ No newline at end of file
+#fedora_app_rockmongo:
+#  build: Applications/rockmongo/
+#  container_name: "application-rockmongo"
\ No newline at end of file
diff --git a/docker-compose-images.yml b/docker-compose-images.yml
index c057ef6..45b11f4 100644
--- a/docker-compose-images.yml
+++ b/docker-compose-images.yml
@@ -121,19 +121,19 @@ fedora_sv_memcache:
   volumes_from:
     - fedora_data
 
-#fedora_app_pma:
-#  image: startx/sv-phpmyadmin
-#  container_name: "application-phpmyadmin"
-#  ports:
-#    - "84:80"
-#  links:
-#    - fedora_sv_mariadb:mariadb
-#  environment:
-#    CONTAINER_TYPE: "application"
-#    CONTAINER_SERVICE: "phpmyadmin"
-#    CONTAINER_INSTANCE: "application-phpmyadmin"
-#  volumes_from:
-#    - fedora_data
+fedora_app_pma:
+  image: startx/sv-phpmyadmin
+  container_name: "application-phpmyadmin"
+  ports:
+    - "84:80"
+  links:
+    - fedora_sv_mariadb:mariadb
+  environment:
+    CONTAINER_TYPE: "application"
+    CONTAINER_SERVICE: "phpmyadmin"
+    CONTAINER_INSTANCE: "application-phpmyadmin"
+  volumes_from:
+    - fedora_data
 
 #fedora_app_rockmongo:
 #  build: Applications/rockmongo/
diff --git a/docker-compose.yml b/docker-compose.yml
index 6114b31..75e157f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -44,8 +44,9 @@ fedora_sv_memcache:
     service: server
 
 fedora_app_pma:
-  build: Applications/phpmyadmin/
-  container_name: "application-phpmyadmin"
+  extends:
+    file: Applications/phpmyadmin/docker-compose.yml
+    service: application
 
 #fedora_app_rockmongo:
 #  build: Applications/rockmongo/
-- 
cgit v1.2.3