Skip to content

Commit

Permalink
[DNS/WIP/TEST] Can we build the image with docker in SLSA now?
Browse files Browse the repository at this point in the history
Change-Id: Id6589cc258bbc9d3f8562fb784ee220895994a58
  • Loading branch information
jblebrun committed Apr 18, 2024
1 parent 01a7f5f commit 51470bf
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 12 deletions.
20 changes: 10 additions & 10 deletions .github/workflows/provenance.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,17 @@ jobs:
fail-fast: false
matrix:
buildconfig:
- buildconfigs/key_xor_test_app.toml
- buildconfigs/oak_containers_kernel.toml
- buildconfigs/oak_containers_stage1.toml
#- buildconfigs/key_xor_test_app.toml
#- buildconfigs/oak_containers_kernel.toml
#- buildconfigs/oak_containers_stage1.toml
- buildconfigs/oak_containers_system_image.toml
- buildconfigs/oak_echo_enclave_app.toml
- buildconfigs/oak_echo_raw_enclave_app.toml
- buildconfigs/oak_functions_enclave_app.toml
- buildconfigs/oak_functions_insecure_enclave_app.toml
- buildconfigs/oak_restricted_kernel_simple_io_init_rd_wrapper_bin.toml
- buildconfigs/stage0_bin.toml
- buildconfigs/oak_orchestrator.toml
#- buildconfigs/oak_echo_enclave_app.toml
#- buildconfigs/oak_echo_raw_enclave_app.toml
#- buildconfigs/oak_functions_enclave_app.toml
#- buildconfigs/oak_functions_insecure_enclave_app.toml
#- buildconfigs/oak_restricted_kernel_simple_io_init_rd_wrapper_bin.toml
#- buildconfigs/stage0_bin.toml
#- buildconfigs/oak_orchestrator.toml

permissions:
actions: read
Expand Down
3 changes: 2 additions & 1 deletion buildconfigs/oak_containers_system_image.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@
# building the `stage1` binary, and its provenance.
# See https://github.com/slsa-framework/slsa-github-generator/tree/main/internal/builders/docker.
command = [
"--volume=/var/run/docker.sock:/var/run/docker.sock",
"nix",
"develop",
".#systemImageProvenance",
"--command",
"just",
"oak_containers_system_image",
"oak_containers_system_base_image",
]
artifact_path = "./oak_containers_system_image/target/image.tar.xz"
4 changes: 3 additions & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,9 @@
rust
bazelShell
];
packages = [ ];
packages = [
docker
];
};
# Shell for most CI steps (i.e. without contaniners support).
ci = pkgs.mkShell {
Expand Down
3 changes: 3 additions & 0 deletions justfile
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,9 @@ oak_containers_kernel:
oak_containers_system_image:
env --chdir=oak_containers_system_image DOCKER_BUILDKIT=0 bash build.sh

oak_containers_system_base_image:
env --chdir=oak_containers_system_image DOCKER_BUILDKIT=0 bash build-base.sh

# Profile the Wasm execution and generate a flamegraph.
profile_wasm:
# If it fails with SIGSEGV, try running again.
Expand Down

0 comments on commit 51470bf

Please sign in to comment.