From 1005e141a971bdca63d2edfeedd8226a997a214f Mon Sep 17 00:00:00 2001 From: veju Date: Wed, 12 Aug 2026 21:02:29 +0530 Subject: [PATCH] fix: stage missing app sources and correct broken bunnyfiles for mirage and rumprun hvt images Signed-off-by: veju --- .github/workflows/build_images.yml | 29 +++++++++++++++++++ hello-key-mirage/mirage/hvt/bunnyfile-amd64 | 14 +++++++++ net-mirage/mirage/hvt/bunnyfile-amd64 | 12 ++++++++ rumprun-httpreply/rumprun/hvt/bunnyfile-amd64 | 21 ++++++++++++++ rumprun-redis/rumprun/hvt/bunnyfile-amd64 | 20 +++++++++++++ 5 files changed, 96 insertions(+) create mode 100644 hello-key-mirage/mirage/hvt/bunnyfile-amd64 create mode 100644 net-mirage/mirage/hvt/bunnyfile-amd64 create mode 100644 rumprun-httpreply/rumprun/hvt/bunnyfile-amd64 create mode 100644 rumprun-redis/rumprun/hvt/bunnyfile-amd64 diff --git a/.github/workflows/build_images.yml b/.github/workflows/build_images.yml index ae26acc..6810eff 100644 --- a/.github/workflows/build_images.yml +++ b/.github/workflows/build_images.yml @@ -74,6 +74,35 @@ jobs: tags: | type=sha,prefix=${{ inputs.arch }}-,format=long + - name: Stage mirage-skeleton app source + if: ${{ inputs.framework == 'mirage' }} + run: | + git submodule update --init mirage-skeleton + case "${{ inputs.app }}" in + net-mirage) src=device-usage/network ;; + hello-key-mirage) src=tutorial/hello-key ;; + esac + cp "mirage-skeleton/$src/config.ml" "mirage-skeleton/$src/unikernel.ml" \ + "${{ inputs.app }}/${{ inputs.framework }}/${{ inputs.monitor }}/" + + - name: Checkout rumprun-packages + if: ${{ inputs.framework == 'rumprun' }} + uses: actions/checkout@v4 + with: + repository: cloudkernels/rumprun-packages + ref: feat_update_docker + path: rumprun-packages + + - name: Stage rumprun app data + if: ${{ inputs.framework == 'rumprun' }} + run: | + case "${{ inputs.app }}" in + rumprun-httpreply) src=nginx ;; + rumprun-redis) src=redis ;; + esac + cp -r "rumprun-packages/$src/data" \ + "${{ inputs.app }}/${{ inputs.framework }}/${{ inputs.monitor }}/data" + - name: Build and push id: build-and-push uses: docker/build-push-action@v6 diff --git a/hello-key-mirage/mirage/hvt/bunnyfile-amd64 b/hello-key-mirage/mirage/hvt/bunnyfile-amd64 new file mode 100644 index 0000000..919a4af --- /dev/null +++ b/hello-key-mirage/mirage/hvt/bunnyfile-amd64 @@ -0,0 +1,14 @@ +#syntax=harbor.nbfc.io/nubificus/bunny:937585f +version: v0.1 + +platforms: + framework: mirage + monitor: hvt + architecture: x86 + +app: + name: hello-key + from: local + path: . + +cmdline: "--hello=`Bunny`" \ No newline at end of file diff --git a/net-mirage/mirage/hvt/bunnyfile-amd64 b/net-mirage/mirage/hvt/bunnyfile-amd64 new file mode 100644 index 0000000..e1df42c --- /dev/null +++ b/net-mirage/mirage/hvt/bunnyfile-amd64 @@ -0,0 +1,12 @@ +#syntax=harbor.nbfc.io/nubificus/bunny:937585f +version: v0.1 + +platforms: + framework: mirage + monitor: hvt + architecture: x86 + +app: + name: net + from: local + path: . diff --git a/rumprun-httpreply/rumprun/hvt/bunnyfile-amd64 b/rumprun-httpreply/rumprun/hvt/bunnyfile-amd64 new file mode 100644 index 0000000..c2f9c48 --- /dev/null +++ b/rumprun-httpreply/rumprun/hvt/bunnyfile-amd64 @@ -0,0 +1,21 @@ +#syntax=harbor.nbfc.io/nubificus/bunny:61c49ad +version: v0.1 + +platforms: + framework: rumprun + monitor: hvt + architecture: x86 + +rootfs: + from: scratch + type: raw + include: + - data/www:/www + - data/conf:/conf + +app: + name: nginx + from: github.com/cloudkernels/rumprun-packages + branch: feat_update_docker + +cmd: ["nginx"] diff --git a/rumprun-redis/rumprun/hvt/bunnyfile-amd64 b/rumprun-redis/rumprun/hvt/bunnyfile-amd64 new file mode 100644 index 0000000..71341e1 --- /dev/null +++ b/rumprun-redis/rumprun/hvt/bunnyfile-amd64 @@ -0,0 +1,20 @@ +#syntax=harbor.nbfc.io/nubificus/bunny:61c49ad +version: v0.1 + +platforms: + framework: rumprun + monitor: hvt + architecture: x86 + +rootfs: + from: scratch + type: raw + include: + - data/conf:/conf + +app: + name: redis + from: github.com/cloudkernels/rumprun-packages + branch: feat_update_docker + +cmd: ["redis-server", "/data/conf/redis.conf"]