Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
148 changes: 148 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 4 additions & 14 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,15 +1,5 @@
[package]
name = "hermit"
version = "0.1.0"
edition = "2021"
[workspace]

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[lib]
crate-type = ["cdylib"]

[dependencies]
log = "0.4.17"
proxy-wasm = "0.2.0"
serde = { version = "1.0.152", features = ["derive"] }
serde_json = "1.0.91"
members = [
"hermit-wasm",
]
19 changes: 0 additions & 19 deletions Makefile

This file was deleted.

57 changes: 0 additions & 57 deletions envoy.yaml

This file was deleted.

20 changes: 20 additions & 0 deletions hermit-wasm/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
[package]
name = "hermit-wasm"
version = "0.1.0"
edition = "2021"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[lib]
crate-type = ["cdylib"]

[features]
default = ["http"]
tcp = []
http = []

[dependencies]
log = "0.4.17"
proxy-wasm = "0.2.0"
serde = { version = "1.0.152", features = ["derive"] }
serde_json = "1.0.91"
2 changes: 1 addition & 1 deletion Dockerfile → hermit-wasm/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
FROM envoyproxy/envoy:v1.24-latest
FROM envoyproxy/envoy:v1.25-latest
ENTRYPOINT /usr/local/bin/envoy -c /etc/envoy.yaml -l debug --service-cluster proxy
31 changes: 31 additions & 0 deletions hermit-wasm/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
CARGO=cargo +nightly
BUILD_ARGS=--package hermit-wasm --target=wasm32-unknown-unknown

.PHONY: test
test:
$(CARGO) test

.PHONY: clean
clean:
cargo clean

.PHONY: build
build:
$(CARGO) build $(BUILD_ARGS)

.PHONY: build-tcp
build:
$(CARGO) build $(BUILD_ARGS) --no-default-features --features tcp

.PHONY: release
release:
$(CARGO) build $(BUILD_ARGS) --release

.PHONY: release-tcp
release:
$(CARGO) build $(BUILD_ARGS) --release --no-default-features --features tcp

.PHONY: run
run: build
cd hermit-wasm; \
WASM_PATH="../target/wasm33-unknown-unknown/debug/hermit_wasm.wasm" docker compose up --build --remove-orphans | grep "\[wasm\]\|Starting"
7 changes: 3 additions & 4 deletions docker-compose.yaml → hermit-wasm/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,15 @@ services:
dockerfile: Dockerfile
volumes:
- ./envoy.yaml:/etc/envoy.yaml
- '${WASM_PATH:-./target/wasm32-unknown-unknown/release/hermit.wasm}:/etc/hermit.wasm'
#- ./hermit.wasm:/etc/hermit.wasm
- '${WASM_PATH:-../target/wasm32-unknown-unknown/debug/hermit_wasm.wasm}:/etc/hermit.wasm'
networks:
- envoymesh
expose:
- "80"
- "8001"
- "10000"
ports:
- "18000:80"
- "18001:8001"
- "10000:10000"

web_service:
image: hashicorp/http-echo
Expand Down
Loading