Skip to content

Conversation

@csegarragonz
Copy link
Collaborator

@csegarragonz csegarragonz commented Mar 14, 2022

In this PR I remove SGX completely from the default (base,worker,cli) containers. As suggested, I re-purpose the sgx.dockerfile into base-sgx.dockerfile that inherits from base with SGX installed. As a result, we generate the following new docker images: base-sgx, base-sgx-sim, worker-sgx, worker-sgx-sim, cli-sgx, cli-sgx-sim. All of them are created as a parallelised Release workflow file with the following stages and dependencies (images in the same column are built in parallel through a matrix):

            ┌─  worker
            │
minio    ┌──┼── cli                ┌─ worker-sgx
         │  │                      │
redis    │  └─  upload             ├──worker-sgx-sim
         │                         │
base ────┴──┬── base-sgx   ────┐   ├──cli-sgx
            │                  ├───┤
            └─  base-sgx-sim  ─┘   └─ cli-sgx-sim

Closes #617

@csegarragonz csegarragonz self-assigned this Mar 14, 2022
@csegarragonz csegarragonz added the wasm/wamr-sgx SGX related stuff. label Mar 14, 2022
@csegarragonz csegarragonz force-pushed the sgxless branch 3 times, most recently from 7519463 to 6aa554e Compare March 15, 2022 07:10
@csegarragonz csegarragonz marked this pull request as ready for review March 15, 2022 08:40
clean:
runs-on: ubuntu-20.04
steps:
- name: "Prune docker"
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This diff is quite confusing, you can browse the file here.

- name: "Run the tests"
run: /build/faasm/bin/tests

sgx-tests:
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't merge this with tests as a single job with a matrix because tests already has the sanitisers matrix, and we only want to run the SGX tests with no sanitisers.

@csegarragonz csegarragonz requested a review from Shillaker March 15, 2022 11:07
Copy link
Collaborator

@Shillaker Shillaker left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome, actually a lot cleaner than I thought it would be 👍

@csegarragonz csegarragonz merged commit e0af5ed into main Mar 15, 2022
@csegarragonz csegarragonz deleted the sgxless branch March 15, 2022 11:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

wasm/wamr-sgx SGX related stuff.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Completely remove SGX from normal build and test

3 participants