Skip to content

Commit 8ad029f

Browse files
authored
Use v1.36.2 (#48)
Signed-off-by: Takeshi Yoneda <[email protected]>
1 parent 98df470 commit 8ad029f

File tree

6 files changed

+10
-9
lines changed

6 files changed

+10
-9
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ RUN CC="zig cc -target aarch64-linux-gnu" CXX="zig c++ -target aarch64-linux-gnu
4646
RUN CC="zig cc -target x86_64-linux-gnu" CXX="zig c++ -target x86_64-linux-gnu" CGO_ENABLED=1 GOARCH=amd64 go build -buildmode=c-shared -o /build/amd64_libgo_module.so .
4747

4848
##### Build the final image #####
49-
FROM envoyproxy/envoy:dev-78fc79f72c883549cd6b29db11e02e6fb74c63d0 AS envoy
49+
FROM envoyproxy/envoy:v1.36.2 AS envoy
5050
ARG TARGETARCH
5151
ENV ENVOY_DYNAMIC_MODULES_SEARCH_PATH=/usr/local/lib
5252
COPY --from=rust_builder /build/${TARGETARCH}_librust_module.so /usr/local/lib/librust_module.so

ENVOY_VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
78fc79f72c883549cd6b29db11e02e6fb74c63d0
1+
dc2d3098ae5641555f15c71d5bb5ce0060a8015c

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
# Dynamic Modules Examples
22

3-
> Envoy Version: [78fc79f72c883549cd6b29db11e02e6fb74c63d0] v1.36-dev
3+
> Envoy Version: [dc2d3098ae5641555f15c71d5bb5ce0060a8015c] v1.36.2
44
>
55
> Since dynamic modules are tied with a specific Envoy version, this repository is based on the specific commit of Envoy.
66
> For examples for a specific Envoy version, please check out `release/v<version>` branches:
77
> * [`release/v1.34`](https://github.com/envoyproxy/dynamic-modules-examples/tree/release/v1.34)
88
> * [`release/v1.35`](https://github.com/envoyproxy/dynamic-modules-examples/tree/release/v1.35)
9+
> * [`release/v1.36`](https://github.com/envoyproxy/dynamic-modules-examples/tree/release/v1.36)
910
1011
This repository hosts examples of dynamic modules for [Envoy] to extend its functionality.
1112
The high level documentation is available [here][High Level Doc]. In short, a dynamic module is a shared library
@@ -89,6 +90,6 @@ If you want to explicitly specify the docker image, use `ENVOY_IMAGE` environmen
8990
ENVOY_IMAGE=foo-bar-image:latest go test . -v -count=1
9091
```
9192

92-
[78fc79f72c883549cd6b29db11e02e6fb74c63d0]: https://github.com/envoyproxy/envoy/tree/78fc79f72c883549cd6b29db11e02e6fb74c63d0
93+
[dc2d3098ae5641555f15c71d5bb5ce0060a8015c]: https://github.com/envoyproxy/envoy/tree/dc2d3098ae5641555f15c71d5bb5ce0060a8015c
9394
[Envoy]: https://github.com/envoyproxy/envoy
9495
[High Level Doc]: https://www.envoyproxy.io/docs/envoy/latest/intro/arch_overview/advanced/dynamic_modules

go/gosdk/abi.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
package gosdk
44

55
// Following is a distillation of the Envoy ABI for dynamic modules:
6-
// https://github.com/envoyproxy/envoy/blob/78fc79f72c883549cd6b29db11e02e6fb74c63d0/source/extensions/dynamic_modules/abi.h
6+
// https://github.com/envoyproxy/envoy/blob/dc2d3098ae5641555f15c71d5bb5ce0060a8015c/source/extensions/dynamic_modules/abi.h
77
//
88
// Why not using the header file directly? That is because Go runtime complains
99
// about passing pointers to C code on the boundary. In the following code, we replace
@@ -161,8 +161,8 @@ import (
161161
"unsafe"
162162
)
163163

164-
// https://github.com/envoyproxy/envoy/blob/78fc79f72c883549cd6b29db11e02e6fb74c63d0/source/extensions/dynamic_modules/abi_version.h
165-
var version = append([]byte("f2712929b605772d35c34d9ac8ccd7e168197a50951e9c96b64e03256bf80265"), 0)
164+
// https://github.com/envoyproxy/envoy/blob/dc2d3098ae5641555f15c71d5bb5ce0060a8015c/source/extensions/dynamic_modules/abi_version.h
165+
var version = append([]byte("ca2be3b80954d2a0e22b41d033b18eff9390c30261c8ec9ffe6e6bf971f41c27"), 0)
166166

167167
//export envoy_dynamic_module_on_program_init
168168
func envoy_dynamic_module_on_program_init() uintptr {

rust/Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rust/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ repository = "https://github.com/envoyproxy/dynamic-modules-example"
88

99
[dependencies]
1010
# The SDK version must match the Envoy version due to the strict compatibility requirements.
11-
envoy-proxy-dynamic-modules-rust-sdk = { git = "https://github.com/envoyproxy/envoy", rev = "78fc79f72c883549cd6b29db11e02e6fb74c63d0" }
11+
envoy-proxy-dynamic-modules-rust-sdk = { git = "https://github.com/envoyproxy/envoy", rev = "dc2d3098ae5641555f15c71d5bb5ce0060a8015c" }
1212
serde = { version = "1.0", features = ["derive"] }
1313
serde_json = "1.0"
1414
rand = "0.9.0"

0 commit comments

Comments
 (0)