From 80c3374cd1f55fbc0cd8a6a2bf17a54c42077ee9 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 29 Oct 2019 14:58:15 +0800 Subject: [PATCH] update docker --- docker-compose.yml | 4 ++-- docker/mysql/.gitignore | 2 ++ docker/nginx/.gitignore | 3 +++ nginx/backend.conf => docker/nginx/nginx.conf | 0 4 files changed, 7 insertions(+), 2 deletions(-) create mode 100755 docker/mysql/.gitignore create mode 100755 docker/nginx/.gitignore rename nginx/backend.conf => docker/nginx/nginx.conf (100%) diff --git a/docker-compose.yml b/docker-compose.yml index 6cebc20d..68ff5987 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,7 +7,7 @@ services: environment: - MYSQL_ALLOW_EMPTY_PASSWORD=true volumes: - - ./dbdata:/var/lib/mysql + - ./docker/mysql:/var/lib/mysql - ./install.sql:/install.sql phpfpm: image: bitnami/php-fpm @@ -19,7 +19,7 @@ services: - phpfpm volumes: - .:/app - - ./nginx:/etc/nginx/conf.d + - ./docker/nginx:/etc/nginx/conf.d ports: - 8964:80 diff --git a/docker/mysql/.gitignore b/docker/mysql/.gitignore new file mode 100755 index 00000000..d6b7ef32 --- /dev/null +++ b/docker/mysql/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore diff --git a/docker/nginx/.gitignore b/docker/nginx/.gitignore new file mode 100755 index 00000000..02426788 --- /dev/null +++ b/docker/nginx/.gitignore @@ -0,0 +1,3 @@ +* +!.gitignore +!nginx.conf \ No newline at end of file diff --git a/nginx/backend.conf b/docker/nginx/nginx.conf similarity index 100% rename from nginx/backend.conf rename to docker/nginx/nginx.conf