From b83c2fdecd3cdefb847298b6deced3b999403a90 Mon Sep 17 00:00:00 2001 From: "Masih H. Derkani" Date: Tue, 18 Jul 2023 11:03:58 +0100 Subject: [PATCH] Upgrade FDB go bindings for 7.3.7 and add missing C libraries Upgrade the Golang binding for 7.3.7 and add missing libz. --- Dockerfile | 6 ++++-- go.mod | 7 +++---- go.sum | 5 ++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index e249430..57a57ca 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,8 +16,10 @@ RUN go build -o /go/bin/fdbmeter ./cmd/fdbmeter FROM gcr.io/distroless/base-debian11 COPY --from=build /go/bin/fdbmeter /usr/bin/ -COPY --from=build /usr/lib/libfdb_c.so /usr/lib/libfdb_c.so -COPY --from=build /lib/x86_64-linux-gnu/liblzma.so.5.2.5 /usr/lib/liblzma.so.5 +COPY --from=build /usr/lib/libfdb_c.so \ + /lib/x86_64-linux-gnu/liblzma.so.5 \ + /lib/x86_64-linux-gnu/libz.so.1 \ + /usr/lib/ COPY --from=build /usr/include/foundationdb /usr/include/foundationdb ENTRYPOINT ["/usr/bin/fdbmeter"] \ No newline at end of file diff --git a/go.mod b/go.mod index 27334fb..eb71d07 100644 --- a/go.mod +++ b/go.mod @@ -3,9 +3,9 @@ module github.com/masih/fdbmeter go 1.20 require ( - // Foundation DB golang binding version 7.1.33 - // See: https://github.com/apple/foundationdb/tree/7.1.33/bindings/go - github.com/apple/foundationdb/bindings/go v0.0.0-20230508183941-1098aa0251f4 + // Foundation DB golang binding version 7.3.7 + // See: https://github.com/apple/foundationdb/tree/7.3.7/bindings/go + github.com/apple/foundationdb/bindings/go v0.0.0-20230710184144-e3b440ca0859 github.com/prometheus/client_golang v1.15.1 go.opentelemetry.io/otel v1.16.0 go.opentelemetry.io/otel/exporters/prometheus v0.39.0 @@ -26,6 +26,5 @@ require ( go.opentelemetry.io/otel/sdk v1.16.0 // indirect go.opentelemetry.io/otel/trace v1.16.0 // indirect golang.org/x/sys v0.8.0 // indirect - golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 // indirect google.golang.org/protobuf v1.30.0 // indirect ) diff --git a/go.sum b/go.sum index 5bdc3a5..8c3e110 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -github.com/apple/foundationdb/bindings/go v0.0.0-20230508183941-1098aa0251f4 h1:UG70EEUB0GTPbKdCd5GfEUJI5NJV/Y2uaf/qvX0UaDE= -github.com/apple/foundationdb/bindings/go v0.0.0-20230508183941-1098aa0251f4/go.mod h1:w63jdZTFCtvdjsUj5yrdKgjxaAD5uXQX6hJ7EaiLFRs= +github.com/apple/foundationdb/bindings/go v0.0.0-20230710184144-e3b440ca0859 h1:B8C18+JnkGVQRAlykXy3E3dGj/7ZDV+756+/msOt4dw= +github.com/apple/foundationdb/bindings/go v0.0.0-20230710184144-e3b440ca0859/go.mod h1:OMVSB21p9+xQUIqlGizHPZfjK+SHws1ht+ZytVDoz9U= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= @@ -43,7 +43,6 @@ go.opentelemetry.io/otel/trace v1.16.0/go.mod h1:Yt9vYq1SdNz3xdjZZK7wcXv1qv2pwLk golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=