From fb39b803d2fdf93adde724ef64a27dce6cbbf762 Mon Sep 17 00:00:00 2001
From: TIGERB <tigerbcode@gmail.com>
Date: Mon, 18 Nov 2019 13:05:33 +0800
Subject: [PATCH] fix(docker): Your site is having problems building: The
 symbolic link /docker-file/mysql-master-slave/my.cnf

---
 docker-file/mysql-master-slave/my.cnf                            | 1 -
 {docker-file => docker}/codis/.gitignore                         | 0
 {docker-file => docker}/codis/Dockerfile                         | 0
 {docker-file => docker}/codis/README.md                          | 0
 {docker-file => docker}/mysql-master-slave/Dockerfile            | 0
 {docker-file => docker}/mysql-master-slave/README.md             | 0
 {docker-file => docker}/mysql-master-slave/docker-compose.yaml   | 0
 .../mysql-master-slave/master-conf/conf.d/docker.cnf             | 0
 .../mysql-master-slave/master-conf/conf.d/mysql.cnf              | 0
 .../mysql-master-slave/master-conf/conf.d/mysqldump.cnf          | 0
 {docker-file => docker}/mysql-master-slave/master-conf/master.sh | 0
 {docker-file => docker}/mysql-master-slave/master-conf/my.cnf    | 0
 .../mysql-master-slave/master-conf/my.cnf.fallback               | 0
 {docker-file => docker}/mysql-master-slave/master-conf/mysql.cnf | 0
 .../mysql-master-slave/master-conf/mysql.conf.d/mysqld.cnf       | 0
 .../mysql-master-slave/slave-conf/conf.d/docker.cnf              | 0
 .../mysql-master-slave/slave-conf/conf.d/mysql.cnf               | 0
 .../mysql-master-slave/slave-conf/conf.d/mysqldump.cnf           | 0
 {docker-file => docker}/mysql-master-slave/slave-conf/my.cnf     | 0
 .../mysql-master-slave/slave-conf/my.cnf.fallback                | 0
 {docker-file => docker}/mysql-master-slave/slave-conf/mysql.cnf  | 0
 .../mysql-master-slave/slave-conf/mysql.conf.d/mysqld.cnf        | 0
 {docker-file => docker}/mysql-master-slave/slave-conf/slave.sh   | 0
 {docker-file => docker}/nginx-http2/Dockerfile                   | 0
 {docker-file => docker}/nginx-http2/README.md                    | 0
 {docker-file => docker}/nginx-http2/cert/.gitignore              | 0
 {docker-file => docker}/nginx-http2/cert/demo.io.key             | 0
 {docker-file => docker}/nginx-http2/cert/demo.io_bundle.crt      | 0
 {docker-file => docker}/nginx-http2/docker-compose.yaml          | 0
 {docker-file => docker}/nginx-http2/http2.tigerb.cn.conf         | 0
 {docker-file => docker}/redis-master-slave/Dockerfile            | 0
 {docker-file => docker}/redis-master-slave/README.md             | 0
 {docker-file => docker}/redis-master-slave/docker-compose.yaml   | 0
 {docker-file => docker}/redis-master-slave/redis.master.conf     | 0
 {docker-file => docker}/redis-master-slave/redis.slave.conf      | 0
 35 files changed, 1 deletion(-)
 delete mode 120000 docker-file/mysql-master-slave/my.cnf
 rename {docker-file => docker}/codis/.gitignore (100%)
 rename {docker-file => docker}/codis/Dockerfile (100%)
 rename {docker-file => docker}/codis/README.md (100%)
 rename {docker-file => docker}/mysql-master-slave/Dockerfile (100%)
 rename {docker-file => docker}/mysql-master-slave/README.md (100%)
 rename {docker-file => docker}/mysql-master-slave/docker-compose.yaml (100%)
 rename {docker-file => docker}/mysql-master-slave/master-conf/conf.d/docker.cnf (100%)
 rename {docker-file => docker}/mysql-master-slave/master-conf/conf.d/mysql.cnf (100%)
 rename {docker-file => docker}/mysql-master-slave/master-conf/conf.d/mysqldump.cnf (100%)
 rename {docker-file => docker}/mysql-master-slave/master-conf/master.sh (100%)
 rename {docker-file => docker}/mysql-master-slave/master-conf/my.cnf (100%)
 rename {docker-file => docker}/mysql-master-slave/master-conf/my.cnf.fallback (100%)
 rename {docker-file => docker}/mysql-master-slave/master-conf/mysql.cnf (100%)
 rename {docker-file => docker}/mysql-master-slave/master-conf/mysql.conf.d/mysqld.cnf (100%)
 rename {docker-file => docker}/mysql-master-slave/slave-conf/conf.d/docker.cnf (100%)
 rename {docker-file => docker}/mysql-master-slave/slave-conf/conf.d/mysql.cnf (100%)
 rename {docker-file => docker}/mysql-master-slave/slave-conf/conf.d/mysqldump.cnf (100%)
 rename {docker-file => docker}/mysql-master-slave/slave-conf/my.cnf (100%)
 rename {docker-file => docker}/mysql-master-slave/slave-conf/my.cnf.fallback (100%)
 rename {docker-file => docker}/mysql-master-slave/slave-conf/mysql.cnf (100%)
 rename {docker-file => docker}/mysql-master-slave/slave-conf/mysql.conf.d/mysqld.cnf (100%)
 rename {docker-file => docker}/mysql-master-slave/slave-conf/slave.sh (100%)
 rename {docker-file => docker}/nginx-http2/Dockerfile (100%)
 rename {docker-file => docker}/nginx-http2/README.md (100%)
 rename {docker-file => docker}/nginx-http2/cert/.gitignore (100%)
 rename {docker-file => docker}/nginx-http2/cert/demo.io.key (100%)
 rename {docker-file => docker}/nginx-http2/cert/demo.io_bundle.crt (100%)
 rename {docker-file => docker}/nginx-http2/docker-compose.yaml (100%)
 rename {docker-file => docker}/nginx-http2/http2.tigerb.cn.conf (100%)
 rename {docker-file => docker}/redis-master-slave/Dockerfile (100%)
 rename {docker-file => docker}/redis-master-slave/README.md (100%)
 rename {docker-file => docker}/redis-master-slave/docker-compose.yaml (100%)
 rename {docker-file => docker}/redis-master-slave/redis.master.conf (100%)
 rename {docker-file => docker}/redis-master-slave/redis.slave.conf (100%)

