diff --git a/funs.sh b/funs.sh index b34f933..5a3017e 100644 --- a/funs.sh +++ b/funs.sh @@ -7,7 +7,7 @@ welcome () { echo "==欢迎使用machete_installer==" echo "本脚本为开源项目,网址:https://git.filesite.io/filesite/machete_installer" echo "它将指引并安装docker desktop和machete的docker镜像" - echo "并完成machete的基本配置,在你的电脑上创建两个网站,一个管理图片,一个管理视频" + echo "并完成machete的基本配置,在你的电脑上创建1个相册网站" echo "" } @@ -91,7 +91,7 @@ detectDockerImageExists () { imgName="filesite/machete" fi - res=`docker images | grep -v grep | grep "${imgName}" | wc -l` + res=`docker images | grep -v grep | grep "${imgName}" | grep 'latest' | wc -l` if [ $res -gt 0 ]; then return 1 fi @@ -132,7 +132,7 @@ dockerStartAlbumContainer () { docker run --name "${album_name}" \ -p 8181:80 \ -v "${album_path}:/var/www/machete/www/girls/" \ - -itd filesite/machete \ + -itd filesite/machete:latest \ beauty } @@ -153,7 +153,7 @@ dockerStartVideoContainer () { docker run --name "${blog_name}" \ -p 8182:80 \ -v "${blog_path}:/var/www/machete/www/videos/" \ - -itd filesite/machete \ + -itd filesite/machete:latest \ videoblog }