Skip to content

Commit

Permalink
Merge pull request #4 from digicatapult/feature/docker-compose
Browse files Browse the repository at this point in the history
docker-compose added
  • Loading branch information
dblane-digicatapult committed Aug 8, 2022
2 parents 19f2db7 + bc0f109 commit f0844db
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 9 deletions.
2 changes: 1 addition & 1 deletion config/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@
"app": {
"port": 3000
}
}
}
8 changes: 4 additions & 4 deletions config/test.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"level": "warn"
},
"morello": {
"address": "100.100.100.100",
"username": "username",
"port": 2222
"address": "localhost",
"username": "root",
"port": 1022
}
}
}
20 changes: 19 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
@@ -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"
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down

0 comments on commit f0844db

Please sign in to comment.