Merge pull request #35 from terwer/v4.x

Change structure
terwer · Mar 14, 2019 · 4f24001 · 4f24001
2 parents 3dd6ced + 56c6912
commit 4f24001
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -8,7 +8,7 @@ services:
     container_name: jvue-mysql
     build:
       context: ./
-      dockerfile: ./jvue-docker/jvue-mysql/Dockerfile
+      dockerfile: ./jvue-mysql/Dockerfile
     ports:
       - "3306:3306"
     environment:
@@ -21,7 +21,7 @@ services:
       - "MYSQL_PASSWORD=123456"
     volumes:
       - ./data/mysql/db:/var/db
-      - ./jvue-docker/jvue-mysql/my.cnf:/etc/my.cnf
       - ./data/mysql/log:/var/log
-      - ./jvue-docker/jvue-mysql/init:/docker-entrypoint-initdb.d/
+      - ./jvue-mysql/my.cnf:/etc/my.cnf
+      - ./jvue-mysql/init:/docker-entrypoint-initdb.d/
     restart: always
diff --git a/jvue-docker/jvue-mysql/Dockerfile → jvue-mysql/Dockerfile b/jvue-docker/jvue-mysql/Dockerfile → jvue-mysql/Dockerfile
diff --git a/jvue-docker/jvue-mysql/init/init.sql → jvue-mysql/init/init.sql b/jvue-docker/jvue-mysql/init/init.sql → jvue-mysql/init/init.sql
diff --git a/jvue-docker/jvue-mysql/my.cnf → jvue-mysql/my.cnf b/jvue-docker/jvue-mysql/my.cnf → jvue-mysql/my.cnf