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 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'Applications')

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
-- 
cgit v1.2.3