TRKJ/LinuxMirrors
2
0
Fork 0
mirror of https://gitee.com/SuperManito/LinuxMirrors synced 2025-12-09 01:30:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
SuperManito
2022-10-28 07:13:10 +08:00
parent 9a65396fb4
commit 3e4717952d
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeMirrors.sh
View File

@@ -152,8 +152,7 @@ function PermissionJudgment() {
## 关闭防火墙和SELinux ## 关闭防火墙和SELinux
function CloseFirewall() { function CloseFirewall() {
systemctl status firewalld | grep running -q if [[ $(systemctl is-active firewalld) == "active" ]]; then
if [ $? -eq 0 ]; then
CHOICE_C=$(echo -e "\n${BOLD}└─ 是否关闭防火墙和 SELinux ? [Y/n] ${PLAIN}") CHOICE_C=$(echo -e "\n${BOLD}└─ 是否关闭防火墙和 SELinux ? [Y/n] ${PLAIN}")
read -p "${CHOICE_C}" INPUT read -p "${CHOICE_C}" INPUT
[ -z ${INPUT} ] && INPUT=Y [ -z ${INPUT} ] && INPUT=Y

12
DockerInstallation.sh
View File

@@ -171,8 +171,7 @@ function NetWorkJudgment() {
## 关闭防火墙 ## 关闭防火墙
function CloseFirewall() { function CloseFirewall() {
systemctl status firewalld | grep running -q if [[ $(systemctl is-active firewalld) == "active" ]]; then
if [ $? -eq 0 ]; then
systemctl disable --now firewalld >/dev/null 2>&1 systemctl disable --now firewalld >/dev/null 2>&1
[ -s $SelinuxConfig ] && sed -i "s/SELINUX=enforcing/SELINUX=disabled/g" $SelinuxConfig && setenforce 0 >/dev/null 2>&1 [ -s $SelinuxConfig ] && sed -i "s/SELINUX=enforcing/SELINUX=disabled/g" $SelinuxConfig && setenforce 0 >/dev/null 2>&1
fi fi
@@ -390,8 +389,7 @@ function DockerEngine() {
if [[ ${DOCKER_VERSION_INSTALL_LATEST} == "True" ]]; then if [[ ${DOCKER_VERSION_INSTALL_LATEST} == "True" ]]; then
echo -e "\n$COMPLETE 检测到已安装最新版本的 Docker Engine，跳过安装" echo -e "\n$COMPLETE 检测到已安装最新版本的 Docker Engine，跳过安装"
ConfigureMirror ConfigureMirror
systemctl status docker | grep running -q if [[ $(systemctl is-active docker) == "active" ]]; then
if [ $? -eq 0 ]; then
systemctl restart docker systemctl restart docker
fi fi
echo '' echo ''
@@ -488,15 +486,13 @@ function ShowVersion() {
esac esac
exit exit
fi fi
systemctl status docker | grep running -q if [[ $(systemctl is-active docker) == "active" ]]; then
if [ $? -ne 0 ]; then
sleep 2 sleep 2
systemctl disable --now docker >/dev/null 2>&1 systemctl disable --now docker >/dev/null 2>&1
sleep 2 sleep 2
systemctl enable --now docker >/dev/null 2>&1 systemctl enable --now docker >/dev/null 2>&1
sleep 2 sleep 2
systemctl status docker | grep running -q if [[ $(systemctl is-active docker) == "active" ]]; then
if [ $? -ne 0 ]; then
echo -e "\n$ERROR 检测到 Docker 服务启动异常，可能由于重复安装相同版本导致" echo -e "\n$ERROR 检测到 Docker 服务启动异常，可能由于重复安装相同版本导致"
echo -e "\n请执行 systemctl start docker 或 service docker start 命令尝试启动" echo -e "\n请执行 systemctl start docker 或 service docker start 命令尝试启动"
echo -e "\n官方安装文档：https://docs.docker.com/engine/install" echo -e "\n官方安装文档：https://docs.docker.com/engine/install"