Bump packages versions in go.mod

* Bump versions in go.mod * Use new version of docker/distribution under new path * Fix failing TestOCIDigest due to upstream change --------- Authored by: Jessica Ng <[email protected]>
keel-hq · Dec 10, 2024 · 45df99b · 45df99b
1 parent 611ff29
commit 45df99b
Show file tree

Hide file tree

Showing 12 changed files with 435 additions and 409 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -7,12 +7,12 @@ workspace:
 
 steps:
 - name: unit-test
-  image: golang:1.22.8
+  image: golang:1.23.4
   commands:
     - make test
 
 - name: build
-  image: golang:1.22.8
+  image: golang:1.23.4
   commands:
     - make install
 

diff --git a/.gitignore b/.gitignore
@@ -10,4 +10,6 @@ hack/deployment-norbac-helm.yaml
 .idea/
 tests.out
 envsettings.ps1
-serviceaccount/*
+serviceaccount/*
+cmd/keel/keel.exe
+test_results.xml
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.22.8
+FROM golang:1.23.4
 COPY . /go/src/github.com/keel-hq/keel
 WORKDIR /go/src/github.com/keel-hq/keel
 RUN make install

diff --git a/Dockerfile.debian b/Dockerfile.debian
@@ -1,4 +1,4 @@
-FROM golang:1.22.8
+FROM golang:1.23.4
 COPY . /go/src/github.com/keel-hq/keel
 WORKDIR /go/src/github.com/keel-hq/keel
 RUN make build

diff --git a/Dockerfile.debug b/Dockerfile.debug
@@ -1,4 +1,4 @@
-FROM golang:1.22.8
+FROM golang:1.23.4
 COPY . /go/src/github.com/keel-hq/keel
 WORKDIR /go/src/github.com/keel-hq/keel
 RUN make install-debug

diff --git a/Dockerfile.tests b/Dockerfile.tests
@@ -1,4 +1,4 @@
-FROM golang:1.22.8
+FROM golang:1.23.4
 
 # Install tparse and go-junit-report
 RUN go install github.com/mfridman/tparse@latest && \

diff --git a/go.mod b/go.mod
diff --git a/go.sum b/go.sum
diff --git a/registry/docker/manifest.go b/registry/docker/manifest.go
@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"strings"
 
-	manifestv2 "github.com/docker/distribution/manifest/schema2"
+	manifestv2 "github.com/distribution/distribution/v3/manifest/schema2"
 	"github.com/opencontainers/go-digest"
 	oci "github.com/opencontainers/image-spec/specs-go/v1"
 )

diff --git a/registry/docker/manifest_test.go b/registry/docker/manifest_test.go
@@ -7,7 +7,7 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	manifestV2 "github.com/docker/distribution/manifest/schema2"
+	manifestV2 "github.com/distribution/distribution/v3/manifest/schema2"
 )
 
 func TestGetDigest(t *testing.T) {

diff --git a/registry/registry_test.go b/registry/registry_test.go
@@ -36,14 +36,14 @@ func TestOCIDigest(t *testing.T) {
 	digest, err := client.Digest(Opts{
 		Registry: "https://index.docker.io",
 		Name:     "vaultwarden/server",
-		Tag:      "1.25.1",
+		Tag:      "1.32.5",
 	})
 
 	if err != nil {
 		t.Errorf("error while getting digest: %s", err)
 	}
 
-	if digest != "sha256:dd8cf61d1997c098cc5686ef3116ca5cfef36f12192c01caa1de79a968397d4c" {
+	if digest != "sha256:84015c9306cc58f4be8b09c1adc62cfc3b2648b1430e9c15901482f3d870bd14" {
 		t.Errorf("unexpected digest: %s", digest)
 	}
 }

diff --git a/util/image/reference.go b/util/image/reference.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 
 	// "github.com/docker/distribution/digest"
-	"github.com/docker/distribution/reference"
+	"github.com/distribution/distribution/v3/reference"
 	"github.com/opencontainers/go-digest"
 )