Merge branch 'dev' of https://git.verdnatura.es/salix into dev

2017-09-21 12:25:07 +02:00 · 2017-09-21 12:25:07 +02:00 · 4b2f709879
parent 490ff51fa6 092696514f
commit 4b2f709879
1 changed files with 7 additions and 3 deletions
--- a/services/db/Dockerfile
+++ b/services/db/Dockerfile
@ -1,5 +1,9 @@
-FROM mysql:5.6.35
+FROM mysql:5.6.37

-RUN npm install  
+ENV MYSQL_ALLOW_EMPTY_PASSWORD yes

-CMD ["npm", "start"]  
+RUN apt-get -y install vim
+
+CMD ["mysqld"]
+
+EXPOSE 3306