From d8019794efc91e8d7846c882438786fb711c97c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Szil=C3=A1rd=20Parrag?= Date: Wed, 14 Jun 2023 09:49:08 +0200 Subject: [PATCH 1/3] docker: private caching, for details see `sharing`: https://github.com/moby/buildkit/blob/master/frontend/dockerfile/docs/reference.md?plain=1#L650 (#1356) --- build.Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.Dockerfile b/build.Dockerfile index 8f4cda2f57..fdc03795d2 100644 --- a/build.Dockerfile +++ b/build.Dockerfile @@ -68,9 +68,9 @@ WORKDIR $WORKHOME/worker COPY . . -RUN --mount=type=cache,id=cargo-registry-cache,target=/opt/rust/registry/cache \ - --mount=type=cache,id=cargo-registry-index,target=/opt/rust/registry/index \ - --mount=type=cache,id=cargo-git,target=/opt/rust/git/db \ +RUN --mount=type=cache,id=cargo-registry-cache,target=/opt/rust/registry/cache,sharing=private \ + --mount=type=cache,id=cargo-registry-index,target=/opt/rust/registry/index,sharing=private \ + --mount=type=cache,id=cargo-git,target=/opt/rust/git/db,sharing=private \ --mount=type=cache,id=cargo-sccache-${WORKER_MODE}${ADDITIONAL_FEATURES},target=/home/ubuntu/.cache/sccache \ echo ${FINGERPRINT} && make && make identity && cargo test --release && sccache --show-stats From 7d399738cc1756c7d2eae5a699b4b20ee82a829f Mon Sep 17 00:00:00 2001 From: clangenb <37865735+clangenb@users.noreply.github.com> Date: Wed, 14 Jun 2023 13:22:31 +0200 Subject: [PATCH 2/3] [local-setup] fix setup with two workers: avoid using the same data dirs. (#1358) --- local-setup/config/two-workers.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/local-setup/config/two-workers.json b/local-setup/config/two-workers.json index 51acefce9b..6d5e2316da 100644 --- a/local-setup/config/two-workers.json +++ b/local-setup/config/two-workers.json @@ -55,7 +55,7 @@ "4546", "--ws-external", "--data-dir", - "/tmp/data-dir" + "/tmp/data-dir2" ], "subcommand_flags": [ "--skip-ra", From 8c17f521c19edc58161a2901dcf753b1e7f101e4 Mon Sep 17 00:00:00 2001 From: mosonyi Date: Wed, 14 Jun 2023 15:25:55 +0200 Subject: [PATCH 3/3] Added dcap flag to teeracle#1191 (#1357) --- .github/workflows/build_and_test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 9dcf87e2b4..770fc1089c 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -367,6 +367,7 @@ jobs: - flavor_id: teeracle mode: teeracle sgx_mode: HW + worker_features: dcap steps: - uses: actions/checkout@v3 @@ -422,7 +423,7 @@ jobs: run: > docker build -t integritee/${{ matrix.flavor_id }}:${{ github.ref_name }} --target deployed-worker - --build-arg WORKER_MODE_ARG=${{ matrix.mode }} --build-arg SGX_COMMERCIAL_KEY=enclave-runtime/intel_sgx.pem --build-arg SGX_PASSFILE=enclave-runtime/passfile.txt --build-arg SGX_PRODUCTION=1 --build-arg ADDITIONAL_FEATURES_ARG=${{ matrix.additional_features }} --build-arg SGX_MODE=${{ matrix.sgx_mode }} + --build-arg WORKER_MODE_ARG=${{ matrix.mode }} --build-arg SGX_COMMERCIAL_KEY=enclave-runtime/intel_sgx.pem --build-arg SGX_PASSFILE=enclave-runtime/passfile.txt --build-arg SGX_PRODUCTION=1 --build-arg WORKER_FEATURES_ARG=${{ matrix.worker_features }} --build-arg ADDITIONAL_FEATURES_ARG=${{ matrix.additional_features }} --build-arg SGX_MODE=${{ matrix.sgx_mode }} -f build.Dockerfile . - name: Save released teeracle