feat: use nixsgxLib.mkSGXContainer

Signed-off-by: Harald Hoyer <harald@matterlabs.dev>
This commit is contained in:
Harald Hoyer 2024-07-01 16:33:00 +02:00
parent 4e5083def9
commit 943ef8c878
Signed by: harald
GPG key ID: F519A1143B3FBE32
5 changed files with 22 additions and 36 deletions

View file

@ -1,15 +1,12 @@
# SPDX-License-Identifier: Apache-2.0
# Copyright (c) 2024 Matter Labs
{ lib
, pkgs
, inputs
, teepot
, nixsgx
{ teepot
, nixsgxLib
, container-name ? "teepot-self-attestation-test-sgx-azure"
, tag ? null
, isAzure ? true
}:
pkgs.callPackage inputs.nixsgx-flake.lib.mkSGXContainer {
nixsgxLib.mkSGXContainer {
name = container-name;
inherit tag;

View file

@ -1,15 +1,12 @@
# SPDX-License-Identifier: Apache-2.0
# Copyright (c) 2024 Matter Labs
{ lib
, pkgs
, inputs
, teepot
, nixsgx
{ teepot
, nixsgxLib
, container-name ? "teepot-vault-admin-sgx-azure"
, tag ? null
, isAzure ? null
}:
pkgs.callPackage inputs.nixsgx-flake.lib.mkSGXContainer {
nixsgxLib.mkSGXContainer {
name = container-name;
inherit tag;

View file

@ -1,10 +1,7 @@
# SPDX-License-Identifier: Apache-2.0
# Copyright (c) 2024 Matter Labs
{ lib
, pkgs
, inputs
, teepot
, nixsgx
{ teepot
, nixsgxLib
, vat
, vault
, container-name ? "teepot-vault-sgx-azure"
@ -15,7 +12,7 @@ let
entrypoint = "${teepot.teepot.tee_ratls_preexec}/bin/tee-ratls-preexec";
appDir = "/opt/vault";
in
pkgs.callPackage inputs.nixsgx-flake.lib.mkSGXContainer {
nixsgxLib.mkSGXContainer {
name = container-name;
inherit tag;
inherit appDir;

View file

@ -1,18 +1,15 @@
# SPDX-License-Identifier: Apache-2.0
# Copyright (c) 2024 Matter Labs
{ lib
, pkgs
, inputs
, teepot
, nixsgx
{ teepot
, nixsgxLib
, vat
, container-name ? "teepot-vault-unseal-sgx-azure"
, tag ? null
, isAzure ? true
}:
pkgs.callPackage inputs.nixsgx-flake.lib.mkSGXContainer {
nixsgxLib.mkSGXContainer {
name = container-name;
inherit tag;
inherit tag isAzure;
packages = [
vat.vault-auth-tee.sha
@ -20,8 +17,6 @@ pkgs.callPackage inputs.nixsgx-flake.lib.mkSGXContainer {
];
entrypoint = "${teepot.teepot.tee_vault_unseal}/bin/tee-vault-unseal";
isAzure = true;
manifest = {
loader = {
log_level = "error";