提交 62f0bb3c 编写于 作者: J jiazhiguang 提交者: jia zhang

supports build and sign enclave on host of CentOS 7.1 OS

上级 e48e5529
...@@ -97,9 +97,9 @@ func (s *service) carrierMain(req *taskAPI.CreateTaskRequest) (carrier.Carrier, ...@@ -97,9 +97,9 @@ func (s *service) carrierMain(req *taskAPI.CreateTaskRequest) (carrier.Carrier,
} }
timeStart = time.Now() timeStart = time.Now()
materialRealPath := signingMaterial materialRealPath := signingMaterial
if carrierKind == rune.Occlum { //if carrierKind == rune.Occlum {
materialRealPath = filepath.Join(req.Bundle, signingMaterial) // materialRealPath = filepath.Join(req.Bundle, signingMaterial)
} //}
if cfg.Signature.ServerAddress == "" { if cfg.Signature.ServerAddress == "" {
publicKey, signature, err = mockSign(materialRealPath) publicKey, signature, err = mockSign(materialRealPath)
if err != nil { if err != nil {
......
...@@ -329,10 +329,10 @@ func (s *service) Create(ctx context.Context, r *taskAPI.CreateTaskRequest) (_ * ...@@ -329,10 +329,10 @@ func (s *service) Create(ctx context.Context, r *taskAPI.CreateTaskRequest) (_ *
timeStart = time.Now() timeStart = time.Now()
container, err := runc.NewContainer(ctx, s.platform, r) container, err := runc.NewContainer(ctx, s.platform, r)
/*if carr.Name() == "occlum" { /*//FIXME debug
if carrierKind == "occlum" {
//if err != nil { //if err != nil {
// logrus.Errorf("rune Create NewContainer error: %++v", err) // logrus.Errorf("rune Create NewContainer error: %++v", err)
//FIXME debug
if _, err := os.Stat(r.Bundle); err == nil { if _, err := os.Stat(r.Bundle); err == nil {
path := "/tmp/rune-container-test/runc-rootfs" path := "/tmp/rune-container-test/runc-rootfs"
os.RemoveAll(path) os.RemoveAll(path)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册