build: Upgrade tools and distroless base image (#413)

mesosphere · May 22, 2023 · 28979d3 · 28979d3
1 parent e092421
commit 28979d3
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 13 deletions.
diff --git a/.go-tools b/.go-tools
@@ -1,4 +1,4 @@
 github.com/oligot/go-mod-upgrade@v0.9.1
 gotest.tools/gotestsum@v1.10.0
 github.com/segmentio/golines@v0.11.0
-github.com/google/go-containerregistry/cmd/crane@v0.14.0
+github.com/google/go-containerregistry/cmd/crane@v0.15.2
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -60,7 +60,7 @@ repos:
     stages: [commit]
     args: ["-e", "SC2211"]
 - repo: https://github.com/igorshubovych/markdownlint-cli
-  rev: v0.33.0
+  rev: v0.34.0
   hooks:
   - id: markdownlint
     stages: [commit]

diff --git a/.tool-versions b/.tool-versions
@@ -1,10 +1,10 @@
-gcloud 427.0.0
-ginkgo 2.9.2
+gcloud 431.0.0
+ginkgo 2.9.5
 gojq 0.12.12
-golang 1.20.3
+golang 1.20.4
 golangci-lint 1.52.2
-goreleaser 1.17.2
-helm 3.11.3
-pre-commit 3.2.2
+goreleaser 1.18.2
+helm 3.12.0
+pre-commit 3.3.2
 shfmt 3.6.0
 upx 4.0.2
diff --git a/Dockerfile b/Dockerfile
@@ -4,8 +4,8 @@
 # syntax=docker/dockerfile:1
 
 # Use distroless/static:nonroot image for a base.
-FROM --platform=linux/amd64 gcr.io/distroless/static@sha256:81c9a17d330510c4c068d2570c2796cae06dc822014ddb79476ea136ca95ee71 as linux-amd64
-FROM --platform=linux/arm64 gcr.io/distroless/static@sha256:42bf7118eb11d6e471f2e0740b8289452e5925c209da33447b00dda8f051a9ea as linux-arm64
+FROM --platform=linux/amd64 gcr.io/distroless/static@sha256:1b4dbd7d38a0fd4bbaf5216a21a615d07b56747a96d3c650689cbb7fdc412b49 as linux-amd64
+FROM --platform=linux/arm64 gcr.io/distroless/static@sha256:05810557ec4b4bf01f4df548c06cc915bb29d81cb339495fe1ad2e668434bf8e as linux-arm64
 
 FROM --platform=linux/${TARGETARCH} linux-${TARGETARCH}
 

diff --git a/test/e2e/imagebundle/imagebundle_suite_test.go b/test/e2e/imagebundle/imagebundle_suite_test.go
@@ -23,10 +23,19 @@ func TestImagebundle(t *testing.T) {
 
 var _ = BeforeSuite(func() {
 	var err error
-	artifacts, err = helpers.ParseArtifactsFile(filepath.Join("..",
+	artifactsFileAbs, err := filepath.Abs(filepath.Join("..",
 		"..",
 		"..",
-		"dist", "artifacts.json"),
-	)
+		"dist", "artifacts.json"))
 	Expect(err).NotTo(HaveOccurred())
+	relArtifacts, err := helpers.ParseArtifactsFile(artifactsFileAbs)
+	Expect(err).NotTo(HaveOccurred())
+
+	artifacts = make(helpers.Artifacts, 0, len(relArtifacts))
+	for _, a := range relArtifacts {
+		if a.Path != "" {
+			a.Path = filepath.Join(filepath.Dir(artifactsFileAbs), "..", a.Path)
+		}
+		artifacts = append(artifacts, a)
+	}
 })