From 857ef2b4899795471ddba401329d275799ef6a54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=89=E5=AE=89=E7=A7=91=E6=8A=80?= Date: Thu, 10 Oct 2024 20:53:24 +0800 Subject: [PATCH] update --- docker/readme.txt | 2 +- docker/uuwaf.sh | 7 ++----- docs/waf.tgz | Bin 3399 -> 3511 bytes 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/docker/readme.txt b/docker/readme.txt index 78ccf1f..66b712d 100644 --- a/docker/readme.txt +++ b/docker/readme.txt @@ -1,5 +1,5 @@ 环境要求: -docker版本1.20以上 +Docker 20.10.14 版本以上,Docker Compose 2.0.0 版本以上 解压南墙安装包: tar -zxf waf.tgz && cd waf diff --git a/docker/uuwaf.sh b/docker/uuwaf.sh index c77d4bc..53bcf93 100644 --- a/docker/uuwaf.sh +++ b/docker/uuwaf.sh @@ -16,7 +16,7 @@ fi if [ ! $(command -v docker) ]; then curl -sSLk https://get.docker.com/ | bash if [ $? -ne "0" ]; then - abort "自动安装Docker运行环境失败,请按照https://docs.docker.com/engine/install/指引手工安装Docker" + abort "安装官方Docker运行环境失败,请参考https://help.aliyun.com/zh/ecs/use-cases/install-and-use-docker-on-a-linux-ecs-instance手工安装后再执行本脚本" fi systemctl start docker && systemctl enable docker fi @@ -24,10 +24,7 @@ fi DC_CMD="docker compose" $DC_CMD version > /dev/null 2>&1 if [ $? -ne "0" ]; then - DC_CMD="docker-compose" - if [ ! $(command -v docker-compose) ]; then - abort "未发现docker compose命令,请安装Docker Compose插件" - fi + abort "你的Docker版本过低,缺少docker compose命令,请卸载后安装最新版本" fi SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" diff --git a/docs/waf.tgz b/docs/waf.tgz index c2e83a42541c1adfcafcf9928b1f3bf43ea2a64d..ef17556e89837a9ae024d72cb3159a144453c57e 100644 GIT binary patch literal 3511 zcmV;o4M_4IiwFS6%?D=y1ML}WbJJFquhC5Z!>yARvQt^|D`wqEchZDT83?c#rn^fS zSGKNgHF~&`oDd2#0UAOefzahqXc(TMOlcmSb|4{S`7yO*=TrZ}o_nus%T7YKyM^7I z>I^v2x#ynuJ?C6|M9K@>UNMLO$wY$w1!(_EpCj?47)i!^Vu_w@VnmF^d$ys(t5%Fa z*|H@Qp>3vN*e|2|rS<<)7=ieg%kUYtimyrrjek78Rs7@0M6412o_G@C9~DXb#aE?} zAAaZY?|f6pD!P!BtRlxrS;Mqkkwq zY9XLHrr0RLo#Z$rkB%VzI0|*W->}2=4$2dSYKu>+R~{iE2f35q)b38X zv)|RexCx&>Kc8|govw|Yac9TeYfIIeUpNb2xz|?Q^JDJpqI+$^y?Y-OZM$Tp1c78~ zxoqKFIA>@=h|4RU>`>RP!@CDUh}S`BaZ?2$61)H-5+O$ z4p0V6o$AF!=iV9T!S}Tv=fE+bHSeYe%O#k3OZ^)wteM^RgLtGbIK*QLy6hlYvAwkB&f?ift z6n*dQ2)CvCJnvQ3?m(I_zf~vC5p7>gRMswn$EwetIZKyYB|4YaDyt7XcTO+Y*4Buv z)Mzi~C=Zqj>HdSe4;;!I=sWabZ>Vbr%E^fQkrh*yG*GAObCThi^!~#K`*$4?kDd&n z?hx@rX+(x64(Nf%$0fvZoMjuO46U;}y5V%y9UvPcIypUM-3yzKrn!ad@XRqa#OD#k zA^0z6H+rs4s$+Y^Fo(z%poF)rNfk{hVCzJ|#3iIl`e%xy7fwhcLumWwB~#ID)D=6q z{lqcJELf<(b;v2zW@_=f(Du}ho#KgjJO=;cvF?wp?I%WZh*v*>-Asg!2jUAh z5`FxARnkV)$BWLT`#Z&-#!dk%`WcT^mggZ+E6Zb*r0pjmlt)O!KHDOE!La z61|piTSdvl@_!Wc4qwQLZ6LxEsIDPIWvpS`A2?a6p*K8-T8ZdWGsx< zC#HeekBoiozAY^UYWkL&@;=?XV6JW2i!CWfA1oEav5Q&krIE6&3CwLe|B?Bh1X06b``9ZQ zaLJJ0v-SKRNhZYh`9GG32J`>x05)&d9-eZ)KmGIbn;ffAC@O{{@Gp+oWCW9QW%)d` zD{r}<%~dEG7Qs|LI*U6)>pc*5*hBd<+<+agpPS2+VZ07{JL0}k;+gQ3` zKO2&n;PqSg8uO)lXT_afa4*eNA3XDl8QsqGW)^bv4phH$gMb&0*T-(dAz!~vRg1vr zP`$D0tX(BT>ZK(zBrLpGzrNtR0x6{wnJ!?7zEqZm)jOvSNR~Asn(~`m6lA(jSDo{Bs*i6}Pp=S}FTMty*ekQUc4^j`zDn4g zUU4Q?{q*kCPt}I`yu3ZLO}X=PBr~XBa0hiABX_=>s(y27{mVJHSXNe_{4{nNa<8&H zy+Mm9=iCkE&kATX@hu7F(yiL!)#{ZWpfK;n_I3;H(sSl$$#%x4Yd@~EY+iZd%s%o& zo?CKfZ#$FIj7xQO9$vXPnC>i{WjYS*OM{w9$(@>TW-i0zM?y-4`@H4ME;+ZxxCCru z8R2)YdwZ@rd%^SYSBuWf!`hiO=fQ18xq0#5#_IpZQ}x@{m|v*>(F7Fx*7_fZ77*0` z*8xATzVNP!R_YCyAJ}D)J|aXeyeSXGFtVw@r9FkRrXm+G!zm?6^ENaIWSp1Es$ECt z3_Y(D8dN+gz~D6^jiyi}84brGVMu~-q`nM8OgT%`@UMzOH11a-W0Y(w)fAxBzlibd z2{RqTtwy}TS=by_a+qzUWtcIc_o5V{UoHvti&07iJuPNNSyeQpDN-+)MlOYV5{X!% zjxzF!iW@p1%g7TO#AsX;8%Ver$t_6mjV&oUSj1GNI?)wxmQ5i^1z%Yd*AguP{)myw zYGZ{*p`BuCrxgCNX#c^1-n5j*u`n!< zSOJ-;=yhXx_N51XmT?K|vXwD(za!*q)A_`&vSKShfxMV!ida(Z;wWS7qxWK8!X|8z z1n)0Twm~u{!pTho)zs!!2kK>h_R2B%5L$}?S7%<)6t&A$<`-TQVQ${gI^zb8HLegnw@IN0}>O#l9U`*!so+P!~Yx;GJtwox41zyHvt zaVCd?1}0a;xuLommM8ly@Ntjb2`6}H@-~jF?}jEIFZ+qq8BK-NIoOcB$-gd z5sKn1IGwuf*--8aB$dkI2NfsXzcxk|dKqoXtqq zlZ-^_jV(Lye-}vq-;gW6v5a5n|FL*1+1CGKJz~)RUkh}i4-6AYGAWP9&{5GCLAHT% z(qonv2;b0rKq&E1-SXOe- z>1D)}eg|O{%#Da|g@Ko%>xP`oWXt(H)c%rTs2NK+j!`d)M0XBut~ybTnLIE}t<*E0ry4_htmw*ARqbxKPjCGWiazo{kMYIES1}L^v zgE)|hu#g7rOC3cp;^fOJwcNx+D?-dHrz{T@vG-b^<17Rf4do>ZN+a{UDe0D!V{A#B z$QnxT+6(oc^5~O4g`=xu31A$i7!H;@H8*jJ89xPbZ$c(#vF->teCy69hI|4 zFSgsT>@!T(V4BR8P0W+Ik1xSo+D1wjEDjuQ_A-v3=YV2KS(W;HRLdHwlH=)=gA@yF zAj1`mHjsO z5h8B}e9*$!D7AHUpe^NwdLyxjn2d7m84q0daFndY6cEL2b_m!C@dnIUrHoB}r>z^X zhqJX-)E+KdR);c*4oTZ8Rpix4AQh;VF47xLL&J` z4uSwRO(Q>uXDr~MNl-S7e4hIs9ohm2AbJx1g>% z2jR?|d+vGPbI!F#rLwT;B|`$BH;I=P3h{Rw_>5cCmnDP7Kb_tv{%NvC;-AR&l0OjtR02>a@v;;O z!yi2Un_m}-iY^o-tIBaw(J<|;J?L|;3zw<};xUSS3}^9xnA8rqQ&-$uR}Z4@wP^D9n}XNp%!volwbFs*K5;K=hV0E+57Io znda?@0m^`>(>TBA-a6sl`M&w%95@EF_9o9XChi3SL6{Ymi1mu1V?og&ja60fCQrFf zFL`IqxsT?;%pq1_W|uW)*;p&tDk52L`zE3{-$d;dtV=}|`%Bb01O0{m!GV0trv|Y# z!@@DHn=PObY+8z;qj!-Y;}Jo3R28M(eKW~z=!H&>e2Zh(#&HOUde-~WoBh_EzR)=T zuv0n< zK=evU z*f_c$xe!fz3)kgaWNL^nBZ@=tUoNiqbwH|Pd(<$8$rhl5w~a{^O{!q)NX5i8q)Yl| zilkSLNTb7O%jY#y(QVW%9^G=}kYrXY)KWwtnrz5TgZmFjZ^4LTX7)-v=rFay`I zJxUx1i5l__%c*dFfQ>+8hZCa)c~Kxp$I5@=uR|89HdBk=j<)2sZc7|Vr$zXm7JELn zwj3EPAzu9ib~6zn9*D2lC=ucxDvvg5JXmz6Z*NQdYy23nqMvE8zBCVotiCi}U;5TN zec8Qp4IY}e9=KCCpbq*;Iq}2lm3epZvHRppZ+6N(dlM+@&lbEdAG;GjF}5)(jg{Fh zdWOmWAdMWbMW%UFlO-F!IEh|KxUH&WV)=gxdRHjq#5NPJ&4I9SYlurKmh=#*FOiiu zR5KkYMZ5%Z*V+(XYNefqb%(G)0EDwipJ?!7`HdhJB4SOG)t$z|&Bn~h*so=gj3aku z5t>C9nF8doS#SPU7%9fl>ZvIp4kOcXN{o8jjnCUebU|hWzZt^M5jvNYVLUOecHc>PO~(QA|ej|EmBtZ#M59 z^S(d+^V4e_D~gRXr(rNp##0HHnd?huIj(u{wtM~@D`#w&awjLq2I4*b@F6;v#O=yq zG7!NeL=FJgJU7SsntS!Wdvd~^|H_*^1CuwM_!oh-JAK*v>2&9S7a!A9=$`J~#*T$^RRK_!Csn@v8Jc`g6r(=&}bPy9+nw==z&g&e)v1UG3A@a)0r z_;onJt5>LMNtg>7SC`$DOYY2hclsfj02ZFDURelTY?NA#j1I6wU+POwd{0wp;DMGi zl^PI%(cbAt?#vXNUPUK9T|C*iacqxdS)&P4ew|B!Oz+XMd-g`-!PUm`$3*6{uR$mF z%It1V&$?5W2)pBt-BZh9dboM4UR)p!m^{O*53jn{uY>IR()q^91;B)KT>i_!l_uI<&h5Db$WN7`*W>eWrn&6Z0DMt1GRlv{7&-@#sm3s}w z2zF!Srw3r!=s%T1Eq+T!lA?n}OjW8AUGYcS9FkP2)WpHKJlxp*a}b}KjwuhmQ=es##o2w{n*#A37aIr|I3qYkj$BQ?{fpy z*5+3S>P3F`%Q5)S9IF{{gXR@ovE^c14pYMgM#>2zk}0T4kxe)L@_#x7{TC72v1`Y^ z!rtBeJBJ3|Yav+x2mAh7=-<6-*Y^H>J9h6H%4d?PH57Yy@80*^IFmy`15>Kv(r};# zId>$(`UeMMZ=)F1oK8CAjdw^rrcbpNC-PcT^a@2+$!9Xv8&AN$Bt`KSoKD^Lb2Ydy zL9i7Aa#^%|GUl5>P3Ro9d_2gOWcT9+L#FTy; zVHM0xCfnHWFjo2 zLHkn25R5owN2QjVm}o_andOw_zAE-#gE`JZP|;9XvY<3F&zq8NNhQXX#EGn-q3s_+ z{ii(ot??u%I1c@G>~|5GlB%-w@@>3T!1d5)Czo2-IB%QwEkE9|;cghK zplo-pqzImTk5w>rdHtF-tkn1_BnnUSg1wU_&O_%m)Dg^)n8=Em@9e0YMS8Kl2FpI< zWDTatl4D|?%zb^G zGr!md4{Ug7=OpZY`(Z_4gX5OZ374H$u;Xa