Skip to content

Commit

Permalink
Merge pull request #221 from glazychev-art/govpp1765
Browse files Browse the repository at this point in the history
Update govpp
  • Loading branch information
denis-tingaikin authored Sep 4, 2023
2 parents 3cc8f4e + 2828eee commit 3a5ca82
Show file tree
Hide file tree
Showing 3 changed files with 85 additions and 24 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
ARG VPP_VERSION=v23.02-rc0-189-gb53439efb
ARG VPP_VERSION=v23.10-rc0-164-gac0994fc0
FROM ghcr.io/networkservicemesh/govpp/vpp:${VPP_VERSION} as go
COPY --from=golang:1.20.5-buster /usr/local/go/ /go
ENV PATH ${PATH}:/go/bin
ENV GO111MODULE=on
ENV CGO_ENABLED=0
ENV GOBIN=/bin
RUN rm -r /etc/vpp
RUN go install github.com/go-delve/delve/cmd/dlv@v1.8.2
RUN go install github.com/go-delve/delve/cmd/dlv@v1.21.0
ADD https://github.com/spiffe/spire/releases/download/v1.2.2/spire-1.2.2-linux-x86_64-glibc.tar.gz .
RUN tar xzvf spire-1.2.2-linux-x86_64-glibc.tar.gz -C /bin --strip=2 spire-1.2.2/bin/spire-server spire-1.2.2/bin/spire-agent

Expand Down
8 changes: 4 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ require (
github.com/kelseyhightower/envconfig v1.4.0
github.com/networkservicemesh/api v1.10.1-0.20230822145124-c4a3ece88804
github.com/networkservicemesh/sdk v0.5.1-0.20230828163119-f96fdf637a63
github.com/networkservicemesh/sdk-vpp v0.0.0-20230829144755-51305e3ca61e
github.com/networkservicemesh/vpphelper v0.0.0-20230721124411-38a0b7426972
github.com/networkservicemesh/sdk-vpp v0.0.0-20230904082310-8a9c97efea32
github.com/networkservicemesh/vpphelper v0.0.0-20230901145133-a14aecebd1cb
github.com/pkg/errors v0.9.1
github.com/sirupsen/logrus v1.9.0
github.com/spiffe/go-spiffe/v2 v2.0.0
Expand All @@ -19,7 +19,6 @@ require (
)

require (
git.fd.io/govpp.git v0.3.6-0.20210927044411-385ccc0d8ba9 // indirect
github.com/OneOfOne/xxhash v1.2.8 // indirect
github.com/agnivade/levenshtein v1.1.1 // indirect
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
Expand All @@ -41,7 +40,7 @@ require (
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/lunixbochs/struc v0.0.0-20200521075829-a4cb8d33dbbe // indirect
github.com/miekg/dns v1.1.50 // indirect
github.com/networkservicemesh/govpp v0.0.0-20230630105900-092690d52a97 // indirect
github.com/networkservicemesh/govpp v0.0.0-20230901132304-614d6d6fb8a6 // indirect
github.com/networkservicemesh/sdk-kernel v0.0.0-20230829144358-77e8a631e818 // indirect
github.com/open-policy-agent/opa v0.44.0 // indirect
github.com/r3labs/diff v1.1.0 // indirect
Expand All @@ -52,6 +51,7 @@ require (
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
github.com/yashtewari/glob-intersection v0.1.0 // indirect
github.com/zeebo/errs v1.2.2 // indirect
go.fd.io/govpp v0.8.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0 // indirect
go.opentelemetry.io/otel v1.16.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0 // indirect
Expand Down
Loading

0 comments on commit 3a5ca82

Please sign in to comment.