From c96f698f91c329ad4f5389c2b34b23b6479dee24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20Casta=C3=B1o=20Arteaga?= Date: Tue, 25 Jun 2024 10:50:35 +0200 Subject: [PATCH] Upgrade backend dependencies and base images (#3898) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sergio Castaño Arteaga --- cmd/ah/Dockerfile | 2 +- cmd/hub/Dockerfile | 2 +- cmd/scanner/Dockerfile | 4 ++-- database/migrations/Dockerfile | 2 +- database/tests/Dockerfile-db-tests | 2 +- go.mod | 4 ++-- go.sum | 8 ++++---- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cmd/ah/Dockerfile b/cmd/ah/Dockerfile index f7e68a93..a1e9d8ab 100644 --- a/cmd/ah/Dockerfile +++ b/cmd/ah/Dockerfile @@ -10,7 +10,7 @@ WORKDIR /go/src/github.com/artifacthub/ah/cmd/ah RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-X main.version=$VERSION -X main.gitCommit=$GIT_COMMIT" -o /ah . # Final stage -FROM alpine:3.20.0 +FROM alpine:3.20.1 RUN apk --no-cache add git && addgroup -S ah -g 1000 && adduser -S ah -u 1000 -G ah USER 1000 COPY --from=ah-builder /ah /usr/local/bin diff --git a/cmd/hub/Dockerfile b/cmd/hub/Dockerfile index 346afdf4..f63a6eee 100644 --- a/cmd/hub/Dockerfile +++ b/cmd/hub/Dockerfile @@ -34,7 +34,7 @@ WORKDIR /docs/www RUN hugo # Final stage -FROM alpine:3.20.0 +FROM alpine:3.20.1 RUN apk --no-cache add ca-certificates && addgroup -S hub -g 1000 && adduser -S hub -u 1000 -G hub USER 1000 WORKDIR /home/hub diff --git a/cmd/scanner/Dockerfile b/cmd/scanner/Dockerfile index 9761f441..5ff7ec35 100644 --- a/cmd/scanner/Dockerfile +++ b/cmd/scanner/Dockerfile @@ -8,12 +8,12 @@ WORKDIR /go/src/github.com/artifacthub/scanner/cmd/scanner RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o /scanner . # Trivy installer -FROM alpine:3.20.0 AS trivy-installer +FROM alpine:3.20.1 AS trivy-installer RUN apk --no-cache add curl RUN curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin v0.50.1 # Final stage -FROM alpine:3.20.0 +FROM alpine:3.20.1 RUN apk --no-cache add ca-certificates && addgroup -S scanner -g 1000 && adduser -S scanner -u 1000 -G scanner USER 1000 WORKDIR /home/scanner diff --git a/database/migrations/Dockerfile b/database/migrations/Dockerfile index a3c87b1b..51604e62 100644 --- a/database/migrations/Dockerfile +++ b/database/migrations/Dockerfile @@ -4,7 +4,7 @@ RUN apk --no-cache add git RUN go install github.com/jackc/tern@latest # Build final image -FROM alpine:3.20.0 +FROM alpine:3.20.1 RUN addgroup -S db-migrator -g 1000 && adduser -S db-migrator -u 1000 -G db-migrator USER 1000 WORKDIR /home/db-migrator diff --git a/database/tests/Dockerfile-db-tests b/database/tests/Dockerfile-db-tests index 23fa0456..a23fc4d0 100644 --- a/database/tests/Dockerfile-db-tests +++ b/database/tests/Dockerfile-db-tests @@ -4,7 +4,7 @@ RUN apk --no-cache add git RUN go get -u github.com/jackc/tern # Build final image -FROM alpine:3.20.0 +FROM alpine:3.20.1 RUN apk --no-cache add git perl-app-cpanminus postgresql-client RUN cpanm --no-wget TAP::Parser::SourceHandler::pgTAP RUN addgroup -S db-tests && adduser -S db-tests -G db-tests diff --git a/go.mod b/go.mod index abaa88cb..1796d695 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/domodwyer/mailyak v3.1.1+incompatible github.com/galeone/tensorflow/tensorflow/go v0.0.0-20240119075110-6ad3cf65adfe github.com/galeone/tfgo v0.0.0-20230715013254-16113111dc99 - github.com/go-chi/chi/v5 v5.0.13 + github.com/go-chi/chi/v5 v5.0.14 github.com/go-enry/go-license-detector/v4 v4.3.1 github.com/go-git/go-git/v5 v5.12.0 github.com/google/go-containerregistry v0.19.2 @@ -214,7 +214,7 @@ require ( github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect github.com/hashicorp/go-getter v1.7.4 // indirect - github.com/hashicorp/go-retryablehttp v0.7.6 // indirect + github.com/hashicorp/go-retryablehttp v0.7.7 // indirect github.com/hashicorp/go-rootcerts v1.0.2 // indirect github.com/hashicorp/go-safetemp v1.0.0 // indirect github.com/hashicorp/go-secure-stdlib/parseutil v0.1.7 // indirect diff --git a/go.sum b/go.sum index 9719cb18..646abd5c 100644 --- a/go.sum +++ b/go.sum @@ -559,8 +559,8 @@ github.com/galeone/tfgo v0.0.0-20230715013254-16113111dc99/go.mod h1:3YgYBeIX42t github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gliderlabs/ssh v0.3.7 h1:iV3Bqi942d9huXnzEF2Mt+CY9gLu8DNM4Obd+8bODRE= github.com/gliderlabs/ssh v0.3.7/go.mod h1:zpHEXBstFnQYtGnB8k8kQLol82umzn/2/snG7alWVD8= -github.com/go-chi/chi/v5 v5.0.13 h1:JlH2F2M8qnwl0N1+JFFzlX9TlKJYas3aPXdiuTmJL+w= -github.com/go-chi/chi/v5 v5.0.13/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= +github.com/go-chi/chi/v5 v5.0.14 h1:PyEwo2Vudraa0x/Wl6eDRRW2NXBvekgfxyydcM0WGE0= +github.com/go-chi/chi/v5 v5.0.14/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= github.com/go-enry/go-license-detector/v4 v4.3.1 h1:BajEVdTffFcs8RACmblySVhfEIuT58TmXx27RgVfUdc= github.com/go-enry/go-license-detector/v4 v4.3.1/go.mod h1:YVJKPE01WQNjN/bdM6V0I/9KxvwEAAv0Ef9pi92K6w0= github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA= @@ -819,8 +819,8 @@ github.com/hashicorp/go-hclog v1.6.3/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVH github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= -github.com/hashicorp/go-retryablehttp v0.7.6 h1:TwRYfx2z2C4cLbXmT8I5PgP/xmuqASDyiVuGYfs9GZM= -github.com/hashicorp/go-retryablehttp v0.7.6/go.mod h1:pkQpWZeYWskR+D1tR2O5OcBFOxfA7DoAO6xtkuQnHTk= +github.com/hashicorp/go-retryablehttp v0.7.7 h1:C8hUCYzor8PIfXHa4UrZkU4VvK8o9ISHxT2Q8+VepXU= +github.com/hashicorp/go-retryablehttp v0.7.7/go.mod h1:pkQpWZeYWskR+D1tR2O5OcBFOxfA7DoAO6xtkuQnHTk= github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc= github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= github.com/hashicorp/go-safetemp v1.0.0 h1:2HR189eFNrjHQyENnQMMpCiBAsRxzbTMIgBhEyExpmo=