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 c185297
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
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
3 changes: 3 additions & 0 deletions packages/by-name/kata/kata-image/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,9 @@ stdenv.mkDerivation rec {
--bind /build/var /var \
--dev-bind /dev/null /dev/null \
fakeroot bash -c "bash $(pwd)/rootfs.sh -r /build/root ${distro} && \
echo '++ rootfs built ++' && \
ls -lah /build/root/usr/lib && \
cat /build/root/usr/lib/libnpth.so.0 && \
tar \
--exclude='./usr/lib/systemd/system/systemd-coredump@*' \
--exclude='./usr/lib/systemd/system/systemd-journald*' \
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 c185297

Please sign in to comment.