From b16444d324ccc657cb6aca1bf0b29829f1d9473d Mon Sep 17 00:00:00 2001 From: David Blane Date: Thu, 4 Aug 2022 14:45:08 +0100 Subject: [PATCH 1/2] docker-compose added --- config/default.json | 2 +- config/test.json | 8 ++++---- docker-compose.yml | 20 +++++++++++++++++++- 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/config/default.json b/config/default.json index c80194e..1c11c33 100644 --- a/config/default.json +++ b/config/default.json @@ -10,4 +10,4 @@ "app": { "port": 3000 } -} \ No newline at end of file +} diff --git a/config/test.json b/config/test.json index ebbaf7e..53381d1 100644 --- a/config/test.json +++ b/config/test.json @@ -3,8 +3,8 @@ "level": "warn" }, "morello": { - "address": "100.100.100.100", - "username": "username", - "port": 2222 + "address": "localhost", + "username": "root", + "port": 1022 } -} \ No newline at end of file +} diff --git a/docker-compose.yml b/docker-compose.yml index 37e012b..5f16c96 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,3 +1,21 @@ version: '3' -services: {} +services: + morello-sdk-qemu: + image: digicatapult/morello-sdk:v1.0.1 + container_name: morello-sdk-qemu + command: /bin/bash -c " + qemu-system-morello + -machine virt,gic-version=3 + -cpu morello + -bios edk2-aarch64-code.fd + -m 2048 + -nographic + -drive if=none,file=/home/cheri/cheribsd-minimal-morello-purecap.img,id=drv,format=raw + -device virtio-blk-pci,drive=drv + -device virtio-net-pci,netdev=net0 + -netdev 'user,id=net0,hostfwd=tcp::19507-:22' + -device virtio-rng-pci + -snapshot" + ports: + - "1022:19507" From bc0f109c17bec5acadfa003e4c7af3d4322add07 Mon Sep 17 00:00:00 2001 From: David Blane Date: Thu, 4 Aug 2022 14:46:16 +0100 Subject: [PATCH 2/2] Upgrade version --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7b86120..5e4b89b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@digicatapult/morello-api", - "version": "0.1.0", + "version": "0.2.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@digicatapult/morello-api", - "version": "0.1.0", + "version": "0.2.0", "license": "Apache-2.0", "dependencies": { "body-parser": "^1.20.0", diff --git a/package.json b/package.json index c27a677..41f3e32 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@digicatapult/morello-api", - "version": "0.1.0", + "version": "0.2.0", "description": "An interface for executing binaries on it's self and morello host.", "main": "src/index.ts", "scripts": {