From 3e8fbd9c5d2721e2dc5e33244d12d158411596b1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Dec 2023 10:51:25 +0000 Subject: [PATCH 1/2] build(deps): bump golang from 1.21.3-alpine to 1.21.5-alpine Bumps golang from 1.21.3-alpine to 1.21.5-alpine. --- updated-dependencies: - dependency-name: golang dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Dockerfile.backend | 2 +- Dockerfile.cis_docker_benchmark_scanner | 2 +- Dockerfile.cli | 2 +- Dockerfile.runtime_k8s_scanner | 2 +- Dockerfile.sbom_db | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile.backend b/Dockerfile.backend index 75c421d8..e6a62cb3 100644 --- a/Dockerfile.backend +++ b/Dockerfile.backend @@ -7,7 +7,7 @@ COPY ui . RUN npm i RUN npm run build -FROM golang:1.21.3-alpine AS builder +FROM golang:1.21.5-alpine AS builder RUN apk add --update --no-cache gcc g++ git ca-certificates build-base diff --git a/Dockerfile.cis_docker_benchmark_scanner b/Dockerfile.cis_docker_benchmark_scanner index 5ed77c54..0eab6c57 100644 --- a/Dockerfile.cis_docker_benchmark_scanner +++ b/Dockerfile.cis_docker_benchmark_scanner @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1.2 -FROM golang:1.21.3-alpine AS builder +FROM golang:1.21.5-alpine AS builder RUN apk add --update --no-cache gcc g++ git ca-certificates build-base diff --git a/Dockerfile.cli b/Dockerfile.cli index e4582c30..554c0f96 100644 --- a/Dockerfile.cli +++ b/Dockerfile.cli @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1.2 -FROM golang:1.21.3-alpine AS builder +FROM golang:1.21.5-alpine AS builder RUN apk add --update --no-cache gcc g++ git ca-certificates build-base diff --git a/Dockerfile.runtime_k8s_scanner b/Dockerfile.runtime_k8s_scanner index 19bf8b77..c26591e9 100644 --- a/Dockerfile.runtime_k8s_scanner +++ b/Dockerfile.runtime_k8s_scanner @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1.2 -FROM golang:1.21.3-alpine AS builder +FROM golang:1.21.5-alpine AS builder RUN apk add --update --no-cache gcc g++ git ca-certificates build-base diff --git a/Dockerfile.sbom_db b/Dockerfile.sbom_db index f1709624..b1a2dd71 100644 --- a/Dockerfile.sbom_db +++ b/Dockerfile.sbom_db @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1.2 -FROM golang:1.21.3-alpine AS builder +FROM golang:1.21.5-alpine AS builder RUN apk add --update --no-cache gcc g++ git ca-certificates build-base From 47257e4c7c3302c4fd700de5cd1a04818350ad28 Mon Sep 17 00:00:00 2001 From: Idan Frimark Date: Tue, 26 Dec 2023 09:07:31 +0200 Subject: [PATCH 2/2] build(deps): update go-sqlite3 to resolve pread/pwrite buile issue following https://github.com/mattn/go-sqlite3/pull/1177 --- backend/go.mod | 2 +- backend/go.sum | 4 ++-- sbom_db/backend/go.mod | 2 +- sbom_db/backend/go.sum | 3 ++- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/backend/go.mod b/backend/go.mod index c6a93441..6b57e9d6 100644 --- a/backend/go.mod +++ b/backend/go.mod @@ -137,7 +137,7 @@ require ( github.com/magiconair/properties v1.8.7 // indirect github.com/mailru/easyjson v0.7.7 // indirect github.com/mattn/go-runewidth v0.0.14 // indirect - github.com/mattn/go-sqlite3 v1.14.15 // indirect + github.com/mattn/go-sqlite3 v1.14.19 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect github.com/mholt/archiver/v3 v3.5.1 // indirect github.com/mitchellh/copystructure v1.2.0 // indirect diff --git a/backend/go.sum b/backend/go.sum index 46826698..17ee52c2 100644 --- a/backend/go.sum +++ b/backend/go.sum @@ -862,8 +862,8 @@ github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh github.com/mattn/go-shellwords v1.0.6/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o= github.com/mattn/go-shellwords v1.0.12/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y= github.com/mattn/go-sqlite3 v1.14.9/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= -github.com/mattn/go-sqlite3 v1.14.15 h1:vfoHhTN1af61xCRSWzFIWzx2YskyMTwHLrExkBOjvxI= -github.com/mattn/go-sqlite3 v1.14.15/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= +github.com/mattn/go-sqlite3 v1.14.19 h1:fhGleo2h1p8tVChob4I9HpmVFIAkKGpiukdrgQbWfGI= +github.com/mattn/go-sqlite3 v1.14.19/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= diff --git a/sbom_db/backend/go.mod b/sbom_db/backend/go.mod index de9d2075..f6b111db 100644 --- a/sbom_db/backend/go.mod +++ b/sbom_db/backend/go.mod @@ -38,7 +38,7 @@ require ( github.com/josharian/intern v1.0.0 // indirect github.com/magiconair/properties v1.8.5 // indirect github.com/mailru/easyjson v0.7.6 // indirect - github.com/mattn/go-sqlite3 v1.14.9 // indirect + github.com/mattn/go-sqlite3 v1.14.19 // indirect github.com/mitchellh/mapstructure v1.4.3 // indirect github.com/oklog/ulid v1.3.1 // indirect github.com/pelletier/go-toml v1.9.4 // indirect diff --git a/sbom_db/backend/go.sum b/sbom_db/backend/go.sum index 056cfb7d..367e315d 100644 --- a/sbom_db/backend/go.sum +++ b/sbom_db/backend/go.sum @@ -242,8 +242,9 @@ github.com/mailru/easyjson v0.7.6 h1:8yTIVnZgCoiM1TgqoeTl+LfU5Jg6/xL3QhGQnimLYnA github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod h1:Ld9puTsIW75CHf65OeIOkyKbteujpZVXDpWK6YGZbxE= github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0= -github.com/mattn/go-sqlite3 v1.14.9 h1:10HX2Td0ocZpYEjhilsuo6WWtUqttj2Kb0KtD86/KYA= github.com/mattn/go-sqlite3 v1.14.9/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= +github.com/mattn/go-sqlite3 v1.14.19 h1:fhGleo2h1p8tVChob4I9HpmVFIAkKGpiukdrgQbWfGI= +github.com/mattn/go-sqlite3 v1.14.19/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.3.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/mapstructure v1.3.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=