diff --git a/client/src/__locales/tr.json b/client/src/__locales/tr.json index 72acb887ba1..d4e3b1727f6 100644 --- a/client/src/__locales/tr.json +++ b/client/src/__locales/tr.json @@ -449,7 +449,7 @@ "access_disallowed_title": "İzin verilmeyen istemciler", "access_disallowed_desc": "CIDR'lerin, IP adreslerinin veya İstemci Kimliklerin listesi. Bu listede girişler varsa, AdGuard Home bu istemcilerden gelen istekleri keser. İzin verilen istemcilerde girişler varsa, bu alan yok sayılır.", "access_blocked_title": "İzin verilmeyen alan adları", - "access_blocked_desc": "Bu işlem filtrelerle ilgili değildir. AdGuard Home, bu alan adlarından gelen DNS sorgularını yanıtsız bırakır ve bu sorgular sorgu günlüğünde görünmez. Tam alan adlarını, joker karakterleri veya URL filtre kurallarını belirtebilirsiniz, ör. \"example.org\", \"*.example.org\" veya \"||example.org^\".", + "access_blocked_desc": "Bu işlem filtrelerle ilgili değildir. AdGuard Home, bu alan adlarından gelen DNS sorgularını yanıtsız bırakır ve bu sorgular sorgu günlüğünde görünmez. Tam alan adlarını, joker karakterleri veya URL filtre kurallarını belirtebilirsiniz, örn. \"example.org\", \"*.example.org\" veya \"||example.org^\".", "access_settings_saved": "Erişim ayarları başarıyla kaydedildi!", "updates_checked": "AdGuard Home'un yeni bir sürümü mevcut", "updates_version_equal": "AdGuard Home yazılımı güncel durumda", diff --git a/client/src/__locales/zh-cn.json b/client/src/__locales/zh-cn.json index 27d2fcbdc41..3d417844208 100644 --- a/client/src/__locales/zh-cn.json +++ b/client/src/__locales/zh-cn.json @@ -172,7 +172,7 @@ "list_url_table_header": "清单网址", "rules_count_table_header": "规则数", "last_time_updated_table_header": "上次更新时间", - "actions_table_header": "活跃状态", + "actions_table_header": "操作", "request_table_header": "请求", "edit_table_action": "编辑", "delete_table_action": "删除", diff --git a/client/src/helpers/filters/filters.js b/client/src/helpers/filters/filters.js index 6f4af9e50dc..5ace4d7ce56 100644 --- a/client/src/helpers/filters/filters.js +++ b/client/src/helpers/filters/filters.js @@ -101,7 +101,7 @@ export default { "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_13.txt" }, "POL_polish_filters_for_pi_hole": { - "name": "POL: Polish filters for Pi hole", + "name": "POL: Polish filters for Pi-hole", "categoryId": "regional", "homepage": "https://www.certyficate.it/", "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_14.txt" diff --git a/client/src/helpers/trackers/trackers.json b/client/src/helpers/trackers/trackers.json index 485b759ece9..17a870e9207 100644 --- a/client/src/helpers/trackers/trackers.json +++ b/client/src/helpers/trackers/trackers.json @@ -1,5 +1,5 @@ { - "timeUpdated": "2023-02-09T12:31:34.007Z", + "timeUpdated": "2023-02-21T12:46:33.324Z", "categories": { "0": "audio_video_player", "1": "comments", @@ -6772,55 +6772,64 @@ "name": "Facebook", "categoryId": 4, "url": "https://www.facebook.com", - "companyId": "facebook" + "companyId": "meta", + "source": "AdGuard" }, "facebook_beacon": { "name": "Facebook Beacon", "categoryId": 7, "url": "http://www.facebook.com/beacon/faq.php", - "companyId": "facebook" + "companyId": "meta", + "source": "AdGuard" }, "facebook_cdn": { "name": "Facebook CDN", "categoryId": 9, "url": "https://www.facebook.com", - "companyId": "facebook" + "companyId": "meta", + "source": "AdGuard" }, "facebook_connect": { "name": "Facebook Connect", "categoryId": 6, "url": "https://developers.facebook.com/connect.php", - "companyId": "facebook" + "companyId": "meta", + "source": "AdGuard" }, "facebook_conversion_tracking": { "name": "Facebook Conversion Tracking", "categoryId": 4, "url": "http://www.facebook.com/", - "companyId": "facebook" + "companyId": "meta", + "source": "AdGuard" }, "facebook_custom_audience": { "name": "Facebook Custom Audience", "categoryId": 4, "url": "https://www.facebook.com", - "companyId": "facebook" + "companyId": "meta", + "source": "AdGuard" }, "facebook_graph": { "name": "Facebook Social Graph", "categoryId": 7, "url": "https://developers.facebook.com/docs/reference/api/", - "companyId": "facebook" + "companyId": "meta", + "source": "AdGuard" }, "facebook_impressions": { "name": "Facebook Impressions", "categoryId": 4, "url": "https://www.facebook.com/", - "companyId": "facebook" + "companyId": "meta", + "source": "AdGuard" }, "facebook_social_plugins": { "name": "Facebook Social Plugins", "categoryId": 7, "url": "https://developers.facebook.com/plugins", - "companyId": "facebook" + "companyId": "meta", + "source": "AdGuard" }, "facetz.dca": { "name": "Facetz.DCA", @@ -8909,7 +8918,8 @@ "name": "Instagram", "categoryId": 8, "url": "https://www.facebook.com/", - "companyId": "facebook" + "companyId": "meta", + "source": "AdGuard" }, "instant_check_mate": { "name": "Instant Check Mate", @@ -19240,7 +19250,7 @@ "name": "Facebook Audience Network", "categoryId": 4, "url": "https://www.facebook.com/business/products/audience-network", - "companyId": "facebook", + "companyId": "meta", "source": "AdGuard" }, "crashlytics": { @@ -19264,6 +19274,13 @@ "companyId": null, "source": "AdGuard" }, + "gmail": { + "name": "Gmail", + "categoryId": 13, + "url": "https://mail.google.com/", + "companyId": "google", + "source": "AdGuard" + }, "google_trust_services": { "name": "Google Trust Services", "categoryId": 5, @@ -19292,6 +19309,20 @@ "companyId": "branch_metrics_inc", "source": "AdGuard" }, + "telstra": { + "name": "Telstra", + "categoryId": 8, + "url": "https://www.telstra.com.au/", + "companyId": "telstra", + "source": "AdGuard" + }, + "medialab": { + "name": "MediaLab.AI Inc.", + "categoryId": 8, + "url": "https://medialab.la/", + "companyId": "medialab", + "source": "AdGuard" + }, "qualcomm": { "name": "Qualcomm", "categoryId": 8, @@ -19306,6 +19337,13 @@ "companyId": "solaredge", "source": "AdGuard" }, + "sectigo": { + "name": "Sectigo Limited", + "categoryId": 5, + "url": "https://www.solaredge.com/", + "companyId": "sectigo", + "source": "AdGuard" + }, "element": { "name": "Element", "categoryId": 7, @@ -19313,6 +19351,20 @@ "companyId": "element", "source": "AdGuard" }, + "oztam": { + "name": "OzTAM", + "categoryId": 8, + "url": "https://oztam.com.au/", + "companyId": "oztam", + "source": "AdGuard" + }, + "oppo": { + "name": "OPPO", + "categoryId": 101, + "url": "https://www.oppo.com/", + "companyId": "oppo", + "source": "AdGuard" + }, "outlook": { "name": "Microsoft Outlook", "categoryId": 13, @@ -19355,6 +19407,13 @@ "companyId": "lets_encrypt", "source": "AdGuard" }, + "kik": { + "name": "Kik", + "categoryId": 7, + "url": "https://kik.com/", + "companyId": "kik", + "source": "AdGuard" + }, "plex": { "name": "Plex", "categoryId": 0, @@ -19368,6 +19427,34 @@ "url": "https://matrix.org/", "companyId": "matrix", "source": "AdGuard" + }, + "ntppool": { + "name": "Network Time Protocol", + "categoryId": 5, + "url": "https://ntp.org/", + "companyId": "ntppool", + "source": "AdGuard" + }, + "whatsapp": { + "name": "WhatsApp", + "categoryId": 8, + "url": "https://www.whatsapp.com/", + "companyId": "meta", + "source": "AdGuard" + }, + "vscode": { + "name": "Visual Studio Code", + "categoryId": 8, + "url": "https://code.visualstudio.com/", + "companyId": "microsoft", + "source": "AdGuard" + }, + "msedge": { + "name": "Microsoft Edge", + "categoryId": 8, + "url": "https://www.microsoft.com/en-us/edge", + "companyId": "microsoft", + "source": "AdGuard" } }, "trackerDomains": { @@ -23698,10 +23785,24 @@ "zwaar.net": "zwaar", "zwaar.org": "zwaar", "extend.tv": "zypmedia", + "whatsapp.net": "whatsapp", + "whatsapp.com": "whatsapp", + "telstra.com.au": "telstra", + "telstra.com": "telstra", "slack.com": "slack", "slackb.com": "slack", "slack-edge.com": "slack", "slack-imgs.com": "slack", + "addlive.io": "snap", + "feelinsonice.com": "snap", + "sc-cdn.net": "snap", + "sc-corp.net": "snap", + "sc-gw.com": "snap", + "sc-jpl.com": "snap", + "sc-prod.net": "snap", + "snap-dev.net": "snap", + "snapads.com": "snap", + "snapkit.com": "snap", "adguard.app": "adguard", "adguard.io": "adguard", "adguard.org": "adguard", @@ -23710,41 +23811,80 @@ "adguard-vpn.com": "adguard", "adguardvpn.com": "adguard", "adguard-vpn.online": "adguard", + "oppomobile.com": "oppo", + "heytapmobi.com": "oppo", + "heytapmobile.com": "oppo", + "heytapdl.com": "oppo", + "allawnos.com": "oppo", + "allawntech.com": "oppo", "nflximg.com": "netflix", "element.io": "element", "riot.im": "element", + "gvt1.com": "google_servers", + "gvt2.com": "google_servers", + "gvt3.com": "google_servers", "akadns.net": "akamai_technologies", "akamaiedge.net": "akamai_technologies", + "akaquill.net": "akamai_technologies", + "me.com": "apple", "apple.news": "apple", "apple-dns.net": "apple", "aaplimg.com": "apple", "icloud.com": "apple", + "itunes.com": "apple", "icloud-content.com": "apple", + "kik.com": "kik", + "apikik.com": "kik", + "kik-live.com": "kik", "mzstatic.com": "apple", + "cdn-apple.com": "apple", + "apple-mapkit.com": "apple", + "icons.axm-usercontent-apple.com": "apple", + "apple-cloudkit.com": "apple", + "apzones.com": "apple", + "apple-livephotoskit.com": "apple", + "safebrowsing.apple": "apple", + "safebrowsing.g.applimg.com": "apple", "matrix.org": "matrix", - "l-msedge.net": "microsoft", + "medialab.la": "medialab", + "media-lab.ai": "medialab", + "phicdn.net": "digicert_trust_seal", + "e-msedge.net": "msedge", + "l-msedge.net": "msedge", + "exp-tas.com": "vscode", + "vscode-unpkg.net": "vscode", + "v0cdn.net": "vscode", + "vscode-cdn.net": "vscode", "iadsdk.apple.com": "apple_ads", "showrss.info": "showrss", + "sectigo.com": "sectigo", "solaredge.com": "solaredge", "crashlytics.com": "crashlytics", + "cloudflare-dns.com": "cloudflare", "flurry.com": "flurry", "hockeyapp.net": "hockeyapp", "app-measurement.com": "firebase", "appmetrica.yandex.com": "yandex_appmetrica", "letsencrypt.org": "lets_encrypt", "lencr.org": "lets_encrypt", + "oztam.com.au": "oztam", "mobileapptracking.com": "branch", + "ntp.org": "ntppool", + "ntppool.org": "ntppool", "plex.tv": "plex", "plex.direct": "plex", "edgecastcdn.net": "markmonitor", "appcenter.ms": "appcenter", "unityads.unity3d.com": "unity_ads", + "usertrust.com": "trustlogo", "azure.com": "azure", "trafficmanager.net": "azure", "hotmail.com": "outlook", + "outlook.com": "outlook", "bttn.io": "button", "pki.goog": "google_trust_services", "xtracloud.net": "qualcomm", - "qualcomm.com": "qualcomm" + "qualcomm.com": "qualcomm", + "gmail.com": "gmail" } } \ No newline at end of file diff --git a/go.mod b/go.mod index 6c2f1dad263..39e40a4c544 100644 --- a/go.mod +++ b/go.mod @@ -51,16 +51,16 @@ require ( github.com/josharian/native v1.1.0 // indirect github.com/mdlayher/packet v1.1.1 // indirect github.com/mdlayher/socket v0.4.0 // indirect - github.com/onsi/ginkgo/v2 v2.8.1 // indirect + github.com/onsi/ginkgo/v2 v2.8.3 // indirect github.com/patrickmn/go-cache v2.1.0+incompatible // indirect github.com/pierrec/lz4/v4 v4.1.17 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/quic-go/qpack v0.4.0 // indirect github.com/quic-go/qtls-go1-18 v0.2.0 // indirect - github.com/quic-go/qtls-go1-19 v0.2.0 // indirect - github.com/quic-go/qtls-go1-20 v0.1.0 // indirect - github.com/u-root/uio v0.0.0-20230215032506-9aa6f7e2d72c // indirect + github.com/quic-go/qtls-go1-19 v0.2.1 // indirect + github.com/quic-go/qtls-go1-20 v0.1.1 // indirect + github.com/u-root/uio v0.0.0-20230220225925-ffce2a382923 // indirect golang.org/x/mod v0.8.0 // indirect golang.org/x/sync v0.1.0 // indirect golang.org/x/text v0.7.0 // indirect diff --git a/go.sum b/go.sum index 346caa8d6fd..8060927f2ac 100644 --- a/go.sum +++ b/go.sum @@ -108,9 +108,9 @@ github.com/miekg/dns v1.1.50 h1:DQUfb9uc6smULcREF09Uc+/Gd46YWqJd5DbpPE9xkcA= github.com/miekg/dns v1.1.50/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7XnME= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= -github.com/onsi/ginkgo/v2 v2.8.1 h1:xFTEVwOFa1D/Ty24Ws1npBWkDYEV9BqZrsDxVrVkrrU= -github.com/onsi/ginkgo/v2 v2.8.1/go.mod h1:N1/NbDngAFcSLdyZ+/aYTYGSlq9qMCS/cNKGJjy+csc= -github.com/onsi/gomega v1.26.0 h1:03cDLK28U6hWvCAns6NeydX3zIm4SF3ci69ulidS32Q= +github.com/onsi/ginkgo/v2 v2.8.3 h1:RpbK1G8nWPNaCVFBWsOGnEQQGgASi6b8fxcWBvDYjxQ= +github.com/onsi/ginkgo/v2 v2.8.3/go.mod h1:6OaUA8BCi0aZfmzYT/q9AacwTzDpNbxILUT+TlBq6MY= +github.com/onsi/gomega v1.27.0 h1:QLidEla4bXUuZVFa4KX6JHCsuGgbi85LC/pCHrt/O08= github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc= github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= github.com/pierrec/lz4/v4 v4.1.14/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= @@ -125,10 +125,10 @@ github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo= github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A= github.com/quic-go/qtls-go1-18 v0.2.0 h1:5ViXqBZ90wpUcZS0ge79rf029yx0dYB0McyPJwqqj7U= github.com/quic-go/qtls-go1-18 v0.2.0/go.mod h1:moGulGHK7o6O8lSPSZNoOwcLvJKJ85vVNc7oJFD65bc= -github.com/quic-go/qtls-go1-19 v0.2.0 h1:Cvn2WdhyViFUHoOqK52i51k4nDX8EwIh5VJiVM4nttk= -github.com/quic-go/qtls-go1-19 v0.2.0/go.mod h1:ySOI96ew8lnoKPtSqx2BlI5wCpUVPT05RMAlajtnyOI= -github.com/quic-go/qtls-go1-20 v0.1.0 h1:d1PK3ErFy9t7zxKsG3NXBJXZjp/kMLoIb3y/kV54oAI= -github.com/quic-go/qtls-go1-20 v0.1.0/go.mod h1:JKtK6mjbAVcUTN/9jZpvLbGxvdWIKS8uT7EiStoU1SM= +github.com/quic-go/qtls-go1-19 v0.2.1 h1:aJcKNMkH5ASEJB9FXNeZCyTEIHU1J7MmHyz1Q1TSG1A= +github.com/quic-go/qtls-go1-19 v0.2.1/go.mod h1:ySOI96ew8lnoKPtSqx2BlI5wCpUVPT05RMAlajtnyOI= +github.com/quic-go/qtls-go1-20 v0.1.1 h1:KbChDlg82d3IHqaj2bn6GfKRj84Per2VGf5XV3wSwQk= +github.com/quic-go/qtls-go1-20 v0.1.1/go.mod h1:JKtK6mjbAVcUTN/9jZpvLbGxvdWIKS8uT7EiStoU1SM= github.com/quic-go/quic-go v0.32.0 h1:lY02md31s1JgPiiyfqJijpu/UX/Iun304FI3yUqX7tA= github.com/quic-go/quic-go v0.32.0/go.mod h1:/fCsKANhQIeD5l76c2JFU+07gVE3KaA0FP+0zMWwfwo= github.com/shirou/gopsutil/v3 v3.21.8 h1:nKct+uP0TV8DjjNiHanKf8SAuub+GNsbrOtM9Nl9biA= @@ -155,8 +155,8 @@ github.com/tklauser/go-sysconf v0.3.9/go.mod h1:11DU/5sG7UexIrp/O6g35hrWzu0JxlwQ github.com/tklauser/numcpus v0.3.0 h1:ILuRUQBtssgnxw0XXIjKUC56fgnOrFoQQ/4+DeU2biQ= github.com/tklauser/numcpus v0.3.0/go.mod h1:yFGUr7TUHQRAhyqBcEg0Ge34zDBAsIvJJcyE6boqnA8= github.com/u-root/uio v0.0.0-20221213070652-c3537552635f/go.mod h1:IogEAUBXDEwX7oR/BMmCctShYs80ql4hF0ySdzGxf7E= -github.com/u-root/uio v0.0.0-20230215032506-9aa6f7e2d72c h1:PHoGTnweZP+KIg/8Zc6+iOesrIF5yHkpb4GBDxHm7yE= -github.com/u-root/uio v0.0.0-20230215032506-9aa6f7e2d72c/go.mod h1:eLL9Nub3yfAho7qB0MzZizFhTU2QkLeoVsWdHtDW264= +github.com/u-root/uio v0.0.0-20230220225925-ffce2a382923 h1:tHNk7XK9GkmKUR6Gh8gVBKXc2MVSZ4G/NnWLtzw4gNA= +github.com/u-root/uio v0.0.0-20230220225925-ffce2a382923/go.mod h1:eLL9Nub3yfAho7qB0MzZizFhTU2QkLeoVsWdHtDW264= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.etcd.io/bbolt v1.3.7 h1:j+zJOnnEjF/kyHlDDgGnVL/AIqIJPq8UoB2GSNfkUfQ= go.etcd.io/bbolt v1.3.7/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw= diff --git a/internal/filtering/servicelist.go b/internal/filtering/servicelist.go index 93fe79cd8dd..e46b9383319 100644 --- a/internal/filtering/servicelist.go +++ b/internal/filtering/servicelist.go @@ -1171,6 +1171,16 @@ var blockedServices = []blockedService{{ "||zuckerberg.com^", "||zuckerberg.net^", }, +}, { + ID: "gog", + Name: "GOG", + IconSVG: []byte(""), + Rules: []string{ + "||gog-cdn-lumen.secure2.footprint.net^", + "||gog-statics.com^", + "||gog.com^", + "||gogalaxy.com^", + }, }, { ID: "hulu", Name: "Hulu", @@ -1291,6 +1301,24 @@ var blockedServices = []blockedService{{ "||lolstatic.com^", "||lolusercontent.com^", }, +}, { + ID: "line", + Name: "LINE", + IconSVG: []byte(""), + Rules: []string{ + "||gcld-line.com^", + "||lin.ee^", + "||line-apps-beta.com^", + "||line-apps-rc.com^", + "||line-apps.com^", + "||line-cdn.net^", + "||line-scdn.net^", + "||line.me^", + "||line.naver.jp^", + "||linecorp.com^", + "||linemyshop.com^", + "||lineshoppingseller.com^", + }, }, { ID: "mail_ru", Name: "Mail.ru", @@ -1363,7 +1391,6 @@ var blockedServices = []blockedService{{ "||mstdn.party^", "||mstdn.social^", "||muenchen.social^", - "||nerdculture.de^", "||newsie.social^", "||noc.social^", "||norden.social^", @@ -1382,6 +1409,7 @@ var blockedServices = []blockedService{{ "||social.anoxinon.de^", "||social.cologne^", "||social.dev-wiki.de^", + "||social.linux.pizza^", "||social.politicaconciencia.org^", "||social.vivaldi.net^", "||sself.co^", diff --git a/internal/tools/go.mod b/internal/tools/go.mod index 0b4e66297b9..d0f5245c118 100644 --- a/internal/tools/go.mod +++ b/internal/tools/go.mod @@ -9,9 +9,9 @@ require ( github.com/kisielk/errcheck v1.6.3 github.com/kyoh86/looppointer v0.2.1 github.com/securego/gosec/v2 v2.15.0 - golang.org/x/tools v0.6.0 - golang.org/x/vuln v0.0.0-20230213165600-1a019b0c7f30 - honnef.co/go/tools v0.4.1 + golang.org/x/tools v0.6.1-0.20230217175706-3102dad5faf9 + golang.org/x/vuln v0.0.0-20230217204342-b91abcc5ae3c + honnef.co/go/tools v0.4.2 mvdan.cc/gofumpt v0.4.0 mvdan.cc/unparam v0.0.0-20230125043941-70a0ce6e7b95 ) diff --git a/internal/tools/go.sum b/internal/tools/go.sum index bc821c41a91..e3c5d1aeefc 100644 --- a/internal/tools/go.sum +++ b/internal/tools/go.sum @@ -97,10 +97,10 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20201007032633-0806396f153e/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= -golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM= -golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/vuln v0.0.0-20230213165600-1a019b0c7f30 h1:Q4B8LhSjZGto/+P5REBb4N51ec2H4efRqjBIeJ6nv/Y= -golang.org/x/vuln v0.0.0-20230213165600-1a019b0c7f30/go.mod h1:cBP4HMKv0X+x96j8IJWCKk0eqpakBmmHjKGSSC0NaYE= +golang.org/x/tools v0.6.1-0.20230217175706-3102dad5faf9 h1:IuFp2CklNBim6OdHXn/1P4VoeKt5pA2jcDKWlboqtlQ= +golang.org/x/tools v0.6.1-0.20230217175706-3102dad5faf9/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= +golang.org/x/vuln v0.0.0-20230217204342-b91abcc5ae3c h1:7/jJkMpaKZMxdyOQ7IP7aPbJQaDk4cOUxtXtWHQ1cSk= +golang.org/x/vuln v0.0.0-20230217204342-b91abcc5ae3c/go.mod h1:LTLnfk/dpXDNKsX6aCg/cI4LyCVnTyrQhgV/yLJuly0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -109,8 +109,8 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -honnef.co/go/tools v0.4.1 h1:HPeloSr0mLOEMOkhT9Au5aeki44kvP6ka3v1xIsM6Zo= -honnef.co/go/tools v0.4.1/go.mod h1:36ZgoUOrqOk1GxwHhyryEkq8FQWkUO2xGuSMhUCcdvA= +honnef.co/go/tools v0.4.2 h1:6qXr+R5w+ktL5UkwEbPp+fEvfyoMPche6GkOpGHZcLc= +honnef.co/go/tools v0.4.2/go.mod h1:36ZgoUOrqOk1GxwHhyryEkq8FQWkUO2xGuSMhUCcdvA= mvdan.cc/gofumpt v0.4.0 h1:JVf4NN1mIpHogBj7ABpgOyZc65/UUOkKQFkoURsz4MM= mvdan.cc/gofumpt v0.4.0/go.mod h1:PljLOHDeZqgS8opHRKLzp2It2VBuSdteAgqUfzMTxlQ= mvdan.cc/unparam v0.0.0-20230125043941-70a0ce6e7b95 h1:n/xhncJPSt0YzfOhnyn41XxUdrWQNgmLBG72FE27Fqw= diff --git a/scripts/make/Dockerfile b/scripts/make/Dockerfile index a940a155afd..848c21229dd 100644 --- a/scripts/make/Dockerfile +++ b/scripts/make/Dockerfile @@ -1,6 +1,6 @@ # A docker file for scripts/make/build-docker.sh. -FROM alpine:3.16 +FROM alpine:3.17 ARG BUILD_DATE ARG VERSION