Skip to content

Commit 4dc96b4

Browse files
authored
强制开启 docker && 修复 docker compose 判断 (#115)
* 强制开启 docker * fix: docker compose
1 parent 08440b8 commit 4dc96b4

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

install.sh

+10-8
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ function check_system() {
6969
}
7070

7171
function check_docker_compose() {
72-
if docker compose --version > /dev/null 2>&1; then
72+
if docker compose > /dev/null 2>&1; then
7373
DOCKER_COMPOSE_CMD='docker compose'
7474
elif docker-compose --version > /dev/null 2>&1; then
7575
DOCKER_COMPOSE_CMD='docker-compose'
@@ -85,17 +85,19 @@ function install_software() {
8585
}
8686

8787
function install_docker() {
88-
if ! docker --version > /dev/null 2>&1; then
89-
if [[ $OS_FAMILY = "centos" || $OS_FAMILY = "debian" ]]; then
88+
if [[ $OS_FAMILY = "centos" || $OS_FAMILY = "debian" ]]; then
89+
if ! docker --version > /dev/null 2>&1; then
9090
curl -fsSL ${DOCKER_INSTALL_URL} | bash -s docker
91-
systemctl enable --now docker && \
91+
fi
92+
systemctl enable --now docker && \
9293
while ! systemctl is-active --quiet docker; do sleep 3; done
93-
elif [[ $OS_FAMILY = "alpine" ]]; then
94-
($INSTALL docker || ($UPDATE && $INSTALL docker)) && \
95-
rc-update add docker boot && \
94+
elif [[ $OS_FAMILY = "alpine" ]]; then
95+
if ! docker --version > /dev/null 2>&1; then
96+
($INSTALL docker || ($UPDATE && $INSTALL docker))
97+
fi
98+
rc-update add docker boot && \
9699
service docker start && \
97100
while [[ -z $(service docker status | grep started) ]]; do sleep 3; done
98-
fi
99101
fi
100102
}
101103

0 commit comments

Comments
 (0)