From 2c89bd537a6a841ea7ec9fd6f93558f4c692565b Mon Sep 17 00:00:00 2001 From: molon <3739161+molon@users.noreply.github.com> Date: Thu, 21 Nov 2024 17:31:42 +0800 Subject: [PATCH 1/2] upgrade x to v3.0.13 --- go.mod | 4 ++-- go.sum | 8 ++++---- utils/testflow/gentool/go.mod | 2 +- utils/testflow/gentool/go.sum | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index 2378414be..a622a6a14 100644 --- a/go.mod +++ b/go.mod @@ -26,8 +26,8 @@ require ( github.com/pquerna/otp v1.4.0 github.com/qor/oss v0.0.0-20240729105053-88484a799a79 github.com/qor5/web v1.3.2 - github.com/qor5/web/v3 v3.0.11-0.20241030093604-4c400ec73a70 - github.com/qor5/x/v3 v3.0.13-0.20241119025956-6dfaa2e3d1e0 + github.com/qor5/web/v3 v3.0.11 + github.com/qor5/x/v3 v3.0.13 github.com/samber/lo v1.47.0 github.com/shurcooL/sanitized_anchor_name v1.0.0 github.com/spf13/cast v1.6.0 diff --git a/go.sum b/go.sum index 99a31e420..113acbc53 100644 --- a/go.sum +++ b/go.sum @@ -310,10 +310,10 @@ github.com/qor/oss v0.0.0-20240729105053-88484a799a79 h1:MXQCoxxGj15XjuOSdhkLrPs github.com/qor/oss v0.0.0-20240729105053-88484a799a79/go.mod h1:FDxJAVwmZ1j8ITcKJExFlzkTYuUor1dBKZgNVWqEqlM= github.com/qor5/web v1.3.2 h1:zw796YJeDLe8vRwGR1cM+uS1ZuSkPutchBEXv2GgOhI= github.com/qor5/web v1.3.2/go.mod h1:LszskQJbFQDJwOeZC6j6afOiHxxyjrzz8B3zuBwfgKQ= -github.com/qor5/web/v3 v3.0.11-0.20241030093604-4c400ec73a70 h1:pQoePHKwvgdcKLYLGNNaDQeHMbfPbS6b/Y6R2ZQ2Ay4= -github.com/qor5/web/v3 v3.0.11-0.20241030093604-4c400ec73a70/go.mod h1:32vdHHcZb2JimlcaclW9hLUyimdXjrllZDHTh3rl6d0= -github.com/qor5/x/v3 v3.0.13-0.20241119025956-6dfaa2e3d1e0 h1:ftOiTLIkmst0ZAbh9DPClsHH0DaQVEajL6cetB6YGJg= -github.com/qor5/x/v3 v3.0.13-0.20241119025956-6dfaa2e3d1e0/go.mod h1:Sqb0OTgq5PejVkgNQIKqXi0x2MzHSvEAjNZM0g1KNks= +github.com/qor5/web/v3 v3.0.11 h1:4J/DbKPl3tYtXRCgqIMCUXSs+bgWkqhvdp/NeGFk/9E= +github.com/qor5/web/v3 v3.0.11/go.mod h1:32vdHHcZb2JimlcaclW9hLUyimdXjrllZDHTh3rl6d0= +github.com/qor5/x/v3 v3.0.13 h1:9ifASmJIrQ4jqz105jNS9lsHl4uIwGQ4aqw+I69F+Iw= +github.com/qor5/x/v3 v3.0.13/go.mod h1:QLn8B+adYmg8OAvohZZ/HUU8hzL4i/3xll2IL9v4B6E= github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= diff --git a/utils/testflow/gentool/go.mod b/utils/testflow/gentool/go.mod index d9f3e4ead..e880284e4 100644 --- a/utils/testflow/gentool/go.mod +++ b/utils/testflow/gentool/go.mod @@ -6,7 +6,7 @@ require ( github.com/gobuffalo/flect v1.0.2 github.com/pkg/errors v0.9.1 github.com/qor5/admin/v3 v3.0.1-0.20240424102851-d75759576158 - github.com/qor5/web/v3 v3.0.11-0.20241030093604-4c400ec73a70 + github.com/qor5/web/v3 v3.0.11 github.com/sergi/go-diff v1.3.1 mvdan.cc/gofumpt v0.6.0 ) diff --git a/utils/testflow/gentool/go.sum b/utils/testflow/gentool/go.sum index 9816051c2..2dd873d9f 100644 --- a/utils/testflow/gentool/go.sum +++ b/utils/testflow/gentool/go.sum @@ -20,8 +20,8 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/qor5/web/v3 v3.0.11-0.20241030093604-4c400ec73a70 h1:pQoePHKwvgdcKLYLGNNaDQeHMbfPbS6b/Y6R2ZQ2Ay4= -github.com/qor5/web/v3 v3.0.11-0.20241030093604-4c400ec73a70/go.mod h1:32vdHHcZb2JimlcaclW9hLUyimdXjrllZDHTh3rl6d0= +github.com/qor5/web/v3 v3.0.11 h1:4J/DbKPl3tYtXRCgqIMCUXSs+bgWkqhvdp/NeGFk/9E= +github.com/qor5/web/v3 v3.0.11/go.mod h1:32vdHHcZb2JimlcaclW9hLUyimdXjrllZDHTh3rl6d0= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8= From 697c9084817d438d83b0a5e7cc4453cc90c4f168 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Tue, 19 Nov 2024 05:10:00 +0000 Subject: [PATCH 2/2] fix: docs/Dockerfile to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-ALPINE316-BUSYBOX-6913410 - https://snyk.io/vuln/SNYK-ALPINE316-BUSYBOX-6913410 --- docs/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Dockerfile b/docs/Dockerfile index dce0c1a0c..c7622458b 100644 --- a/docs/Dockerfile +++ b/docs/Dockerfile @@ -6,7 +6,7 @@ COPY . . RUN set -x && go get -d -v ./docs/docsrc/... RUN GOOS=linux GOARCH=amd64 go build -o /app/entry ./docs/docsrc/server/ -FROM alpine:3.16 +FROM alpine:3.20.3 RUN apk --update upgrade && \ apk add ca-certificates && \ apk add tzdata && \