Skip to content

fix(runtime-image): rebuild vault with x/net v0.60.0 (patched.13) #73

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
antoinetoussaint-byte merged 3 commits into from
Oct 9, 2026
Merged

fix(runtime-image): rebuild vault with x/net v0.60.0 (patched.13) #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6bb0f72
fix(runtime-image): rebuild vault with golang.org/x/net v0.60.0 (patc…
AntoineToussaint Oct 9, 2026
b375d79
fix(runtime-image): x/net v0.60.0 needs x/crypto v0.57.0 and x/text v…
AntoineToussaint Oct 9, 2026
ec6f1c2
fix(runtime-image): pin runtime-v2.0.3-patched.13
AntoineToussaint Oct 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions Dockerfile.runtime
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,13 @@ RUN apk add --no-cache bash git
COPY --from=ui /src /src
WORKDIR /src
RUN --mount=type=cache,target=/go/pkg/mod \
go get google.golang.org/grpc@v1.83.2 github.com/apache/thrift@v0.24.0 golang.org/x/crypto@v0.55.0 golang.org/x/text@v0.41.0 \
go get google.golang.org/grpc@v1.83.2 github.com/apache/thrift@v0.24.0 golang.org/x/crypto@v0.57.0 golang.org/x/text@v0.42.0 golang.org/x/net@v0.60.0 \
&& go mod download \
&& test "$(go list -m -f '{{.Version}}' google.golang.org/grpc)" = "v1.83.2" \
&& test "$(go list -m -f '{{.Version}}' github.com/apache/thrift)" = "v0.24.0" \
&& test "$(go list -m -f '{{.Version}}' golang.org/x/crypto)" = "v0.55.0" \
&& test "$(go list -m -f '{{.Version}}' golang.org/x/text)" = "v0.41.0"
&& test "$(go list -m -f '{{.Version}}' golang.org/x/crypto)" = "v0.57.0" \
&& test "$(go list -m -f '{{.Version}}' golang.org/x/text)" = "v0.42.0" \
&& test "$(go list -m -f '{{.Version}}' golang.org/x/net)" = "v0.60.0"
ARG TARGETARCH
ARG TARGETOS
RUN --mount=type=cache,target=/go/pkg/mod \
Expand All @@ -46,8 +47,9 @@ RUN --mount=type=cache,target=/go/pkg/mod \
RUN go version -m bin/vault | grep -F "go1.26.9" \
&& go version -m bin/vault | grep -F "google.golang.org/grpc" | grep -F "v1.83.2" \
&& go version -m bin/vault | grep -F "github.com/apache/thrift" | grep -F "v0.24.0" \
&& go version -m bin/vault | grep -F "golang.org/x/crypto" | grep -F "v0.55.0" \
&& go version -m bin/vault | grep -F "golang.org/x/text" | grep -F "v0.41.0" \
&& go version -m bin/vault | grep -F "golang.org/x/crypto" | grep -F "v0.57.0" \
&& go version -m bin/vault | grep -F "golang.org/x/text" | grep -F "v0.42.0" \
&& go version -m bin/vault | grep -F "golang.org/x/net" | grep -F "v0.60.0" \
&& go version -m bin/vault | grep -F "github.com/hashicorp/vault/version.Version=${VAULT_VERSION}"

FROM alpine:3.24.1@sha256:28bd5fe8b56d1bd048e5babf5b10710ebe0bae67db86916198a6eec434943f8b
Expand Down
4 changes: 2 additions & 2 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ type Settings struct {

var image = &resources.DockerImage{
Name: "ghcr.io/codefly-dev/service-vault-runtime",
Tag: "runtime-v2.0.3-patched.11",
Digest: "sha256:374a30766d5e1f24231c47982c186c9a160e332b950af5f1efc6b6f676c7ea4b",
Tag: "runtime-v2.0.3-patched.13",
Digest: "sha256:86aa9162af5494eb7bdd1173773037bb7b4dc3632bdf316b27eb345ca2d47355",
}

type Service struct {
Expand Down
7 changes: 4 additions & 3 deletions main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ func TestCreateToRunDocker(t *testing.T) {

func TestVaultImagePin(t *testing.T) {
require.Equal(t, "ghcr.io/codefly-dev/service-vault-runtime", image.Name)
require.Equal(t, "runtime-v2.0.3-patched.11", image.Tag)
require.Equal(t, "sha256:374a30766d5e1f24231c47982c186c9a160e332b950af5f1efc6b6f676c7ea4b", image.Digest)
require.Equal(t, "ghcr.io/codefly-dev/service-vault-runtime@sha256:374a30766d5e1f24231c47982c186c9a160e332b950af5f1efc6b6f676c7ea4b", image.FullName())
require.Equal(t, "runtime-v2.0.3-patched.13", image.Tag)
require.Equal(t, "sha256:86aa9162af5494eb7bdd1173773037bb7b4dc3632bdf316b27eb345ca2d47355", image.Digest)
require.Equal(t, "ghcr.io/codefly-dev/service-vault-runtime@sha256:86aa9162af5494eb7bdd1173773037bb7b4dc3632bdf316b27eb345ca2d47355", image.FullName())
}

// TestAgentVersion asserts the embedded agent identity actually resolves from
Expand Down Expand Up @@ -100,6 +100,7 @@ func TestVaultImageSBOM(t *testing.T) {
// database later drops an advisory or stops recognizing a Go dependency.
for module, version := range map[string]string{
"github.com/apache/thrift": "v0.24.0",
"golang.org/x/net": "v0.60.0",
"google.golang.org/grpc": "v1.83.2",
} {
found := false
Expand Down
Loading