Skip to content

Commit

Permalink
Merge pull request #440 from authzed/dependabot/go_modules/go-mod-4e9…
Browse files Browse the repository at this point in the history
…6566553

build(deps): bump the go-mod group across 1 directory with 14 updates
  • Loading branch information
tstirrat15 authored Dec 2, 2024
2 parents 6f6af94 + d2746b1 commit f498685
Show file tree
Hide file tree
Showing 5 changed files with 97 additions and 89 deletions.
2 changes: 1 addition & 1 deletion .goreleaser.docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ dockers:
- &amd_debug_image_gh "ghcr.io/authzed/zed:v{{ .Version }}-amd64-debug"
- &amd_debug_image_dh "authzed/zed:v{{ .Version }}-amd64-debug"
ids: ["linux-amd64"]
dockerfile: &dockerfile "Dockerfile.release"
dockerfile: "Dockerfile.release"
goos: "linux"
goarch: "amd64"
use: "buildx"
Expand Down
9 changes: 6 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
FROM golang:1.23-alpine3.20 AS zed-builder
# NOTE: we use the chainguard image here rather
# than the golang image because the golang image
# uses musl as its libc, and chainguard no longer provides
# a musl-dynamic container. - 2024-12-02 Tanner Stirrat
FROM cgr.dev/chainguard/go:latest AS zed-builder
WORKDIR /go/src/app
RUN apk update && apk add --no-cache git
COPY . .
RUN go build -v ./cmd/zed/

FROM cgr.dev/chainguard/musl-dynamic:latest
FROM cgr.dev/chainguard/glibc-dynamic:latest
COPY --from=zed-builder /go/src/app/zed /usr/local/bin/zed
ENTRYPOINT ["zed"]
6 changes: 5 additions & 1 deletion Dockerfile.release
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# vim: syntax=dockerfile
ARG BASE=cgr.dev/chainguard/musl-dynamic:latest
# NOTE: we use chainguard's static image because
# the version of zed that we build for this container
# is statically-linked (i.e. CGO_ENABLED=0) and therefore
# doesn't need a libc.
ARG BASE=cgr.dev/chainguard/static:latest

FROM $BASE

Expand Down
54 changes: 27 additions & 27 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ toolchain go1.23.2
require (
github.com/99designs/keyring v1.2.2
github.com/TylerBrock/colorjson v0.0.0-20200706003622-8a50f05110d2
github.com/authzed/authzed-go v1.0.1-0.20241001202507-27cc182a7b92
github.com/authzed/authzed-go v1.1.1
github.com/authzed/grpcutil v0.0.0-20240123194739-2ea1e3d2d98b
github.com/authzed/spicedb v1.38.1-0.20241030210113-595bb46cd8b4
github.com/brianvoe/gofakeit/v6 v6.28.0
github.com/ccoveille/go-safecast v1.1.0
github.com/ccoveille/go-safecast v1.2.0
github.com/cenkalti/backoff/v4 v4.3.0
github.com/charmbracelet/lipgloss v0.13.0
github.com/charmbracelet/x/term v0.2.0
github.com/charmbracelet/lipgloss v1.0.0
github.com/charmbracelet/x/term v0.2.1
github.com/google/uuid v1.6.0
github.com/gookit/color v1.5.4
github.com/hamba/avro/v2 v2.27.0
Expand All @@ -27,29 +27,29 @@ require (
github.com/rodaine/table v1.3.0
github.com/rs/zerolog v1.33.0
github.com/samber/lo v1.47.0
github.com/schollz/progressbar/v3 v3.16.1
github.com/schollz/progressbar/v3 v3.17.1
github.com/spf13/cobra v1.8.1
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.9.0
github.com/stretchr/testify v1.10.0
github.com/xlab/treeprint v1.2.0
golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e
golang.org/x/mod v0.21.0
golang.org/x/sync v0.8.0
golang.org/x/term v0.25.0
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1
google.golang.org/grpc v1.67.1
google.golang.org/protobuf v1.35.1
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0
golang.org/x/mod v0.22.0
golang.org/x/sync v0.9.0
golang.org/x/term v0.26.0
google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38
google.golang.org/grpc v1.68.0
google.golang.org/protobuf v1.35.2
gopkg.in/yaml.v3 v3.0.1
)

require (
buf.build/gen/go/gogo/protobuf/protocolbuffers/go v1.34.2-20210810001428-4df00b267f94.2 // indirect
buf.build/gen/go/prometheus/prometheus/protocolbuffers/go v1.34.2-20240802094132-5b212ab78fb7.2 // indirect
cel.dev/expr v0.16.0 // indirect
cel.dev/expr v0.16.1 // indirect
cloud.google.com/go v0.115.1 // indirect
cloud.google.com/go/auth v0.9.3 // indirect
cloud.google.com/go/auth v0.9.4 // indirect
cloud.google.com/go/auth/oauth2adapt v0.2.4 // indirect
cloud.google.com/go/compute/metadata v0.5.0 // indirect
cloud.google.com/go/compute/metadata v0.5.1 // indirect
cloud.google.com/go/iam v1.2.1 // indirect
cloud.google.com/go/longrunning v0.6.1 // indirect
cloud.google.com/go/monitoring v1.21.0 // indirect
Expand Down Expand Up @@ -89,10 +89,10 @@ require (
github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
github.com/certifi/gocertifi v0.0.0-20210507211836-431795d63e8d // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/charmbracelet/x/ansi v0.1.4 // indirect
github.com/charmbracelet/x/ansi v0.4.2 // indirect
github.com/cilium/ebpf v0.9.1 // indirect
github.com/cloudspannerecosystem/spanner-change-streams-tail v0.3.1 // indirect
github.com/cncf/xds/go v0.0.0-20240822171458-6449f94b4d59 // indirect
github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78 // indirect
github.com/containerd/cgroups/v3 v3.0.1 // indirect
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
github.com/creasty/defaults v1.8.0 // indirect
Expand All @@ -110,7 +110,7 @@ require (
github.com/envoyproxy/go-control-plane v0.13.0 // indirect
github.com/envoyproxy/protoc-gen-validate v1.1.0 // indirect
github.com/exaring/otelpgx v0.6.2 // indirect
github.com/fatih/color v1.17.0 // indirect
github.com/fatih/color v1.18.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
Expand Down Expand Up @@ -142,7 +142,7 @@ require (
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1 // indirect
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.23.0 // indirect
github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
Expand Down Expand Up @@ -232,18 +232,18 @@ require (
go.opentelemetry.io/otel/trace v1.30.0 // indirect
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
go.uber.org/atomic v1.11.0 // indirect
go.uber.org/automaxprocs v1.5.3 // indirect
go.uber.org/automaxprocs v1.6.0 // indirect
go.uber.org/goleak v1.3.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.28.0 // indirect
golang.org/x/net v0.30.0 // indirect
golang.org/x/crypto v0.29.0 // indirect
golang.org/x/net v0.31.0 // indirect
golang.org/x/oauth2 v0.23.0 // indirect
golang.org/x/sys v0.26.0 // indirect
golang.org/x/text v0.19.0 // indirect
golang.org/x/sys v0.27.0 // indirect
golang.org/x/text v0.20.0 // indirect
golang.org/x/time v0.6.0 // indirect
google.golang.org/api v0.197.0 // indirect
google.golang.org/api v0.198.0 // indirect
google.golang.org/genproto v0.0.0-20240903143218-8af14fe29dc1 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20241021214115-324edc3d5d38 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
Expand Down
Loading

0 comments on commit f498685

Please sign in to comment.