From 228a1351ca867b6397388ec2f2febb3ac3f25434 Mon Sep 17 00:00:00 2001 From: BillyWooo Date: Mon, 2 Dec 2024 19:36:47 +0000 Subject: [PATCH 1/4] fix leftover since last change of dockerfile. --- tee-worker/omni-executor/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tee-worker/omni-executor/Makefile b/tee-worker/omni-executor/Makefile index ca29247675..ff6ad4afb5 100644 --- a/tee-worker/omni-executor/Makefile +++ b/tee-worker/omni-executor/Makefile @@ -69,8 +69,7 @@ distclean: clean # By default SGX_MODE=SW for docker image .PHONY: build-docker build-docker: - docker build --target builder -t local-builder:latest -f $(EXECUTOR_DIR)/Dockerfile $(ROOTDIR) - docker build --target executor-worker -t litentry/omni-executor:latest -f -f $(EXECUTOR_DIR)/Dockerfile $(ROOTDIR) + docker build --target executor-worker -t litentry/omni-executor:latest -f $(EXECUTOR_DIR)/Dockerfile $(ROOTDIR) .PHONY: start-local start-local: From df6711c2582c1278288490f64c3a8beb65ae3073 Mon Sep 17 00:00:00 2001 From: BillyWooo Date: Tue, 3 Dec 2024 11:00:46 +0000 Subject: [PATCH 2/4] only work within omni folder. Nother else. --- .github/workflows/ci.yml | 4 ++-- tee-worker/omni-executor/Dockerfile | 24 +++++++++++------------- tee-worker/omni-executor/Makefile | 12 ++++++------ 3 files changed, 19 insertions(+), 21 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d9be18b0ea..48bc90bfd1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -642,8 +642,8 @@ jobs: if: needs.set-condition.outputs.rebuild_omni_executor == 'true' uses: docker/build-push-action@v6 with: - context: . - file: tee-worker/omni-executor/Dockerfile + context: tee-worker/omni-executor/ + file: Dockerfile tags: litentry/omni-executor:latest target: executor-worker diff --git a/tee-worker/omni-executor/Dockerfile b/tee-worker/omni-executor/Dockerfile index 7e46d40ac5..8e84fc6337 100644 --- a/tee-worker/omni-executor/Dockerfile +++ b/tee-worker/omni-executor/Dockerfile @@ -5,11 +5,10 @@ # rust:1.82 is a Debian GNU/Linux 12 (bookworm) image FROM rust:1.82-bookworm AS plain-builder -ENV HOME=/home/ubuntu -ENV BUILD_DIR=$HOME/tee-worker/omni-executor +ENV SRC_DIR=/home/ubuntu/omni-executor -COPY . $HOME -WORKDIR $BUILD_DIR +COPY . $SRC_DIR +WORKDIR $SRC_DIR RUN cargo build --release @@ -18,18 +17,17 @@ RUN cargo build --release ################################################## FROM node:20-bookworm-slim AS executor-worker -ENV HOME=/home/ubuntu -ENV BUILD_DIR=$HOME/tee-worker/omni-executor -ENV EXECUT_DIR=/usr/local/bin -WORKDIR $EXECUT_DIR +ENV SRC_DIR=/home/ubuntu/omni-executor +ENV BIN_DIR=/usr/local/bin +WORKDIR $BIN_DIR RUN apt update && apt install -y ca-certificates -COPY --from=plain-builder $BUILD_DIR/target/release/executor-worker $EXECUT_DIR/executor-worker +COPY --from=plain-builder $SRC_DIR/target/release/executor-worker $BIN_DIR/executor-worker -RUN chmod +x $EXECUT_DIR/executor-worker -RUN ls -al $EXECUT_DIR -RUN ldd $EXECUT_DIR/executor-worker && $EXECUT_DIR/executor-worker --version -CMD ["$EXECUT_DIR/executor-worker"] +RUN chmod +x $BIN_DIR/executor-worker +RUN ls -al $BIN_DIR +RUN ldd $BIN_DIR/executor-worker && $BIN_DIR/executor-worker --version +CMD ["$BIN_DIR/executor-worker"] diff --git a/tee-worker/omni-executor/Makefile b/tee-worker/omni-executor/Makefile index ff6ad4afb5..7a8fd4f4dc 100644 --- a/tee-worker/omni-executor/Makefile +++ b/tee-worker/omni-executor/Makefile @@ -4,11 +4,11 @@ ARCH_LIBDIR ?= /lib/$(shell $(CC) -dumpmachine) SGX_MODE ?= HW -SELF_EXE = omni-executor-worker +SELF_EXE = executor-worker COMPILATION_FEATURES = ROOTDIR := $(shell git rev-parse --show-toplevel) -EXECUTOR_DIR := $(ROOTDIR)/tee-worker/omni-executor +OMNI_DIR := $(ROOTDIR)/tee-worker/omni-executor .PHONY: all all: $(SELF_EXE) omni-executor.manifest @@ -20,7 +20,7 @@ endif .PHONY: $(SELF_EXE) $(SELF_EXE): cargo build --release --features=$(COMPILATION_FEATURES) - cp target/release/executor-worker $(SELF_EXE) + cp target/release/$(SELF_EXE) $(SELF_EXE) ifeq ($(DEBUG),1) @@ -69,15 +69,15 @@ distclean: clean # By default SGX_MODE=SW for docker image .PHONY: build-docker build-docker: - docker build --target executor-worker -t litentry/omni-executor:latest -f $(EXECUTOR_DIR)/Dockerfile $(ROOTDIR) + docker build --target executor-worker -t litentry/omni-executor:latest -f $(OMNI_DIR)/Dockerfile $(OMNI_DIR) .PHONY: start-local start-local: - docker compose -f $(EXECUTOR_DIR)/docker/docker-compose.yml up + docker compose -f $(OMNI_DIR)/docker/docker-compose.yml up .PHONY: stop-local stop-local: - docker compose -f $(EXECUTOR_DIR)/docker/docker-compose.yml down + docker compose -f $(OMNI_DIR)/docker/docker-compose.yml down .PHONY: get-pallet-metadata get-pallet-metadata: From b34f41fa98804f76f8fff0b621d78218146474cc Mon Sep 17 00:00:00 2001 From: BillyWooo Date: Tue, 3 Dec 2024 13:37:22 +0000 Subject: [PATCH 3/4] not change the file path --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 48bc90bfd1..3f62ab761b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -643,7 +643,7 @@ jobs: uses: docker/build-push-action@v6 with: context: tee-worker/omni-executor/ - file: Dockerfile + file: tee-worker/omni-executor/Dockerfile tags: litentry/omni-executor:latest target: executor-worker From ca28a8ba785b00af1abddae65d47dffc3b192ec9 Mon Sep 17 00:00:00 2001 From: BillyWooo Date: Tue, 3 Dec 2024 14:16:39 +0000 Subject: [PATCH 4/4] avoid duplicate file and folder name --- tee-worker/omni-executor/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tee-worker/omni-executor/Makefile b/tee-worker/omni-executor/Makefile index 7a8fd4f4dc..72b7499099 100644 --- a/tee-worker/omni-executor/Makefile +++ b/tee-worker/omni-executor/Makefile @@ -4,7 +4,7 @@ ARCH_LIBDIR ?= /lib/$(shell $(CC) -dumpmachine) SGX_MODE ?= HW -SELF_EXE = executor-worker +SELF_EXE = omni-executor-worker COMPILATION_FEATURES = ROOTDIR := $(shell git rev-parse --show-toplevel) @@ -20,7 +20,7 @@ endif .PHONY: $(SELF_EXE) $(SELF_EXE): cargo build --release --features=$(COMPILATION_FEATURES) - cp target/release/$(SELF_EXE) $(SELF_EXE) + cp target/release/executor-worker $(SELF_EXE) ifeq ($(DEBUG),1)