harald/teepot
1
0
Fork 0
mirror of https://github.com/matter-labs/teepot.git synced 2025-07-21 15:13:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #143 from matter-labs/nixsgxLib.mkSGXContainer

Browse source 
feat: use `nixsgxLib.mkSGXContainer`
This commit is contained in:
Harald Hoyer 2024-07-01 17:55:33 +02:00 • committed by GitHub
commit 81f42e7120
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 22 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

18
flake.lock generated
View file

@ -165,11 +165,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1717281328,
"narHash": "sha256-evZPzpf59oNcDUXxh2GHcxHkTEG4fjae2ytWP85jXRo=",
"lastModified": 1719707984,
"narHash": "sha256-RoxIr/fbndtuKqulGvNCcuzC6KdAib85Q8gXnjzA1dw=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "b3b2b28c1daa04fe2ae47c21bb76fd226eac4ca1",
"rev": "7dca15289a1c2990efbe4680f0923ce14139b042",
"type": "github"
},
"original": {
@ -201,11 +201,11 @@
"snowfall-lib": "snowfall-lib"
},
"locked": {
"lastModified": 1718699802,
"narHash": "sha256-1Q+xMLgggLj2W/u8M1zJeqqGMDRoEjIeve12Jt4EAXM=",
"lastModified": 1719845153,
"narHash": "sha256-i2S/3JenGdtUFublhYSnfoUGcvIyngUBlF3l3XKsn08=",
"owner": "matter-labs",
"repo": "nixsgx",
"rev": "d9eb744741368eb13fc2247cb3603551828d623f",
"rev": "07ae787761c3c7195d743f16d18071daf5f49dfd",
"type": "github"
},
"original": {
@ -281,11 +281,11 @@
]
},
"locked": {
"lastModified": 1716675292,
"narHash": "sha256-7TFvVE4HR/b65/0AAhewYHEJzUXxIEJn82ow5bCkrDo=",
"lastModified": 1719005984,
"narHash": "sha256-mpFl3Jv4fKnn+5znYXG6SsBjfXHJdRG5FEqNSPx0GLA=",
"owner": "snowfallorg",
"repo": "lib",
"rev": "5d6e9f235735393c28e1145bec919610b172a20f",
"rev": "c6238c83de101729c5de3a29586ba166a9a65622",
"type": "github"
},
"original": {

9
packages/container-self-attestation-test-sgx-azure/default.nix
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;

9
packages/container-vault-admin-sgx-azure/default.nix
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;

9
packages/container-vault-sgx-azure/default.nix
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;

13
packages/container-vault-unseal-sgx-azure/default.nix
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";