Skip to content

Commit 44e2cda

Browse files
authored
Rename binary name to omni-executor (#3822)
* init * update
1 parent bea9994 commit 44e2cda

File tree

13 files changed

+76
-76
lines changed

13 files changed

+76
-76
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ jobs:
299299
context: .
300300
file: tee-worker/omni-executor/Dockerfile
301301
tags: litentry/omni-executor:latest
302-
target: executor-worker
302+
target: omni-executor
303303
build-args: |
304304
CARGO_FEATURES=mock-server
305305

tee-worker/omni-executor/Cargo.lock

Lines changed: 44 additions & 44 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tee-worker/omni-executor/Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ RUN if [ -n "$CARGO_FEATURES" ]; then \
2323

2424
### Deploy image (for CI - No Gramine)
2525
##################################################
26-
FROM node:20-bookworm-slim AS executor-worker
26+
FROM node:20-bookworm-slim AS omni-executor
2727

2828
ENV SRC_DIR=/home/ubuntu/tee-worker/omni-executor
2929
ENV BIN_DIR=/usr/local/bin
@@ -32,13 +32,13 @@ WORKDIR $BIN_DIR
3232
RUN apt update && apt install -y ca-certificates curl
3333
RUN corepack enable && corepack prepare pnpm@8.7.6 --activate && corepack enable pnpm
3434

35-
COPY --from=plain-builder $SRC_DIR/target/release/executor-worker $BIN_DIR/executor-worker
35+
COPY --from=plain-builder $SRC_DIR/target/release/omni-executor $BIN_DIR/omni-executor
3636
COPY --from=plain-builder $SRC_DIR/local/keystore $BIN_DIR/local/keystore
3737

38-
RUN chmod +x $BIN_DIR/executor-worker
38+
RUN chmod +x $BIN_DIR/omni-executor
3939
RUN ls -al $BIN_DIR
40-
RUN ldd $BIN_DIR/executor-worker && $BIN_DIR/executor-worker --version
41-
CMD ["$BIN_DIR/executor-worker"]
40+
RUN ldd $BIN_DIR/omni-executor && $BIN_DIR/omni-executor --version
41+
CMD ["$BIN_DIR/omni-executor"]
4242

4343

4444
### Builder Stage - With Gramine (SGX Hardware)

tee-worker/omni-executor/Dockerfile.local

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22

33
### Local binary deployment image
44
##################################################
5-
FROM ubuntu:24.04 AS executor-worker
5+
FROM ubuntu:24.04 AS omni-executor
66

77
ENV BIN_DIR=/usr/local/bin
88
WORKDIR $BIN_DIR
99

1010
RUN apt update && apt install -y ca-certificates curl
1111

1212
# Copy the pre-built binary from local target directory
13-
COPY target/release/executor-worker $BIN_DIR/executor-worker
13+
COPY target/release/omni-executor $BIN_DIR/omni-executor
1414
COPY local/keystore $BIN_DIR/local/keystore
1515

16-
RUN chmod +x $BIN_DIR/executor-worker
16+
RUN chmod +x $BIN_DIR/omni-executor
1717
RUN ls -al $BIN_DIR
18-
RUN ldd $BIN_DIR/executor-worker && $BIN_DIR/executor-worker --version
18+
RUN ldd $BIN_DIR/omni-executor && $BIN_DIR/omni-executor --version
1919

20-
CMD ["executor-worker"]
20+
CMD ["omni-executor"]

tee-worker/omni-executor/LOCAL_DEV.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ RUST_LOG=debug
180180

181181
1. Check if the binary was built with mock-server feature:
182182
```bash
183-
./target/release/executor-worker --help | grep mock
183+
./target/release/omni-executor --help | grep mock
184184
```
185185

186186
2. Check if mock server is starting:
@@ -241,7 +241,7 @@ For even faster development, you can run the omni-executor directly without Dock
241241

242242
3. Run omni-executor:
243243
```bash
244-
./target/release/executor-worker run --enable-mock-server
244+
./target/release/omni-executor run --enable-mock-server
245245
```
246246

247247
## Account Funding and EntryPoint Deposits

tee-worker/omni-executor/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ endif
2525
.PHONY: $(BIN_NAME)
2626
$(BIN_NAME):
2727
cargo build --release --locked --features=$(COMPILATION_FEATURES)
28-
cp target/release/executor-worker $(BIN_NAME)
28+
cp target/release/omni-executor $(BIN_NAME)
2929

3030

3131
ifeq ($(DEBUG),1)
@@ -77,7 +77,7 @@ clean-data:
7777

7878
.PHONY: build-docker
7979
build-docker:
80-
docker build --target executor-worker -t litentry/$(BIN_NAME):latest -f $(OMNI_DIR)/Dockerfile $(ROOTDIR)
80+
docker build --target omni-executor -t litentry/$(BIN_NAME):latest -f $(OMNI_DIR)/Dockerfile $(ROOTDIR)
8181

8282
.PHONY: start-local
8383
start-local:
@@ -94,7 +94,7 @@ stop-local:
9494

9595
.PHONY: build-docker-test
9696
build-docker-test:
97-
docker build --build-arg CARGO_FEATURES="mock-server,test-endpoints" --target executor-worker -t litentry/$(BIN_NAME):latest -f $(OMNI_DIR)/Dockerfile $(ROOTDIR)
97+
docker build --build-arg CARGO_FEATURES="mock-server,test-endpoints" --target omni-executor -t litentry/$(BIN_NAME):latest -f $(OMNI_DIR)/Dockerfile $(ROOTDIR)
9898

9999
.PHONY: rebuild-docker-dev
100100
rebuild-docker-dev:

tee-worker/omni-executor/bin/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[package]
2-
name = "executor-worker"
2+
name = "omni-executor"
33
version = "0.1.0"
44
authors = ['Trust Computing GmbH <info@litentry.com>']
55
edition.workspace = true

tee-worker/omni-executor/docker/docker-compose.test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ services:
22
omni-executor:
33
env_file:
44
- ../.env.test
5-
command: ["executor-worker", "run", "--enable-mock-server"]
5+
command: ["omni-executor", "run", "--enable-mock-server"]
66
ports:
77
- "2100:2100"
88
- "3456:3456"

tee-worker/omni-executor/docker/docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services:
55
build:
66
context: ..
77
dockerfile: Dockerfile.local
8-
target: executor-worker
8+
target: omni-executor
99
volumes:
1010
- ../local/keystore:/local/keystore
1111
- shared_contracts:/shared:ro
@@ -31,7 +31,7 @@ services:
3131
aa-contracts-deploy:
3232
condition: service_completed_successfully
3333
entrypoint: ["/entrypoint.sh"]
34-
command: ["executor-worker", "run", "--enable-mock-server"]
34+
command: ["omni-executor", "run", "--enable-mock-server"]
3535
privileged: true
3636
restart: unless-stopped
3737
networks:

tee-worker/omni-executor/docker/jsonrpc-mock-tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@ services:
55
volumes:
66
- ../ts-tests:/ts-tests
77
- ../../client-api:/client-api
8-
- ../ts-tests/cli:/usr/local/executor-worker-cli
8+
- ../ts-tests/cli:/usr/local/omni-executor-cli
99
build:
1010
context: ${PWD}/../../
1111
dockerfile: tee-worker/omni-executor/Dockerfile
12-
target: executor-worker
12+
target: omni-executor
1313
depends_on:
1414
omni-executor:
1515
condition: service_healthy
1616
restart: true
1717
networks:
1818
- litentry-test-network
19-
entrypoint: "sh -c '/usr/local/executor-worker-cli/ts_jsonrpc_mock_test.sh 3>&1' "
19+
entrypoint: "sh -c '/usr/local/omni-executor-cli/ts_jsonrpc_mock_test.sh 3>&1' "
2020
restart: "no"
2121
networks:
2222
litentry-test-network:

0 commit comments

Comments
 (0)