From 8c5e1241cc8d2ae8d353fcabdc13481239211406 Mon Sep 17 00:00:00 2001 From: CI/CD Date: Wed, 2 Apr 2025 14:02:26 +0000 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=9B=B4=E6=96=B0=EF=BC=9A?= =?UTF-8?q?=E4=BB=8E=20list.yaml=20=E4=B8=8B=E8=BD=BD=E6=9C=80=E6=96=B0?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adguard/filter_1.txt | 101 +++++++++++++++++++++++++++++++++++--- docker/install/install.sh | 82 +++---------------------------- 2 files changed, 101 insertions(+), 82 deletions(-) diff --git a/adguard/filter_1.txt b/adguard/filter_1.txt index 8813412..5023bf2 100644 --- a/adguard/filter_1.txt +++ b/adguard/filter_1.txt @@ -1,12 +1,14 @@ ! ! Title: AdGuard DNS filter ! Description: List composed of several filters (AdGuard Base filter, Social Media filter, Tracking Protection filter, Mobile Ads filter, EasyList and EasyPrivacy) and simplified specifically to be better compatible with DNS-level ad blocking -! Version: 1.0.23.4 +! Version: 1.0.23.8 ! Homepage: https://github.com/AdguardTeam/AdguardSDNSFilter -! Last modified: 2025-04-01T12:12:17.924Z +! Last modified: 2025-04-02T12:11:37.750Z ! ! Compiled by @adguard/hostlist-compiler v1.0.35 ! +||booksylatron.com^ +||jouchithep.net^ ||mushlaregrass.com^ ||iawbcdohtprwaxg.com^ ||iiageq.com^ @@ -25,7 +27,6 @@ ||organicowner.com^ ||woeful-trash.pro^ ||dullequivalent.com^ -||travelpayouts.com^ ||red-swimming.com^ ||tds.favbet.partners^ ||pbl3citto.com^ @@ -2715,8 +2716,6 @@ ||d55875dd70.03db0d5d14.com^ ||d6b1635a92.829c4efedc.com^ ||df48924623.4e16b2e294.com^ -||dff4adcb3a.65a16dd098.com^ -||e0dc0c0e85.e8853962d1.com^ ||e2154c9ee1.87eb0a33a9.com^ ||e8a209dc96.ab0a4bc0ae.com^ ||ecd2f27cc8.d0056a5b0b.com^ @@ -5905,11 +5904,13 @@ vkcdnservice.appspot.com^ ||0127c96640.com^ ||01counter.com^ ||01jud3v55z.com^ +||0214217ebc.com^ ||023e6510cc.com^ ||0265331.com^ ||029519cbdc.com^ ||0342b40dd6.com^ ||03505ed0f4.com^ +||039858f297.com^ ||03b5f525af.com^ ||04-f-bmf.com^ ||044da016b3.com^ @@ -6438,6 +6439,7 @@ vkcdnservice.appspot.com^ ||63voy9ciyi14.com^ ||64580df84b.com^ ||6570131a3f.com^ +||65a16dd098.com^ ||65wenv5f.xyz^ ||6657e4f5c2.com^ ||666777888abc.com^ @@ -7687,6 +7689,7 @@ vkcdnservice.appspot.com^ ||ajestigie.com^ ||ajillionmax.com^ ||ajjawcxpao.com^ +||ajjcpertu.com^ ||ajjkmozrljer.top^ ||ajkzd9h.com^ ||ajoosheg.com^ @@ -9660,6 +9663,7 @@ vkcdnservice.appspot.com^ ||bogrodius.com^ ||bogus-disk.com^ ||bohkhufmvwim.online^ +||bohonef.com^ ||boilabsent.com^ ||boiledperseverance.com^ ||boilerefforlessefforlessregistered.com^ @@ -9668,27 +9672,35 @@ vkcdnservice.appspot.com^ ||bokeden.com^ ||boksaumetaixa.net^ ||boldboycott.com^ +||boldlydaisy.com^ ||boldscantyfrustrating.com^ ||boledrouth.top^ ||bollyocean.com^ ||boloheavity.shop^ ||boloptrex.com^ ||bolrookr.com^ +||bolsaifoony.com^ ||bolsek.ru^ ||boltepse.com^ ||bonad.io^ ||bonafides.club^ ||bondagecoexist.com^ ||bondfondif.com^ +||bondleapedoasis.com^ +||bonebrick.com^ +||bonecommittee.com^ ||bonepa.com^ ||bonertraffic13.info^ ||bonertraffic14.info^ +||bonesimprovements.com^ ||bonesinoffensivebook.com^ ||boneteunfixt.shop^ ||bongacams7.com^ +||bonnetacademy.com^ ||bonnetgoblet.com^ ||bonnetsgunks.shop^ ||bonnettaking.com^ +||bonosbevvy.com^ ||bonus-app.net^ ||bonusmaniac.com^ ||bonyspecialist.pro^ @@ -11742,6 +11754,7 @@ vkcdnservice.appspot.com^ ||cryptomcw.com^ ||cryptonewsdom.care^ ||cryptotyc.care^ +||cs15.biz^ ||cschyogh.com^ ||csdf4dn.pro^ ||cseuegsbjb.com^ @@ -11753,6 +11766,7 @@ vkcdnservice.appspot.com^ ||csqtsjm.com^ ||cssuvtbfeap.com^ ||csy8cjm7.xyz^ +||ct11.biz^ ||ctasnet.com^ ||ctcdwm.com^ ||cteakmwtivr.com^ @@ -11794,6 +11808,7 @@ vkcdnservice.appspot.com^ ||culptyjhitf.com^ ||cultergoy.com^ ||cumbersomeduty.pro^ +||cuozrjmevb.com^ ||cupboardbangingcaptain.com^ ||cupboardgold.com^ ||cupidirresolute.com^ @@ -12070,6 +12085,7 @@ vkcdnservice.appspot.com^ ||dazedarticulate.com^ ||dazedengage.com^ ||dazhantai.com^ +||db0a4b4eb7.com^ ||db33180b93.com^ ||db72c26349.com^ ||dbclix.com^ @@ -12555,6 +12571,7 @@ vkcdnservice.appspot.com^ ||discountstickersky.com^ ||discourseoxidizingtransfer.com^ ||discretionpollclassroom.com^ +||discriminationcleanliness.com^ ||discurehyrate.top^ ||discussedirrelevant.com^ ||discussedpliant.com^ @@ -12875,6 +12892,7 @@ vkcdnservice.appspot.com^ ||dqxifbm.com^ ||dr0.biz^ ||dr22.biz^ +||dr5.biz^ ||dr6.biz^ ||dr7.biz^ ||drabimprovement.com^ @@ -13114,6 +13132,7 @@ vkcdnservice.appspot.com^ ||e770af238b.com^ ||e7e34b16ed.com^ ||e8370630f3.com^ +||e8853962d1.com^ ||e9d13e3e01.com^ ||ea011c4ae4.com^ ||eabids.com^ @@ -13516,6 +13535,7 @@ vkcdnservice.appspot.com^ ||emxdgt.com^ ||enactdubcompetitive.com^ ||enacttournamentcute.com^ +||enalidjann.shop^ ||enamelcourage.com^ ||enamelhurdleunpaid.com^ ||encaseauditorycolourful.com^ @@ -14862,6 +14882,7 @@ vkcdnservice.appspot.com^ ||fulvideozrt.click^ ||fulylydevelopeds.com^ ||fumeuprising.com^ +||fumiercrapper.com^ ||fumtartujilse.net^ ||funappgames.com^ ||funbestgetjoobsli.org^ @@ -15477,6 +15498,7 @@ vkcdnservice.appspot.com^ ||gmaringpoliticism.org^ ||gme-trking.com^ ||gmehcotihh.com^ +||gmelinaseller.com^ ||gmgllod.com^ ||gmiqicw.com^ ||gmkflsdaa.com^ @@ -15896,6 +15918,7 @@ vkcdnservice.appspot.com^ ||guineaacrewayfarer.com^ ||guineashock.top^ ||gukmodukuleqasfo.com^ +||gukmodukuleqasfors.org^ ||gukrathokeewhi.net^ ||gulfyteases.shop^ ||gullible-lawyer.pro^ @@ -15922,6 +15945,7 @@ vkcdnservice.appspot.com^ ||gutwn.info^ ||guvmcalwio.com^ ||guvmmaolnk.com^ +||guvnumnm.com^ ||guvsxiex.xyz^ ||guvwolr.com^ ||guxidrookr.com^ @@ -16592,6 +16616,7 @@ vkcdnservice.appspot.com^ ||horrifiedloudly.com^ ||hortestoz.com^ ||hortitedigress.com^ +||hoselsvirelai.com^ ||hosieryplum.com^ ||hosierypressed.com^ ||hospitalsky.online^ @@ -16812,6 +16837,7 @@ vkcdnservice.appspot.com^ ||i8xkjci7nd.com^ ||i99i.org^ ||ia4d7tn68.com^ +||iacasjezogonf.online^ ||iaculturerpartment.org^ ||iaisvasxruxqv.life^ ||ianik.xyz^ @@ -16980,6 +17006,7 @@ vkcdnservice.appspot.com^ ||ilxhsgd.com^ ||ilyf4amifh.com^ ||imageadvantage.net^ +||imagerystirrer.com^ ||imagiflex.com^ ||imaginableblushsensor.com^ ||imaginableexecutedmedal.com^ @@ -17582,6 +17609,7 @@ vkcdnservice.appspot.com^ ||jacwkbauzs.com^ ||jadcenter.com^ ||jaded-spell.pro^ +||jads.cc^ ||jads.co^ ||jaggedshoebruised.com^ ||jaggedunaccustomeddime.com^ @@ -17602,6 +17630,7 @@ vkcdnservice.appspot.com^ ||januaryprinter.com^ ||japanbros.com^ ||japegr.click^ +||japmmexucca.com^ ||japootchust.net^ ||japw.cloud^ ||jaqxaqoxwhce.com^ @@ -17968,6 +17997,7 @@ vkcdnservice.appspot.com^ ||jwalkin.com^ ||jwamnd.com^ ||jwmdjeyfpffiyve.xyz^ +||jwnmnnwjaezyw.top^ ||jwympcc.com^ ||jxldpjxcp.com^ ||jxxnnhdgbfo.xyz^ @@ -18062,10 +18092,12 @@ vkcdnservice.appspot.com^ ||kbarrmlrtfnwl.xyz^ ||kbbwgbqmu.xyz^ ||kbjn-sibltg.icu^ +||kbkewkqrkqkzy.top^ ||kbmogfciwnxw.xyz^ ||kbnmnl.com^ ||kbnujcqx.xyz^ ||kbqihabjlufvf.club^ +||kbqqavwjqemea.top^ ||kbugxeslbjc8.com^ ||kcaactpkyp.com^ ||kcdn.xyz^ @@ -18207,6 +18239,7 @@ vkcdnservice.appspot.com^ ||kityour.com^ ||kiwhopoardeg.net^ ||kixestalsie.net^ +||kiyala.uno^ ||kiynew.com^ ||kizohilsoa.net^ ||kjebrhygakkbehl.com^ @@ -18535,6 +18568,7 @@ vkcdnservice.appspot.com^ ||laptweakbriefly.com^ ||lapypushistyye.com^ ||laquearhokan.com^ +||laqwnrajqknwe.top^ ||larchesrotates.com^ ||lardapplications.com^ ||lardpersecuteunskilled.com^ @@ -20494,6 +20528,7 @@ vkcdnservice.appspot.com^ ||nachodusking.com^ ||nacontent.pro^ ||nadajotum.com^ +||nadese.xyz^ ||nadruphoordy.xyz^ ||nads.io^ ||naehqgcanrh.xyz^ @@ -20535,6 +20570,7 @@ vkcdnservice.appspot.com^ ||nannyirrationalacquainted.com^ ||naos.ink^ ||napainsi.net^ +||naplpzlrgslcwj.com^ ||narenrosrow.com^ ||narkalignevil.com^ ||narrucp.com^ @@ -20654,6 +20690,7 @@ vkcdnservice.appspot.com^ ||neewouwoafisha.net^ ||neezausu.net^ ||nefdcnmvbt.com^ +||negatebogfern.com^ ||negationomitor.com^ ||neglectblessing.com^ ||negligentpatentrefine.com^ @@ -20663,6 +20700,7 @@ vkcdnservice.appspot.com^ ||neigh11.xyz^ ||neighrewarn.click^ ||neitherpennylack.com^ +||neladyhe.com^ ||nelhon.com^ ||nellads.com^ ||nellmeeten.com^ @@ -21348,6 +21386,7 @@ vkcdnservice.appspot.com^ ||odpgponumrw.com^ ||odqciqdazjuk.com^ ||odvrjedubvedqs.com^ +||oebxwlmq.com^ ||oedipalchuppah.shop^ ||oehgk.com^ ||oelwojattkd.xyz^ @@ -21358,6 +21397,7 @@ vkcdnservice.appspot.com^ ||ofbrtaod.com^ ||ofcamerupta.com^ ||ofclaydolr.com^ +||ofcuboneom.com^ ||ofdanpozlgha.com^ ||ofdittor.com^ ||ofdomjzpix.com^ @@ -21551,6 +21591,7 @@ vkcdnservice.appspot.com^ ||omjqukadtolg.com^ ||omnatuor.com^ ||omni-ads.com^ +||omnibuswaist.com^ ||omnitagjs.com^ ||omoevcozeezhg.one^ ||omoonsih.net^ @@ -21948,6 +21989,7 @@ vkcdnservice.appspot.com^ ||oupheerdodoomt.net^ ||ouphouch.com^ ||oupusoma.net^ +||ourdeeheeje.com^ ||ourdreamsanswer.info^ ||ourl.link^ ||ourscience.info^ @@ -22429,6 +22471,7 @@ vkcdnservice.appspot.com^ ||pectasefrisker.com^ ||pectosealvia.click^ ||pedangaishons.com^ +||pedarypignon.com^ ||pedeticinnet.com^ ||peechohovaz.xyz^ ||peejoopsajou.net^ @@ -22543,6 +22586,7 @@ vkcdnservice.appspot.com^ ||persona3.tech^ ||personalityhamlet.com^ ||personantaeus.top^ +||personaserver.com^ ||perspectiveunderstandingslammed.com^ ||persuadecowardenviable.com^ ||persuadepointed.com^ @@ -22707,6 +22751,7 @@ vkcdnservice.appspot.com^ ||physicaldetermine.com^ ||physicaldividedcharter.com^ ||physicallyshillingattentions.com^ +||physidpraxes.com^ ||physidstert.shop^ ||phywifupta.com^ ||piaroankenyte.store^ @@ -22753,6 +22798,7 @@ vkcdnservice.appspot.com^ ||piloteegazy.com^ ||pilotnourishmentlifetime.com^ ||pilsarde.net^ +||pimplyhauling.com^ ||pinaffectionatelyaborigines.com^ ||pincersnap.com^ ||pineappleconsideringpreference.com^ @@ -22983,6 +23029,7 @@ vkcdnservice.appspot.com^ ||podleysensing.shop^ ||podosupsurge.com^ ||podsolnu9hi10.com^ +||podzolstrabes.com^ ||poemblotrating.com^ ||poemsbedevil.com^ ||poemswrestlingstrategy.com^ @@ -23350,6 +23397,7 @@ vkcdnservice.appspot.com^ ||privilegest.com^ ||prizefrenzy.top^ ||prizegrantedrevision.com^ +||prizeking.pro^ ||prizel.com^ ||prksism.com^ ||prmtracking3.com^ @@ -23598,6 +23646,7 @@ vkcdnservice.appspot.com^ ||psubaghardo.net^ ||psuftoum.com^ ||psumainy.xyz^ +||psumpupsauket.com^ ||psunseewhu.com^ ||psuphuns.net^ ||psurdoak.com^ @@ -23988,6 +24037,7 @@ vkcdnservice.appspot.com^ ||qibqiwczoojw.com^ ||qidmhohammat.com^ ||qidnujocmf.com^ +||qijpoaplprskvo.com^ ||qimnubohcapb.com^ ||qingolor.com^ ||qinvaris.com^ @@ -24151,6 +24201,7 @@ vkcdnservice.appspot.com^ ||qwjxcvdzrafum.club^ ||qwkrmrnlxl.xyz^ ||qwoyfys.com^ +||qwpenncp.com^ ||qwpsgqyzrzcr.life^ ||qwrwhosailedbe.info^ ||qwtag.com^ @@ -24391,6 +24442,7 @@ vkcdnservice.appspot.com^ ||reasoninstruct.com^ ||reassurehintholding.com^ ||reate.info^ +||reatushaithal.com^ ||reauksoffyrikm.com^ ||rebelhaggard.com^ ||rebellionnaturalconsonant.com^ @@ -24685,6 +24737,7 @@ vkcdnservice.appspot.com^ ||rerosefarts.com^ ||rertessesse.xyz^ ||resalag.com^ +||resalespursuit.com^ ||rescueaccredited.com^ ||rescueambassadorupward.com^ ||researchingdestroy.com^ @@ -24955,6 +25008,7 @@ vkcdnservice.appspot.com^ ||rjowzlkaz.today^ ||rjw4obbw.com^ ||rjwwqkrmyvlqy.top^ +||rjxphruqiu.com^ ||rjzbvmbybvrjy.top^ ||rkapghq.com^ ||rkatamonju.info^ @@ -25338,6 +25392,9 @@ vkcdnservice.appspot.com^ ||s-adzone.com^ ||s0-greate.net^ ||s0cool.net^ +||s17a.biz^ +||s18a.biz^ +||s19a.biz^ ||s1cta.com^ ||s1m4nohq.de^ ||s1t2uuenhsfs.com^ @@ -25709,6 +25766,7 @@ vkcdnservice.appspot.com^ ||seekmymatch.com^ ||seekoflol.com^ ||seelanaglashaiy.xyz^ +||seelsyren.com^ ||seemaicees.xyz^ ||seemethepointa.org^ ||seemingverticallyheartbreak.com^ @@ -26499,6 +26557,7 @@ vkcdnservice.appspot.com^ ||soldierreproduceadmiration.com^ ||soldiershocking.com^ ||solelyguids.top^ +||solerasignori.com^ ||solethreat.com^ ||soliads.io^ ||soliads.net^ @@ -26569,6 +26628,7 @@ vkcdnservice.appspot.com^ ||sothiacalain.com^ ||soufflefuji.shop^ ||soughtflaredeeper.com^ +||souloomunie.com^ ||soulslaidmale.com^ ||soumaphesurvey.space^ ||soumehoo.net^ @@ -27748,6 +27808,7 @@ vkcdnservice.appspot.com^ ||thawpublicationplunged.com^ ||thduyzmbtrb.com^ ||thdwaterverya.info^ +||the-myscontactonlines.com^ ||the-ozone-project.com^ ||thead.cat^ ||theadgateway.com^ @@ -28568,6 +28629,7 @@ vkcdnservice.appspot.com^ ||tuffoonincaged.com^ ||tuftoawoo.xyz^ ||tugraughilr.xyz^ +||tuitivegaff.com^ ||tujourda.net^ ||tulclqxikva.icu^ ||tulipmagazinesempire.com^ @@ -28844,6 +28906,7 @@ vkcdnservice.appspot.com^ ||umwoibvsbnhrh.xyz^ ||unacceptableperfection.com^ ||unaces.com^ +||unactkiosk.com^ ||unamplespalax.com^ ||unanimousbrashtrauma.com^ ||unarbokor.com^ @@ -28885,6 +28948,7 @@ vkcdnservice.appspot.com^ ||undercovercinnamonluxury.com^ ||undercoverwaterfront.com^ ||underdog.media^ +||undergodoublycongruous.com^ ||undergoneentitled.com^ ||undergroundbrows.com^ ||underminesprout.com^ @@ -29118,6 +29182,7 @@ vkcdnservice.appspot.com^ ||uruftio.com^ ||uruswan.com^ ||urvgwij.com^ +||us01.biz^ ||us4post.com^ ||usaballs.fun^ ||usainoad.net^ @@ -29133,13 +29198,18 @@ vkcdnservice.appspot.com^ ||usersmorrow.com^ ||usertag.online^ ||ushoofop.com^ +||ushubemeet.net^ +||usinesmycete.info^ ||usingageghoaft.net^ ||usingantecedent.com^ +||usisedprivatedqua.org^ ||usix-udlnseb.space^ ||usjbwvtqwv.com^ +||uskokvolutin.com^ ||usounoul.com^ ||ust-ad.com^ ||usuallyaltered.com^ +||usuallyformal.com^ ||usuaryyappish.com^ ||usurv.com^ ||uswardwot.com^ @@ -29173,6 +29243,7 @@ vkcdnservice.appspot.com^ ||uuidksinc.net^ ||uuisnvtqtuc.com^ ||uujtmrxf.xyz^ +||uuodktlatjmkfq.com^ ||uurhhtymipx.com^ ||uuyhonsdpa.com^ ||uvphvlgtqjye.com^ @@ -29298,6 +29369,7 @@ vkcdnservice.appspot.com^ ||vatcertaininject.com^ ||vaticmons.digital^ ||vaufekonaub.net^ +||vauglistesou.net^ ||vaugroar.com^ ||vaukoloon.net^ ||vauloops.net^ @@ -29392,6 +29464,7 @@ vkcdnservice.appspot.com^ ||venulaeriggite.com^ ||venusfritter.com^ ||verbdruggedcommiserate.com^ +||verbsponsor.com^ ||verbwarilyclotted.com^ ||verchokberain.top^ ||verda-mun.com^ @@ -29594,6 +29667,7 @@ vkcdnservice.appspot.com^ ||viurl.fun^ ||vivaxhouvari.shop^ ||viwjsp.info^ +||vizierspavan.com^ ||vizoalygrenn.com^ ||vizoredcheerly.com^ ||vjdciu.com^ @@ -31015,6 +31089,7 @@ vkcdnservice.appspot.com^ ||yorkvillemarketing.net^ ||yoshatia.com^ ||yottacash.com^ +||youdatlng.com^ ||youdguide.com^ ||youlamedia.com^ ||youlouk.com^ @@ -31026,11 +31101,13 @@ vkcdnservice.appspot.com^ ||your-notice.com^ ||youradexchange.com^ ||yourbestperfectdates.life^ +||yourcdnjs.com^ ||yourchain.info^ ||yourjsdelivery.com^ ||yourluckydates.com^ ||yourprivacy.icu^ ||yourquickads.com^ +||yourseismo.top^ ||youruntie.com^ ||yourwebbars.com^ ||youservit.com^ @@ -31083,6 +31160,7 @@ vkcdnservice.appspot.com^ ||yuruknalyticafr.com^ ||yusiswensaidoh.info^ ||yuuchxfuutmdyyd.xyz^ +||yvdxhbuupndqo.love^ ||yvmads.com^ ||yvnjriyaqnt.com^ ||yvoria.com^ @@ -31364,6 +31442,7 @@ vkcdnservice.appspot.com^ ||zyblzreyykzme.top^ ||zybrdr.com^ ||zyf03k.xyz^ +||zygoticroud.shop^ ||zyiis.net^ ||zykkjyaokkjlo.top^ ||zylytavo.com^ @@ -34674,6 +34753,7 @@ vkcdnservice.appspot.com^ ||deapi.sooplive.co.kr^ ||startup.mobile.yandex.net^ ||startup-mobile.ap.yandex-net.ru^ +||lgvlbd.icu^ ||crossadsapi.ecomobileapp.com^ ||service-ad-image-ga.prd.pluto.tv^ ||pavoshare.com @@ -35372,6 +35452,7 @@ vkcdnservice.appspot.com^ ||ib.snssdk.com^ ||xlog.snssdk.com^ ||log.snssdk.com^ +||pixel.wetracked.io^ ||api-pixels.easyadsapp.com^ ||sayac.net.tr^ ||zineone.com^ @@ -89869,7 +89950,6 @@ inapps.appsflyersdk.com^ ||bc-news.net^ ||cnb.cnews.ru^ ||api-fangarma.utyug.media^ -||dr5.biz^ ||kasfas.com^ ||abqjst.com^ ||adwist.ru^ @@ -95250,6 +95330,7 @@ inapps.appsflyersdk.com^ ||clubleadershipsolutions.com^ ||clzl.pro^ ||cmvietcombank.com^ +||cn.hothue.top^ ||cnaptheaz.com^ ||cnvietcombank.com^ ||codb2b.shop^ @@ -99016,6 +99097,7 @@ inapps.appsflyersdk.com^ ||vn-vongquaylol.cf^ ||vn-vp.xyz^ ||vn.btaynguyenfood.com^ +||vn.hothue.top^ ||vn.vnhao123.xyz^ ||vn11268shp.com^ ||vn11568p.com^ @@ -99409,11 +99491,18 @@ inapps.appsflyersdk.com^ ||51tongji.trafficmanager.net^ ||67.21.92.*.gif ||cnzz.trafficmanager.net^ +||dhorzivnn.com^ +||nrlupu.top^ +||biabfqq.icu^ +||chitshuqh.com^ +||oieo.cn^ ||caxhuuzto.com^ ||so04010koaq.com^ ||lsjarh.top^ ||duyhlct.icu^ ||wqrv.cn^ +||dephriezm.com^ +||uu09cjylmzsym.top^ ||yasorlbeu.com^ ||jtdltu.top^ ||xsti.cn^ diff --git a/docker/install/install.sh b/docker/install/install.sh index 3219205..3fb0d1f 100644 --- a/docker/install/install.sh +++ b/docker/install/install.sh @@ -554,6 +554,10 @@ do_install() { exit 0 ;; centos|fedora|rhel) + if [ "$(uname -m)" = "s390x" ]; then + echo "Effective v27.5, please consult RHEL distro statement for s390x support." + exit 1 + fi repo_file_url="$DOWNLOAD_URL/linux/$lsb_dist/$REPO_FILE" ( if ! is_dry_run; then @@ -652,82 +656,8 @@ do_install() { exit 0 ;; sles) - if [ "$(uname -m)" != "s390x" ]; then - echo "Packages for SLES are currently only available for s390x" - exit 1 - fi - repo_file_url="$DOWNLOAD_URL/linux/$lsb_dist/$REPO_FILE" - pre_reqs="ca-certificates curl libseccomp2 awk" - ( - if ! is_dry_run; then - set -x - fi - $sh_c "zypper install -y $pre_reqs" - $sh_c "rm -f /etc/zypp/repos.d/docker-ce-*.repo" - $sh_c "zypper addrepo $repo_file_url" - - opensuse_factory_url="https://download.opensuse.org/repositories/security:/SELinux/openSUSE_Factory/" - if ! zypper lr -d | grep -q "${opensuse_factory_url}"; then - opensuse_repo="${opensuse_factory_url}security:SELinux.repo" - if ! is_dry_run; then - cat >&2 <<- EOF - WARNING!! - openSUSE repository ($opensuse_repo) will be enabled now. - Do you wish to continue? - You may press Ctrl+C now to abort this script. - EOF - ( set -x; sleep 20 ) - fi - $sh_c "zypper addrepo $opensuse_repo" - fi - $sh_c "zypper --gpg-auto-import-keys refresh" - $sh_c "zypper lr -d" - ) - pkg_version="" - if [ -n "$VERSION" ]; then - if is_dry_run; then - echo "# WARNING: VERSION pinning is not supported in DRY_RUN" - else - pkg_pattern="$(echo "$VERSION" | sed 's/-ce-/\\\\.ce.*/g' | sed 's/-/.*/g')" - search_command="zypper search -s --match-exact 'docker-ce' | grep '$pkg_pattern' | tail -1 | awk '{print \$6}'" - pkg_version="$($sh_c "$search_command")" - echo "INFO: Searching repository for VERSION '$VERSION'" - echo "INFO: $search_command" - if [ -z "$pkg_version" ]; then - echo - echo "ERROR: '$VERSION' not found amongst zypper list results" - echo - exit 1 - fi - search_command="zypper search -s --match-exact 'docker-ce-cli' | grep '$pkg_pattern' | tail -1 | awk '{print \$6}'" - # It's okay for cli_pkg_version to be blank, since older versions don't support a cli package - cli_pkg_version="$($sh_c "$search_command")" - pkg_version="-$pkg_version" - fi - fi - ( - pkgs="docker-ce$pkg_version" - if version_gte "18.09"; then - if [ -n "$cli_pkg_version" ]; then - # older versions didn't ship the cli and containerd as separate packages - pkgs="$pkgs docker-ce-cli-$cli_pkg_version containerd.io" - else - pkgs="$pkgs docker-ce-cli containerd.io" - fi - fi - if version_gte "20.10"; then - pkgs="$pkgs docker-compose-plugin docker-ce-rootless-extras$pkg_version" - fi - if version_gte "23.0"; then - pkgs="$pkgs docker-buildx-plugin" - fi - if ! is_dry_run; then - set -x - fi - $sh_c "zypper -q install -y $pkgs" - ) - echo_docker_as_nonroot - exit 0 + echo "Effective v27.5, please consult SLES distro statement for s390x support." + exit 1 ;; *) if [ -z "$lsb_dist" ]; then