Fix docker-compose.yml

ngyuki · Jul 27, 2018 · 96469a2 · 96469a2
1 parent 03ce41b
commit 96469a2
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,26 +1,29 @@
-version: '3'
+version: '3.4'
 
 services:
   mysql:
     image: mysql:5.7
     ports:
-      - $MYSQL_PORT:3306
+      - ${MYSQL_TCP_PORT-13306}:3306
     environment: &environment
       MYSQL_HOST: mysql
       MYSQL_PORT: 3306
-      MYSQL_DATABASE: $MYSQL_DATABASE
-      MYSQL_USER: $MYSQL_USER
-      MYSQL_PASSWORD: $MYSQL_PASSWORD
+      MYSQL_DATABASE: ${MYSQL_DATABASE-test}
+      MYSQL_USER: ${MYSQL_USER-test}
+      MYSQL_PASSWORD: ${MYSQL_PASSWORD-pass}
       MYSQL_ALLOW_EMPTY_PASSWORD: 1
     volumes:
       - mysql:/var/lib/mysql
       - ./sql/init.sql:/docker-entrypoint-initdb.d/init.sql
+    command:
+      - --character-set-server=utf8
 
   php:
     image: ngyuki/php-dev:7.0
     volumes:
       - ./:/app/
     working_dir: /app/
+    stop_signal: KILL
     environment:
       <<: *environment
     command:
@@ -29,6 +32,7 @@ services:
       - |
         composer install -o --ansi --prefer-dist
         php -v
+        echo
         exec tail -f /dev/null
 
 volumes: