summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstartxfr <clarue@startx.fr>2016-10-30 12:31:03 +0100
committerstartxfr <clarue@startx.fr>2016-10-30 12:31:03 +0100
commit64011c6592a1f2c0d581b2bfe1f1d9f00ad1f7a6 (patch)
treeb36541e19ecbdfc8d08ea6a3182633cccd4edb10
parente93213cc48422982b3fdc5a4952d5455cf03f9a8 (diff)
downloadphpmyadmin-64011c6592a1f2c0d581b2bfe1f1d9f00ad1f7a6.tar.gz
phpmyadmin-64011c6592a1f2c0d581b2bfe1f1d9f00ad1f7a6.tar.bz2
phpmyadmin-64011c6592a1f2c0d581b2bfe1f1d9f00ad1f7a6.tar.xz
phpmyadmin-64011c6592a1f2c0d581b2bfe1f1d9f00ad1f7a6.zip
fixin bug in volumes exported
-rw-r--r--Applications/phpmyadmin/Dockerfile4
-rw-r--r--Applications/rockmongo/Dockerfile2
-rw-r--r--OS/Dockerfile4
-rw-r--r--Services/apache/Dockerfile4
-rw-r--r--Services/couchbase/Dockerfile4
-rw-r--r--Services/mariadb/Dockerfile4
-rw-r--r--Services/memcache/Dockerfile4
-rw-r--r--Services/mongo/Dockerfile4
-rw-r--r--Services/nodejs/Dockerfile4
-rw-r--r--Services/ooconv/Dockerfile4
-rw-r--r--Services/php/Dockerfile4
-rw-r--r--Services/postgres/Dockerfile4
12 files changed, 23 insertions, 23 deletions
diff --git a/Applications/phpmyadmin/Dockerfile b/Applications/phpmyadmin/Dockerfile
index a1bf2ca..4533d94 100644
--- a/Applications/phpmyadmin/Dockerfile
+++ b/Applications/phpmyadmin/Dockerfile
@@ -10,5 +10,5 @@ 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
+VOLUME [ $DATA_PATH , $LOG_PATH ]
+CMD [ "/bin/run.sh" ] \ No newline at end of file
diff --git a/Applications/rockmongo/Dockerfile b/Applications/rockmongo/Dockerfile
index ca5da28..d714576 100644
--- a/Applications/rockmongo/Dockerfile
+++ b/Applications/rockmongo/Dockerfile
@@ -22,4 +22,4 @@ RUN echo '<?php phpInfo(); ?>' > /var/www/html/info.php
# Expose ports
EXPOSE 80
-CMD ["/usr/sbin/httpd", "-D", "FOREGROUND"] \ No newline at end of file
+CMD [ "/usr/sbin/httpd", "-D", "FOREGROUND" ] \ No newline at end of file
diff --git a/OS/Dockerfile b/OS/Dockerfile
index fec031a..9e2d163 100644
--- a/OS/Dockerfile
+++ b/OS/Dockerfile
@@ -12,5 +12,5 @@ RUN chmod 775 /bin/sx-lib.sh /bin/run.sh && \
mkdir /data /logs && \
touch $STARTUPLOG
-VOLUME [$LOG_PATH]
-CMD ["/bin/run.sh"]
+VOLUME $LOG_PATH
+CMD [ "/bin/run.sh" ]
diff --git a/Services/apache/Dockerfile b/Services/apache/Dockerfile
index b7b548f..f54f196 100644
--- a/Services/apache/Dockerfile
+++ b/Services/apache/Dockerfile
@@ -21,5 +21,5 @@ RUN rm -f $APP_PATH/Dockerfile $APP_PATH/httpd.conf $APP_PATH/run.sh $APP_PATH/s
rm -f /etc/httpd/conf.d/autoindex.conf /etc/httpd/conf.d/userdir.conf /etc/httpd/conf.d/welcome.conf
EXPOSE 80 443
-VOLUME [$DATA_PATH,$LOG_PATH]
-CMD ["/bin/run.sh"] \ No newline at end of file
+VOLUME [ $DATA_PATH , $LOG_PATH ]
+CMD [ "/bin/run.sh" ] \ No newline at end of file
diff --git a/Services/couchbase/Dockerfile b/Services/couchbase/Dockerfile
index 25c9877..e0d14f5 100644
--- a/Services/couchbase/Dockerfile
+++ b/Services/couchbase/Dockerfile
@@ -17,5 +17,5 @@ RUN chmod 775 /bin/run.sh && \
touch $STARTUPLOG
EXPOSE 11211
-VOLUME [$LOG_PATH]
-CMD ["/bin/run.sh"] \ No newline at end of file
+VOLUME $LOG_PATH
+CMD [ "/bin/run.sh" ] \ No newline at end of file
diff --git a/Services/mariadb/Dockerfile b/Services/mariadb/Dockerfile
index 75d5150..0ab45de 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]
-CMD ["/bin/run.sh"] \ No newline at end of file
+VOLUME [ $DATA_PATH , $LOG_PATH ]
+CMD [ "/bin/run.sh" ] \ No newline at end of file
diff --git a/Services/memcache/Dockerfile b/Services/memcache/Dockerfile
index 55ae563..8a35e0d 100644
--- a/Services/memcache/Dockerfile
+++ b/Services/memcache/Dockerfile
@@ -12,5 +12,5 @@ RUN chmod 775 /bin/run.sh && \
touch $STARTUPLOG
EXPOSE 11211
-VOLUME [$LOG_PATH]
-CMD ["/bin/run.sh"] \ No newline at end of file
+VOLUME $LOG_PATH
+CMD [ "/bin/run.sh" ] \ No newline at end of file
diff --git a/Services/mongo/Dockerfile b/Services/mongo/Dockerfile
index c3f1bab..4f5982e 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]
-CMD ["/bin/run.sh"] \ No newline at end of file
+VOLUME [ $DATA_PATH , $LOG_PATH ]
+CMD [ "/bin/run.sh" ] \ No newline at end of file
diff --git a/Services/nodejs/Dockerfile b/Services/nodejs/Dockerfile
index 8dee3c3..42101ba 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 8000
-VOLUME [$DATA_PATH,$LOG_PATH]
-CMD ["/bin/run.sh"] \ No newline at end of file
+VOLUME [ $DATA_PATH , $LOG_PATH ]
+CMD [ "/bin/run.sh" ] \ No newline at end of file
diff --git a/Services/ooconv/Dockerfile b/Services/ooconv/Dockerfile
index 890ba34..c0c12c3 100644
--- a/Services/ooconv/Dockerfile
+++ b/Services/ooconv/Dockerfile
@@ -13,5 +13,5 @@ RUN chmod 775 /bin/run.sh && \
touch $STARTUPLOG
EXPOSE 2002
-VOLUME [$LOG_PATH]
-CMD ["/bin/run.sh"] \ No newline at end of file
+VOLUME $LOG_PATH
+CMD [ "/bin/run.sh" ] \ No newline at end of file
diff --git a/Services/php/Dockerfile b/Services/php/Dockerfile
index 4abb0f8..cc83b4e 100644
--- a/Services/php/Dockerfile
+++ b/Services/php/Dockerfile
@@ -19,5 +19,5 @@ 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
+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 9eee587..6e6c485 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]
-CMD ["/bin/run.sh"]
+VOLUME [ $DATA_PATH, $LOG_PATH ]
+CMD [ "/bin/run.sh" ]