diff --git a/docker-file/mysql-master-slave/my.cnf b/docker-file/mysql-master-slave/my.cnf
deleted file mode 120000
index 18bea13..0000000
--- a/docker-file/mysql-master-slave/my.cnf
+++ /dev/null
@@ -1 +0,0 @@
-/etc/alternatives/my.cnf
\ No newline at end of file
diff --git a/docker-file/codis/.gitignore b/docker/codis/.gitignore
similarity index 100%
rename from docker-file/codis/.gitignore
rename to docker/codis/.gitignore
diff --git a/docker-file/codis/Dockerfile b/docker/codis/Dockerfile
similarity index 100%
rename from docker-file/codis/Dockerfile
rename to docker/codis/Dockerfile
diff --git a/docker-file/codis/README.md b/docker/codis/README.md
similarity index 100%
rename from docker-file/codis/README.md
rename to docker/codis/README.md
diff --git a/docker-file/mysql-master-slave/Dockerfile b/docker/mysql-master-slave/Dockerfile
similarity index 100%
rename from docker-file/mysql-master-slave/Dockerfile
rename to docker/mysql-master-slave/Dockerfile
diff --git a/docker-file/mysql-master-slave/README.md b/docker/mysql-master-slave/README.md
similarity index 100%
rename from docker-file/mysql-master-slave/README.md
rename to docker/mysql-master-slave/README.md
diff --git a/docker-file/mysql-master-slave/docker-compose.yaml b/docker/mysql-master-slave/docker-compose.yaml
similarity index 100%
rename from docker-file/mysql-master-slave/docker-compose.yaml
rename to docker/mysql-master-slave/docker-compose.yaml
diff --git a/docker-file/mysql-master-slave/master-conf/conf.d/docker.cnf b/docker/mysql-master-slave/master-conf/conf.d/docker.cnf
similarity index 100%
rename from docker-file/mysql-master-slave/master-conf/conf.d/docker.cnf
rename to docker/mysql-master-slave/master-conf/conf.d/docker.cnf
diff --git a/docker-file/mysql-master-slave/master-conf/conf.d/mysql.cnf b/docker/mysql-master-slave/master-conf/conf.d/mysql.cnf
similarity index 100%
rename from docker-file/mysql-master-slave/master-conf/conf.d/mysql.cnf
rename to docker/mysql-master-slave/master-conf/conf.d/mysql.cnf
diff --git a/docker-file/mysql-master-slave/master-conf/conf.d/mysqldump.cnf b/docker/mysql-master-slave/master-conf/conf.d/mysqldump.cnf
similarity index 100%
rename from docker-file/mysql-master-slave/master-conf/conf.d/mysqldump.cnf
rename to docker/mysql-master-slave/master-conf/conf.d/mysqldump.cnf
diff --git a/docker-file/mysql-master-slave/master-conf/master.sh b/docker/mysql-master-slave/master-conf/master.sh
similarity index 100%
rename from docker-file/mysql-master-slave/master-conf/master.sh
rename to docker/mysql-master-slave/master-conf/master.sh
diff --git a/docker-file/mysql-master-slave/master-conf/my.cnf b/docker/mysql-master-slave/master-conf/my.cnf
similarity index 100%
rename from docker-file/mysql-master-slave/master-conf/my.cnf
rename to docker/mysql-master-slave/master-conf/my.cnf
diff --git a/docker-file/mysql-master-slave/master-conf/my.cnf.fallback b/docker/mysql-master-slave/master-conf/my.cnf.fallback
similarity index 100%
rename from docker-file/mysql-master-slave/master-conf/my.cnf.fallback
rename to docker/mysql-master-slave/master-conf/my.cnf.fallback
diff --git a/docker-file/mysql-master-slave/master-conf/mysql.cnf b/docker/mysql-master-slave/master-conf/mysql.cnf
similarity index 100%
rename from docker-file/mysql-master-slave/master-conf/mysql.cnf
rename to docker/mysql-master-slave/master-conf/mysql.cnf
diff --git a/docker-file/mysql-master-slave/master-conf/mysql.conf.d/mysqld.cnf b/docker/mysql-master-slave/master-conf/mysql.conf.d/mysqld.cnf
similarity index 100%
rename from docker-file/mysql-master-slave/master-conf/mysql.conf.d/mysqld.cnf
rename to docker/mysql-master-slave/master-conf/mysql.conf.d/mysqld.cnf
diff --git a/docker-file/mysql-master-slave/slave-conf/conf.d/docker.cnf b/docker/mysql-master-slave/slave-conf/conf.d/docker.cnf
similarity index 100%
rename from docker-file/mysql-master-slave/slave-conf/conf.d/docker.cnf
rename to docker/mysql-master-slave/slave-conf/conf.d/docker.cnf
diff --git a/docker-file/mysql-master-slave/slave-conf/conf.d/mysql.cnf b/docker/mysql-master-slave/slave-conf/conf.d/mysql.cnf
similarity index 100%
rename from docker-file/mysql-master-slave/slave-conf/conf.d/mysql.cnf
rename to docker/mysql-master-slave/slave-conf/conf.d/mysql.cnf
diff --git a/docker-file/mysql-master-slave/slave-conf/conf.d/mysqldump.cnf b/docker/mysql-master-slave/slave-conf/conf.d/mysqldump.cnf
similarity index 100%
rename from docker-file/mysql-master-slave/slave-conf/conf.d/mysqldump.cnf
rename to docker/mysql-master-slave/slave-conf/conf.d/mysqldump.cnf
diff --git a/docker-file/mysql-master-slave/slave-conf/my.cnf b/docker/mysql-master-slave/slave-conf/my.cnf
similarity index 100%
rename from docker-file/mysql-master-slave/slave-conf/my.cnf
rename to docker/mysql-master-slave/slave-conf/my.cnf
diff --git a/docker-file/mysql-master-slave/slave-conf/my.cnf.fallback b/docker/mysql-master-slave/slave-conf/my.cnf.fallback
similarity index 100%
rename from docker-file/mysql-master-slave/slave-conf/my.cnf.fallback
rename to docker/mysql-master-slave/slave-conf/my.cnf.fallback
diff --git a/docker-file/mysql-master-slave/slave-conf/mysql.cnf b/docker/mysql-master-slave/slave-conf/mysql.cnf
similarity index 100%
rename from docker-file/mysql-master-slave/slave-conf/mysql.cnf
rename to docker/mysql-master-slave/slave-conf/mysql.cnf
diff --git a/docker-file/mysql-master-slave/slave-conf/mysql.conf.d/mysqld.cnf b/docker/mysql-master-slave/slave-conf/mysql.conf.d/mysqld.cnf
similarity index 100%
rename from docker-file/mysql-master-slave/slave-conf/mysql.conf.d/mysqld.cnf
rename to docker/mysql-master-slave/slave-conf/mysql.conf.d/mysqld.cnf
diff --git a/docker-file/mysql-master-slave/slave-conf/slave.sh b/docker/mysql-master-slave/slave-conf/slave.sh
similarity index 100%
rename from docker-file/mysql-master-slave/slave-conf/slave.sh
rename to docker/mysql-master-slave/slave-conf/slave.sh
diff --git a/docker-file/nginx-http2/Dockerfile b/docker/nginx-http2/Dockerfile
similarity index 100%
rename from docker-file/nginx-http2/Dockerfile
rename to docker/nginx-http2/Dockerfile
diff --git a/docker-file/nginx-http2/README.md b/docker/nginx-http2/README.md
similarity index 100%
rename from docker-file/nginx-http2/README.md
rename to docker/nginx-http2/README.md
diff --git a/docker-file/nginx-http2/cert/.gitignore b/docker/nginx-http2/cert/.gitignore
similarity index 100%
rename from docker-file/nginx-http2/cert/.gitignore
rename to docker/nginx-http2/cert/.gitignore
diff --git a/docker-file/nginx-http2/cert/demo.io.key b/docker/nginx-http2/cert/demo.io.key
similarity index 100%
rename from docker-file/nginx-http2/cert/demo.io.key
rename to docker/nginx-http2/cert/demo.io.key
diff --git a/docker-file/nginx-http2/cert/demo.io_bundle.crt b/docker/nginx-http2/cert/demo.io_bundle.crt
similarity index 100%
rename from docker-file/nginx-http2/cert/demo.io_bundle.crt
rename to docker/nginx-http2/cert/demo.io_bundle.crt
diff --git a/docker-file/nginx-http2/docker-compose.yaml b/docker/nginx-http2/docker-compose.yaml
similarity index 100%
rename from docker-file/nginx-http2/docker-compose.yaml
rename to docker/nginx-http2/docker-compose.yaml
diff --git a/docker-file/nginx-http2/http2.tigerb.cn.conf b/docker/nginx-http2/http2.tigerb.cn.conf
similarity index 100%
rename from docker-file/nginx-http2/http2.tigerb.cn.conf
rename to docker/nginx-http2/http2.tigerb.cn.conf
diff --git a/docker-file/redis-master-slave/Dockerfile b/docker/redis-master-slave/Dockerfile
similarity index 100%
rename from docker-file/redis-master-slave/Dockerfile
rename to docker/redis-master-slave/Dockerfile
diff --git a/docker-file/redis-master-slave/README.md b/docker/redis-master-slave/README.md
similarity index 100%
rename from docker-file/redis-master-slave/README.md
rename to docker/redis-master-slave/README.md
diff --git a/docker-file/redis-master-slave/docker-compose.yaml b/docker/redis-master-slave/docker-compose.yaml
similarity index 100%
rename from docker-file/redis-master-slave/docker-compose.yaml
rename to docker/redis-master-slave/docker-compose.yaml
diff --git a/docker-file/redis-master-slave/redis.master.conf b/docker/redis-master-slave/redis.master.conf
similarity index 100%
rename from docker-file/redis-master-slave/redis.master.conf
rename to docker/redis-master-slave/redis.master.conf
diff --git a/docker-file/redis-master-slave/redis.slave.conf b/docker/redis-master-slave/redis.slave.conf
similarity index 100%
rename from docker-file/redis-master-slave/redis.slave.conf
rename to docker/redis-master-slave/redis.slave.conf