Skip to content

Commit

Permalink
test
Browse files Browse the repository at this point in the history
  • Loading branch information
msanft committed Jul 23, 2024
1 parent 26fee9b commit be60cda
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 4 deletions.
1 change: 1 addition & 0 deletions .github/workflows/e2e_servicemesh.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ jobs:
contents: read
packages: write
steps:
- uses: katexochen/maximize-build-space@b854245e02dde1ed04010b6b2ab526905f2b4deb # btrfs
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- uses: ./.github/actions/setup_nix
with:
Expand Down
2 changes: 1 addition & 1 deletion justfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ push target:
#!/usr/bin/env bash
set -euo pipefail
mkdir -p {{ workspace_dir }}
pushedImg=$(nix run .#containers.push-{{ target }} -- "$container_registry/contrast/{{ target }}")
pushedImg=$(nix run -L .#containers.push-{{ target }} -- "$container_registry/contrast/{{ target }}")
printf "ghcr.io/edgelesssys/contrast/%s:latest=%s\n" "{{ target }}" "$pushedImg" >> {{ workspace_dir }}/just.containerlookup
# Build the coordinator, containerize and push it.
Expand Down
2 changes: 2 additions & 0 deletions packages/by-name/kata/kata-image/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
cryptsetup,
closureInfo,
erofs-utils,
strace,
}:

let
Expand Down Expand Up @@ -137,6 +138,7 @@ stdenv.mkDerivation rec {
util-linux
tdnf
buildimage
strace
];

sourceRoot = "${src.name}/tools/osbuilder/rootfs-builder";
Expand Down
1 change: 0 additions & 1 deletion packages/by-name/kata/runtime-class-files/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ stdenvNoCC.mkDerivation {
buildPhase = ''
mkdir -p $out
sha256sum ${image} ${kernel} ${qemu-snp.bin} ${qemu-tdx.bin} ${containerd-shim-contrast-cc-v2} ${ovmf-snp} ${ovmf-tdx} | sha256sum | cut -d " " -f 1 > $out/launch-digest.hex
printf "contrast-cc-%s" "$(cat $out/launch-digest.hex | head -c 32)" > $out/runtime-handler
'';

passthru = {
Expand Down
2 changes: 0 additions & 2 deletions packages/by-name/microsoft/runtime-class-files/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ stdenvNoCC.mkDerivation {
buildPhase = ''
mkdir -p $out
igvmmeasure -b ${igvm} | dd conv=lcase > $out/launch-digest.hex
echo -n "contrast-cc-" > $out/runtime-handler
cat $out/launch-digest.hex | head -c 32 >> $out/runtime-handler
'';

passthru = {
Expand Down

0 comments on commit be60cda

Please sign in to comment.