fix(docker): rename docker to docker-file

forks-library · Nov 18, 2019 · 1a43004 · 1a43004
1 parent 031b4a8
commit 1a43004
Show file tree

Hide file tree

Showing 36 changed files with 3 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -227,9 +227,9 @@
   + [linux常用命令](https://github.com/TIGERB/easy-tips/blob/master/linux/command.md)
   + shell
 - Docker
-  + [redis主从搭建](https://github.com/TIGERB/easy-tips/blob/master/docker/redis-master-slave/README.md)
-  + [mysql主从搭建](https://github.com/TIGERB/easy-tips/blob/master/docker/mysql-master-slave/README.md)
-  + [codis环境](https://github.com/TIGERB/easy-tips/blob/master/docker/codis/README.md)
+  + [redis主从搭建](https://github.com/TIGERB/easy-tips/blob/master/docker-file/redis-master-slave/README.md)
+  + [mysql主从搭建](https://github.com/TIGERB/easy-tips/blob/master/docker-file/mysql-master-slave/README.md)
+  + [codis环境](https://github.com/TIGERB/easy-tips/blob/master/docker-file/codis/README.md)
   + mysql多主环境
   + kafka的环境搭建和使用
   + rabbitMQ的环境搭建和使用

diff --git a/docker/codis/.gitignore → docker-file/codis/.gitignore b/docker/codis/.gitignore → docker-file/codis/.gitignore
diff --git a/docker/codis/Dockerfile → docker-file/codis/Dockerfile b/docker/codis/Dockerfile → docker-file/codis/Dockerfile
diff --git a/docker/codis/README.md → docker-file/codis/README.md b/docker/codis/README.md → docker-file/codis/README.md
diff --git a/docker/mysql-master-slave/Dockerfile → docker-file/mysql-master-slave/Dockerfile b/docker/mysql-master-slave/Dockerfile → docker-file/mysql-master-slave/Dockerfile
diff --git a/docker/mysql-master-slave/README.md → docker-file/mysql-master-slave/README.md b/docker/mysql-master-slave/README.md → docker-file/mysql-master-slave/README.md
diff --git a/...er/mysql-master-slave/docker-compose.yaml → ...le/mysql-master-slave/docker-compose.yaml b/...er/mysql-master-slave/docker-compose.yaml → ...le/mysql-master-slave/docker-compose.yaml
diff --git a/...aster-slave/master-conf/conf.d/docker.cnf → ...aster-slave/master-conf/conf.d/docker.cnf b/...aster-slave/master-conf/conf.d/docker.cnf → ...aster-slave/master-conf/conf.d/docker.cnf
diff --git a/...master-slave/master-conf/conf.d/mysql.cnf → ...master-slave/master-conf/conf.d/mysql.cnf b/...master-slave/master-conf/conf.d/mysql.cnf → ...master-slave/master-conf/conf.d/mysql.cnf
diff --git a/...er-slave/master-conf/conf.d/mysqldump.cnf → ...er-slave/master-conf/conf.d/mysqldump.cnf b/...er-slave/master-conf/conf.d/mysqldump.cnf → ...er-slave/master-conf/conf.d/mysqldump.cnf
diff --git a/.../mysql-master-slave/master-conf/master.sh → .../mysql-master-slave/master-conf/master.sh b/.../mysql-master-slave/master-conf/master.sh → .../mysql-master-slave/master-conf/master.sh
diff --git a/docker/mysql-master-slave/master-conf/my.cnf → ...ile/mysql-master-slave/master-conf/my.cnf b/docker/mysql-master-slave/master-conf/my.cnf → ...ile/mysql-master-slave/master-conf/my.cnf
diff --git a/...-master-slave/master-conf/my.cnf.fallback → ...-master-slave/master-conf/my.cnf.fallback b/...-master-slave/master-conf/my.cnf.fallback → ...-master-slave/master-conf/my.cnf.fallback
diff --git a/.../mysql-master-slave/master-conf/mysql.cnf → .../mysql-master-slave/master-conf/mysql.cnf b/.../mysql-master-slave/master-conf/mysql.cnf → .../mysql-master-slave/master-conf/mysql.cnf
diff --git a/...slave/master-conf/mysql.conf.d/mysqld.cnf → ...slave/master-conf/mysql.conf.d/mysqld.cnf b/...slave/master-conf/mysql.conf.d/mysqld.cnf → ...slave/master-conf/mysql.conf.d/mysqld.cnf
diff --git a/docker/mysql-master-slave/my.cnf → docker-file/mysql-master-slave/my.cnf b/docker/mysql-master-slave/my.cnf → docker-file/mysql-master-slave/my.cnf
diff --git a/...master-slave/slave-conf/conf.d/docker.cnf → ...master-slave/slave-conf/conf.d/docker.cnf b/...master-slave/slave-conf/conf.d/docker.cnf → ...master-slave/slave-conf/conf.d/docker.cnf
diff --git a/...-master-slave/slave-conf/conf.d/mysql.cnf → ...-master-slave/slave-conf/conf.d/mysql.cnf b/...-master-slave/slave-conf/conf.d/mysql.cnf → ...-master-slave/slave-conf/conf.d/mysql.cnf
diff --git a/...ter-slave/slave-conf/conf.d/mysqldump.cnf → ...ter-slave/slave-conf/conf.d/mysqldump.cnf b/...ter-slave/slave-conf/conf.d/mysqldump.cnf → ...ter-slave/slave-conf/conf.d/mysqldump.cnf
diff --git a/docker/mysql-master-slave/slave-conf/my.cnf → ...file/mysql-master-slave/slave-conf/my.cnf b/docker/mysql-master-slave/slave-conf/my.cnf → ...file/mysql-master-slave/slave-conf/my.cnf
diff --git a/...l-master-slave/slave-conf/my.cnf.fallback → ...l-master-slave/slave-conf/my.cnf.fallback b/...l-master-slave/slave-conf/my.cnf.fallback → ...l-master-slave/slave-conf/my.cnf.fallback
diff --git a/...r/mysql-master-slave/slave-conf/mysql.cnf → ...e/mysql-master-slave/slave-conf/mysql.cnf b/...r/mysql-master-slave/slave-conf/mysql.cnf → ...e/mysql-master-slave/slave-conf/mysql.cnf
diff --git a/...-slave/slave-conf/mysql.conf.d/mysqld.cnf → ...-slave/slave-conf/mysql.conf.d/mysqld.cnf b/...-slave/slave-conf/mysql.conf.d/mysqld.cnf → ...-slave/slave-conf/mysql.conf.d/mysqld.cnf
diff --git a/...er/mysql-master-slave/slave-conf/slave.sh → ...le/mysql-master-slave/slave-conf/slave.sh b/...er/mysql-master-slave/slave-conf/slave.sh → ...le/mysql-master-slave/slave-conf/slave.sh
diff --git a/docker/nginx-http2/Dockerfile → docker-file/nginx-http2/Dockerfile b/docker/nginx-http2/Dockerfile → docker-file/nginx-http2/Dockerfile
diff --git a/docker/nginx-http2/README.md → docker-file/nginx-http2/README.md b/docker/nginx-http2/README.md → docker-file/nginx-http2/README.md
diff --git a/docker/nginx-http2/cert/.gitignore → docker-file/nginx-http2/cert/.gitignore b/docker/nginx-http2/cert/.gitignore → docker-file/nginx-http2/cert/.gitignore
diff --git a/docker/nginx-http2/cert/demo.io.key → docker-file/nginx-http2/cert/demo.io.key b/docker/nginx-http2/cert/demo.io.key → docker-file/nginx-http2/cert/demo.io.key
diff --git a/docker/nginx-http2/cert/demo.io_bundle.crt → ...-file/nginx-http2/cert/demo.io_bundle.crt b/docker/nginx-http2/cert/demo.io_bundle.crt → ...-file/nginx-http2/cert/demo.io_bundle.crt
diff --git a/docker/nginx-http2/docker-compose.yaml → docker-file/nginx-http2/docker-compose.yaml b/docker/nginx-http2/docker-compose.yaml → docker-file/nginx-http2/docker-compose.yaml
diff --git a/docker/nginx-http2/http2.tigerb.cn.conf → docker-file/nginx-http2/http2.tigerb.cn.conf b/docker/nginx-http2/http2.tigerb.cn.conf → docker-file/nginx-http2/http2.tigerb.cn.conf
diff --git a/docker/redis-master-slave/Dockerfile → docker-file/redis-master-slave/Dockerfile b/docker/redis-master-slave/Dockerfile → docker-file/redis-master-slave/Dockerfile
diff --git a/docker/redis-master-slave/README.md → docker-file/redis-master-slave/README.md b/docker/redis-master-slave/README.md → docker-file/redis-master-slave/README.md
diff --git a/...er/redis-master-slave/docker-compose.yaml → ...le/redis-master-slave/docker-compose.yaml b/...er/redis-master-slave/docker-compose.yaml → ...le/redis-master-slave/docker-compose.yaml
diff --git a/docker/redis-master-slave/redis.master.conf → ...file/redis-master-slave/redis.master.conf b/docker/redis-master-slave/redis.master.conf → ...file/redis-master-slave/redis.master.conf
diff --git a/docker/redis-master-slave/redis.slave.conf → ...-file/redis-master-slave/redis.slave.conf b/docker/redis-master-slave/redis.slave.conf → ...-file/redis-master-slave/redis.slave.conf