Merge branch 'master' into coax1d-listening-for-xsfer-events

integritee-network · Jun 15, 2023 · 23f37d6 · 23f37d6
2 parents 375ed8f + 8c17f52
commit 23f37d6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git 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

diff --git 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
 

diff --git 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",