[v.1.1.0] mysqldump and docker-compose.yml refactor

Maxlab · Nov 30, 2016 · 0217497 · 0217497
1 parent d867186
commit 0217497
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 19 deletions.
diff --git a/bin/dev_command/mysqldump b/bin/dev_command/mysqldump
@@ -1,4 +1,3 @@
-docker exec -i stacker_db_1 mysql -uroot -proot ${DEV_COMMAND_OPTIONS}
 
-#docker-compose exec db bash -c 'mysqldump -uroot -p${MYSQL_ROOT_PASSWORD} ${DEV_COMMAND_OPTIONS}'
+docker-compose exec db bash -c 'mysqldump -uroot -p${MYSQL_ROOT_PASSWORD} ${DEV_COMMAND_OPTIONS}'
 exit $?;
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,15 +1,5 @@
 version: '2'
 services:
-#    apache:
-#        image: bitnami/apache:latest
-#        ports:
-#            - 81:80
-#            - 444:443
-#        volumes:
-#            - ./apache/apache:/bitnami/apache
-#            - ./workspace:/app
-
-
     php5apache:
         build: php5apache
         image: maxlab/php5apache
@@ -88,7 +78,7 @@ services:
             - db
             - mailcatcher
             - redis
-          #  - elasticsearch
+            - elasticsearch
     php7console:
         build: php7
         container_name: php7console 
@@ -98,9 +88,9 @@ services:
         volumes_from:
             - php7 
         tty: true
-    #elasticsearch:
-     #   image: elasticsearch:5
-      #  volumes:
-       #     - ./elasticsearch:/usr/share/elasticsearch/data
-    #    ports:
-     #       - "9200:9200"
+    elasticsearch:
+        image: elasticsearch:5
+        volumes:
+            - ./elasticsearch:/usr/share/elasticsearch/data
+        ports:
+            - "9200:9200"