From a19140b2b4cac53f5ffbf96b77523a92b45b1f3f Mon Sep 17 00:00:00 2001
From: startxfr <clarue@startx.fr>
Date: Mon, 31 Oct 2016 19:26:46 +0100
Subject: change volume management. take advantage of inheritance

---
 Applications/phpmyadmin/Dockerfile | 1 -
 Services/apache/Dockerfile         | 2 +-
 Services/couchbase/Dockerfile      | 1 -
 Services/mariadb/Dockerfile        | 2 +-
 Services/memcache/Dockerfile       | 1 -
 Services/mongo/Dockerfile          | 2 +-
 Services/nodejs/Dockerfile         | 2 +-
 Services/ooconv/Dockerfile         | 1 -
 Services/php/Dockerfile            | 1 -
 Services/postgres/Dockerfile       | 2 +-
 10 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/Applications/phpmyadmin/Dockerfile b/Applications/phpmyadmin/Dockerfile
index 4533d94..855e1ad 100644
--- a/Applications/phpmyadmin/Dockerfile
+++ b/Applications/phpmyadmin/Dockerfile
@@ -10,5 +10,4 @@ RUN cd $APP_PATH && \
 COPY config.inc.php $APP_PATH/config.inc.php
 
 EXPOSE 80 443
-VOLUME [ $DATA_PATH , $LOG_PATH ]
 CMD [ "/bin/run.sh" ]
\ No newline at end of file
diff --git a/Services/apache/Dockerfile b/Services/apache/Dockerfile
index 945bb0d..6b23738 100644
--- a/Services/apache/Dockerfile
+++ b/Services/apache/Dockerfile
@@ -20,5 +20,5 @@ RUN rm -f $APP_PATH/Dockerfile $APP_PATH/httpd.conf $APP_PATH/run.sh $APP_PATH/s
     chown -R apache:apache $APP_PATH $DATA_PATH $LOG_PATH
 
 EXPOSE 80 443
-VOLUME [ $DATA_PATH , $LOG_PATH ]
+VOLUME $DATA_PATH
 CMD [ "/bin/run.sh" ]
\ No newline at end of file
diff --git a/Services/couchbase/Dockerfile b/Services/couchbase/Dockerfile
index e0d14f5..924fdb0 100644
--- a/Services/couchbase/Dockerfile
+++ b/Services/couchbase/Dockerfile
@@ -17,5 +17,4 @@ RUN chmod 775 /bin/run.sh && \
     touch $STARTUPLOG
 
 EXPOSE 11211
-VOLUME $LOG_PATH
 CMD [ "/bin/run.sh" ]
\ No newline at end of file
diff --git a/Services/mariadb/Dockerfile b/Services/mariadb/Dockerfile
index 0ab45de..04e729b 100644
--- a/Services/mariadb/Dockerfile
+++ b/Services/mariadb/Dockerfile
@@ -22,5 +22,5 @@ RUN chmod 775 /bin/run.sh && \
     chown -R mysql:mysql $LOG_PATH $DATA_PATH $LOADSQL_PATH
 
 EXPOSE 3306
-VOLUME [ $DATA_PATH , $LOG_PATH ]
+VOLUME $DATA_PATH
 CMD [ "/bin/run.sh" ]
\ No newline at end of file
diff --git a/Services/memcache/Dockerfile b/Services/memcache/Dockerfile
index 8a35e0d..378c268 100644
--- a/Services/memcache/Dockerfile
+++ b/Services/memcache/Dockerfile
@@ -12,5 +12,4 @@ RUN chmod 775 /bin/run.sh && \
     touch $STARTUPLOG
 
 EXPOSE 11211
-VOLUME $LOG_PATH
 CMD [ "/bin/run.sh" ]
\ No newline at end of file
diff --git a/Services/mongo/Dockerfile b/Services/mongo/Dockerfile
index a520721..1c6521b 100644
--- a/Services/mongo/Dockerfile
+++ b/Services/mongo/Dockerfile
@@ -15,5 +15,5 @@ RUN chmod 775 /bin/run.sh && \
 RUN chown -R mongodb:mongodb $DATA_PATH $LOG_PATH
 
 EXPOSE 27017 28017
-VOLUME [ $DATA_PATH , $LOG_PATH ]
+VOLUME $DATA_PATH
 CMD [ "/bin/run.sh" ]
\ No newline at end of file
diff --git a/Services/nodejs/Dockerfile b/Services/nodejs/Dockerfile
index f2b1312..c62807e 100644
--- a/Services/nodejs/Dockerfile
+++ b/Services/nodejs/Dockerfile
@@ -20,5 +20,5 @@ COPY *.json $APP_PATH/
 RUN cd $APP_PATH && npm install -production
 
 EXPOSE 8080
-VOLUME [ $DATA_PATH , $LOG_PATH ]
+VOLUME $DATA_PATH
 CMD [ "/bin/run.sh" ]
\ No newline at end of file
diff --git a/Services/ooconv/Dockerfile b/Services/ooconv/Dockerfile
index c0c12c3..33e9175 100644
--- a/Services/ooconv/Dockerfile
+++ b/Services/ooconv/Dockerfile
@@ -13,5 +13,4 @@ RUN chmod 775 /bin/run.sh && \
     touch $STARTUPLOG
 
 EXPOSE 2002
-VOLUME $LOG_PATH
 CMD [ "/bin/run.sh" ]
\ No newline at end of file
diff --git a/Services/php/Dockerfile b/Services/php/Dockerfile
index d76f21f..f3e6c0e 100644
--- a/Services/php/Dockerfile
+++ b/Services/php/Dockerfile
@@ -19,5 +19,4 @@ RUN rm -f $APP_PATH/Dockerfile $APP_PATH/httpd.conf $APP_PATH/run.sh && \
     chmod ug+r -R $DATA_PATH $APP_PATH
 
 EXPOSE 80 443
-VOLUME [ $DATA_PATH , $LOG_PATH ]
 CMD [ "/bin/run.sh" ]
\ No newline at end of file
diff --git a/Services/postgres/Dockerfile b/Services/postgres/Dockerfile
index 6e6c485..1f48748 100644
--- a/Services/postgres/Dockerfile
+++ b/Services/postgres/Dockerfile
@@ -19,5 +19,5 @@ RUN chmod 775 /bin/run.sh && \
     chmod -R 0700 $DATA_PATH
 
 EXPOSE 5432
-VOLUME [ $DATA_PATH, $LOG_PATH ]
+VOLUME $DATA_PATH
 CMD [ "/bin/run.sh" ]
-- 
cgit v1.2.1