prepare release

Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:focal-20210713 AS build
+FROM ubuntu:focal-20210827 AS build
 
 RUN apt update && DEBIAN_FRONTEND=noninteractive apt install -y \
   bbe \
@@ -13,7 +13,7 @@ RUN apt update && DEBIAN_FRONTEND=noninteractive apt install -y \
   ninja-build=1.10.0-1build1 \
   zlib1g-dev=1:1.2.11.dfsg-2ubuntu1.2
 
-ARG erttag=v0.2.6 edbtag=v0.1.0
+ARG erttag=v0.2.7 edbtag=v0.1.1
 RUN git clone -b $erttag --depth=1 https://github.com/edgelesssys/edgelessrt \
   && git clone -b $edbtag --depth=1 https://github.com/edgelesssys/edgelessdb \
   && mkdir ertbuild edbbuild
@@ -38,7 +38,7 @@ RUN --mount=type=secret,id=signingkey,dst=/edbbuild/private.pem,required=true \
   && make sign-edb
 
 # deploy
-FROM ubuntu:focal-20210713
+FROM ubuntu:focal-20210827
 ARG PSW_VERSION=2.13.103.1-focal1 DCAP_VERSION=1.10.103.1-focal1
 RUN apt update && apt install -y gnupg wget \
   && wget -qO- https://download.01.org/intel-sgx/sgx_repo/ubuntu/intel-sgx-deb.key | apt-key add \

ROADMAP.md

@@ -1,9 +1,9 @@
 # EdgelessDB roadmap
 
-<!--## Recently completed-->
+## Recently completed
+* MarbleRun integration
 
 ## Near-term and mid-term
-* MarbleRun integration
 * Azure Marketplace offering
 * Improve performance
 

edb/integration_test.go

@@ -917,7 +917,7 @@ func startMockMarblerunCoordinator(jsonManifest []byte) (*grpc.Server, string, e
 	privKeyPEM := string(pem.EncodeToMemory(&pem.Block{Type: "PRIVATE KEY", Bytes: privKeyPKCS8}))
 	secertRootCert, secretRootKey := createMarbleSecretCertificate(rootCertPEM, privKeyPEM)
 
-	marbleServer := marbleServer{dataDir: tempDir, rootCert: rootCertPEM, secretRootCert: secertRootCert, secretRootKey: secretRootKey, manifest: string(jsonManifest)}
+	marbleServer := marbleServer{dataDir: tempDir, rootCert: rootCertPEM, secretRootCert: secertRootCert, secretRootKey: secretRootKey, manifest: jsonManifest}
 	rpc.RegisterMarbleServer(server, marbleServer)
 
 	listener, err := net.Listen("tcp", "localhost:")
@@ -937,15 +937,25 @@ func startMockMarblerunCoordinator(jsonManifest []byte) (*grpc.Server, string, e
 }
 
 type marbleServer struct {
+	rpc.UnimplementedMarbleServer
 	dataDir        string
 	rootCert       string
 	secretRootCert string
 	secretRootKey  string
-	manifest       string
+	manifest       []byte
 }
 
 func (m marbleServer) Activate(context.Context, *rpc.ActivationReq) (*rpc.ActivationResp, error) {
 	return &rpc.ActivationResp{Parameters: &rpc.Parameters{
-		Env:   map[string]string{core.EnvAPIAddress: addrAPI, core.EnvDatabaseAddress: addrDB, core.EnvDataPath: m.dataDir, core.ERocksDBMasterKeyVar: "4142434445464748494a4b4c4d4e4f50", marble.MarbleEnvironmentRootCA: m.rootCert, db.EnvRootCertificate: m.secretRootCert, db.EnvRootKey: m.secretRootKey, core.EnvManifestFile: "/tmp/manifest.json"},
-		Files: map[string]string{"/tmp/manifest.json": m.manifest}}}, nil
+		Env: map[string][]byte{
+			core.EnvAPIAddress:             []byte(addrAPI),
+			core.EnvDatabaseAddress:        []byte(addrDB),
+			core.EnvDataPath:               []byte(m.dataDir),
+			core.ERocksDBMasterKeyVar:      []byte("4142434445464748494a4b4c4d4e4f50"),
+			marble.MarbleEnvironmentRootCA: []byte(m.rootCert),
+			db.EnvRootCertificate:          []byte(m.secretRootCert),
+			db.EnvRootKey:                  []byte(m.secretRootKey),
+			core.EnvManifestFile:           []byte("/tmp/manifest.json")},
+		Files: map[string][]byte{"/tmp/manifest.json": m.manifest}},
+	}, nil
 }

go.mod

@@ -3,12 +3,12 @@ module github.com/edgelesssys/edgelessdb
 go 1.14
 
 require (
-	github.com/edgelesssys/ego v0.3.1
-	github.com/edgelesssys/era v0.3.0
-	github.com/edgelesssys/marblerun v0.4.0
+	github.com/edgelesssys/ego v0.3.2
+	github.com/edgelesssys/era v0.3.1
+	github.com/edgelesssys/marblerun v0.5.0
 	github.com/fatih/color v1.12.0
 	github.com/go-sql-driver/mysql v1.6.0
 	github.com/spf13/afero v1.6.0
 	github.com/stretchr/testify v1.7.0
-	google.golang.org/grpc v1.39.0
+	google.golang.org/grpc v1.40.0
 )