From a175075fcd157f1936f35d9ca1438b3447baa048 Mon Sep 17 00:00:00 2001 From: huty Date: Fri, 21 Mar 2025 15:54:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0docker-tools=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=EF=BC=9B=E6=96=B0=E5=A2=9Ereleases=EF=BC=9Bdocker-too?= =?UTF-8?q?ls=5Fv1.0.0.zip?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-tools/daemon.json | 2 +- docker-tools/docker-tools | 16 ++++++++-------- docker-tools/docker.service | 7 +++---- releases/docker-tools_v1.0.0.zip | Bin 0 -> 5421 bytes 4 files changed, 12 insertions(+), 13 deletions(-) create mode 100644 releases/docker-tools_v1.0.0.zip diff --git a/docker-tools/daemon.json b/docker-tools/daemon.json index e8d7716..a2bd9bf 100644 --- a/docker-tools/daemon.json +++ b/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 } diff --git a/docker-tools/docker-tools b/docker-tools/docker-tools index 1b58b34..8f81daa 100755 --- a/docker-tools/docker-tools +++ b/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 diff --git a/docker-tools/docker.service b/docker-tools/docker.service index 80c43c4..cc2df1e 100644 --- a/docker-tools/docker.service +++ b/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 -ExecStart=/data/docker/bin/dockerd -H unix://var/run/docker.sock -ExecReload=/bin/kill -s HUP +# for containers run by dockerExecStart={{DOCKER_BIN_DIR}}/dockerd -H unix://var/run/docker.sock +ExecStart={{DOCKER_BIN_DIR}}/dockerd -H unix://var/run/docker.sock # 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 diff --git a/releases/docker-tools_v1.0.0.zip b/releases/docker-tools_v1.0.0.zip new file mode 100644 index 0000000000000000000000000000000000000000..37fbceafbbd91da1248f5e13624df8284c2513ac GIT binary patch literal 5421 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 Ze%?L5O@NE{bE|N#p7E;)D3kvj{SWZmwjBTf literal 0 HcmV?d00001