更新docker-tools工具；新增releases；docker-tools_v1.0.0.zip

docker-tools/daemon.json

@@ -12,6 +12,6 @@
     "https://docker.1ms.run"
   ],
   "bip": "10.21.21.1/24",
-  "data-root": "/opt/docker/data",
+  "data-root": "{{DOCKER_DATA_DIR}}",
   "live-restore": true
 }

docker-tools/docker-tools

@@ -238,16 +238,16 @@ removeEnv () {
 
   cp -rpf ~/.bashrc ~/.bashrc.bak.$DATE
   sed -i 's/# Docker Env Begin//g' ~/.bashrc
-  sed -i 's/export DOCKER_HOME='$DOCKER_INSTALL_DIR'//g' ~/.bashrc
+  sed -i 's#export DOCKER_HOME='$DOCKER_INSTALL_DIR'##g' ~/.bashrc
   sed -i 's/export PATH=$PATH:$DOCKER_HOME//g' ~/.bashrc
   sed -i 's/# Docker Env End//g' ~/.bashrc
   source ~/.bashrc
 
   cp -rpf /etc/profile /etc/profile.bak.$DATE
   sed -i 's/# Docker Env Begin//g' /etc/profile
-  sed -i 's/export DOCKER_HOME='$DOCKER_INSTALL_DIR'//g' /etc/profile
+  sed -i 's#export DOCKER_HOME='$DOCKER_INSTALL_DIR'##g' /etc/profile
   sed -i 's/export PATH=$PATH:$DOCKER_HOME//g' /etc/profile
-  sed -i 's/# Docker Env End//g' ~/.bashrc
+  sed -i 's/# Docker Env End//g' /etc/profile
   source /etc/profile
 
   echo '------------------------------ 环境变量移除完成! ------------------------------'
@@ -257,9 +257,9 @@ removeEnv () {
 configService () {
   echo '------------------------------ 开始配置系统服务... ------------------------------'
 
-  sed -i 's#/opt/docker/bin#'$DOCKER_INSTALL_DIR'#g' docker.service
   cp -rpf docker.service /usr/lib/systemd/system/docker.service
   cp -rpf docker.socket /usr/lib/systemd/system/docker.socket
+  sed -i 's#{{DOCKER_BIN_DIR}}#'$DOCKER_INSTALL_DIR'#g' /usr/lib/systemd/system/docker.service
   systemctl daemon-reload
 
   echo '------------------------------ 系统服务配置完成! ------------------------------'
@@ -280,8 +280,8 @@ removeService () {
 configDockerEngine () {
   echo '------------------------------ 开始配置 Docker... ------------------------------'
 
-  ed -i 's#/opt/docker/data#'$DOCKER_DATA_DIR'#g' daemon.json
   cp -rpf daemon.json /etc/docker/daemon.json
+  sed -i 's#{{DOCKER_DATA_DIR}}#'$DOCKER_DATA_DIR'#g' /etc/docker/daemon.json
 
   chmod -R docker.docker $DOCKER_INSTALL_DIR
   chmod -R 755 $DOCKER_INSTALL_DIR
@@ -348,7 +348,7 @@ onlyInstallDockerEngine () {
   createDir
   createUser
   configSystem
-  if [ !NEED_OFFLINE_INSTALL ];then
+  if [ $NEED_OFFLINE_INSTALL == "false" ];then
     downloadDockerEnginePackage 
   fi
   installDockerEngine
@@ -356,7 +356,7 @@ onlyInstallDockerEngine () {
   configService
   configDockerEngine
   startDocker
-  if [ $NEED_ENABLE_DOCKER ];then
+  if [ $NEED_ENABLE_DOCKER == "true" ];then
     enableDocker
   fi
   infoDocker
@@ -369,7 +369,7 @@ onlyInstallDockerCompose () {
   echo '------------------------------ 开始安装 Docker Compose... ------------------------------'
 
   searchCPUArch
-  if [ $NEED_OFFLINE_INSTALL == "true" ]; then
+  if [ $NEED_OFFLINE_INSTALL == "false" ]; then
     downloadDockerComposePackage
   fi
   installDockerCompose

docker-tools/docker.service

@@ -7,12 +7,11 @@ Requires=docker.socket
 
 [Service]
 Type=notify
-Environment=PATH=/data/docker/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+Environment=PATH={{DOCKER_BIN_DIR}}:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 # the default is not to use systemd for cgroups because the delegate issues still
 # exists and systemd currently does not support the cgroup feature set required
-# for containers run by docker
+# for containers run by dockerExecStart={{DOCKER_BIN_DIR}}/dockerd -H unix://var/run/docker.sock
-ExecStart=/data/docker/bin/dockerd -H unix://var/run/docker.sock
+ExecStart={{DOCKER_BIN_DIR}}/dockerd -H unix://var/run/docker.sock
-ExecReload=/bin/kill -s HUP
 # Having non-zero Limit*s causes performance problems due to accounting overhead
 # in the kernel. We recommend using cgroups to do container-local accounting.
 LimitNOFILE=infinity