Browse Source

Improving db config and adding dockerignore

Herton 6 years ago
parent
commit
d1ed8f796d
3 changed files with 20 additions and 19 deletions
  1. 2 0
      .dockerignore
  2. 16 17
      docker-compose.yml
  3. 2 2
      mysql/my.cnf

+ 2 - 0
.dockerignore

@@ -0,0 +1,2 @@
+node_modules
+vendor

+ 16 - 17
docker-compose.yml

@@ -1,8 +1,10 @@
-version: '3'
+version: '3.3'
 services:
 
   #PHP Service
   app:
+    depends_on:
+      - apidb
     build:
       context: .
       dockerfile: Dockerfile
@@ -35,24 +37,22 @@ services:
       - app-network
 
   #MySQL Service
-  db:
-    image: mysql:5.7.22
-    container_name: db
-    restart: unless-stopped
-    tty: true
-    ports:
-      - "3307:3306"
-    environment:
-      MYSQL_DATABASE: api
-      MYSQL_USER: api
-      MYSQL_ROOT_PASSWORD: mysql_root_password
-      SERVICE_TAGS: dev
-      SERVICE_NAME: mysql
+  apidb:
+    image: mysql:5.7
+    container_name: apidb
     volumes:
-      - dbdata:/var/lib/mysql
+      - db_data:/var/lib/mysql
       - ./mysql/my.cnf:/etc/mysql/my.cnf
+    restart: always
+    environment:
+      MYSQL_ROOT_PASSWORD: rootapidb
+      MYSQL_DATABASE: apidb
+      MYSQL_USER: apidb
+      MYSQL_PASSWORD: apidb
     networks:
       - app-network
+    ports:
+      - "3307:3306"
 
 #Docker Networks
 networks:
@@ -61,5 +61,4 @@ networks:
 
 #Volumes
 volumes:
-  dbdata:
-    driver: local
+    db_data: {}

+ 2 - 2
mysql/my.cnf

@@ -3,5 +3,5 @@ general_log = 1
 general_log_file = /var/lib/mysql/general.log
 
 [client]
-user=api
-password=mysql_root_password
+user=apidb
+password=rootapidb