work in progress

Author: AmozPay

docker/run_vm_supervisor.sh

@@ -11,10 +11,11 @@ fi
 $DOCKER_COMMAND build -t alephim/vm-supervisor-dev -f docker/vm_supervisor-dev.dockerfile .
 
 $DOCKER_COMMAND run -ti --rm \
-  -v "$(pwd)/runtimes/aleph-debian-11-python/rootfs.squashfs:/opt/aleph-vm/runtimes/aleph-debian-11-python/rootfs.squashfs:ro" \
-  -v "$(pwd)/examples/volumes/volume-venv.squashfs:/opt/aleph-vm/examples/volumes/volume-venv.squashfs:ro" \
-  -v "$(pwd)/vm_supervisor:/opt/aleph-vm/vm_supervisor:ro" \
-  -v "$(pwd)/firecracker:/opt/aleph-vm/firecracker:ro" \
   --device /dev/kvm \
   -p 4020:4020 \
   alephim/vm-supervisor-dev $@
+
+  # -v "$(pwd)/runtimes/aleph-debian-11-python/rootfs.squashfs:/opt/aleph-vm/runtimes/aleph-debian-11-python/rootfs.squashfs:ro" \
+# -v "$(pwd)/examples/volumes/volume-venv.squashfs:/opt/aleph-vm/examples/volumes/volume-venv.squashfs:ro" \
+# -v "$(pwd)/vm_supervisor:/opt/aleph-vm/vm_supervisor:ro" \
+# -v "$(pwd)/firecracker:/opt/aleph-vm/firecracker:ro" \

docker/run_vm_supervisor_2.sh

@@ -0,0 +1,20 @@
+#!/bin/sh
+
+# Use Podman if installed, else use Docker
+if hash podman 2> /dev/null
+then
+  DOCKER_COMMAND=podman
+else
+  DOCKER_COMMAND=docker
+fi
+
+$DOCKER_COMMAND build -t alephim/vm-supervisor-dev -f docker/vm_supervisor-dev-docker.dockerfile .
+
+$DOCKER_COMMAND run -ti --privileged --rm \
+  --device /dev/kvm \
+  -p 4020:4020 \
+  alephim/vm-supervisor-dev $@
+  # -v "$(pwd)/runtimes/aleph-docker/rootfs.squashfs:/opt/aleph-vm/runtimes/aleph-docker/rootfs.squashfs:ro" \
+  # -v "$(pwd)/examples/volumes/docker-data.squashfs:/opt/aleph-vm/examples/volumes/docker-data.squashfs:ro" \
+  # -v "$(pwd)/vm_supervisor:/opt/aleph-vm/vm_supervisor:ro" \
+  # -v "$(pwd)/firecracker:/opt/aleph-vm/firecracker:ro" \

docker/vm_supervisor-dev-docker.dockerfile

@@ -5,15 +5,15 @@ FROM debian:bullseye
 RUN apt-get update && apt-get -y upgrade && apt-get install -y \
     sudo acl curl squashfs-tools git \
     python3 python3-aiohttp python3-msgpack python3-pip python3-aiodns python3-aioredis  \
-    python3-psutil python3-setproctitle python3-sqlalchemy python3-packaging \
+    python3-psutil python3-setproctitle python3-sqlalchemy python3-packaging python3-cpuinfo \
     && rm -rf /var/lib/apt/lists/*
 
 RUN useradd jailman
 
 RUN mkdir /opt/firecracker
 RUN chown $(whoami) /opt/firecracker
-RUN curl -fsSL https://github.com/firecracker-microvm/firecracker/releases/download/v1.0.0/firecracker-v1.0.0-x86_64.tgz | tar -xz --directory /opt/firecracker
-RUN curl -fsSL -o /opt/firecracker/vmlinux.bin https://github.com/aleph-im/aleph-vm/releases/download/0.1.0/vmlinux.bin
+RUN curl -fsSL https://github.com/firecracker-microvm/firecracker/releases/download/v1.1.1/firecracker-v1.1.1-x86_64.tgz | tar -xz --directory /opt/firecracker
+RUN curl -fsSL -o /opt/firecracker/vmlinux.bin https://s3.amazonaws.com/spec.ccfc.min/img/quickstart_guide/x86_64/kernels/vmlinux.bin
 
 # Link binaries on version-agnostic paths:
 RUN ln /opt/firecracker/release-*/firecracker-v* /opt/firecracker/firecracker
@@ -36,7 +36,14 @@ ENV ALEPH_VM_FAKE_DATA True
 ENV ALEPH_VM_SUPERVISOR_HOST "0.0.0.0"
 
 # Make it easy to enter this command from a shell script
-RUN echo "python3 -m vm_supervisor --print-settings --very-verbose --system-logs --profile -f ./examples/example_docker_container > log.txt 2>&1"  >> /root/.bash_history
+RUN echo "python3 -m vm_supervisor --print-settings --very-verbose --system-logs --profile -f ./examples/example_docker_container" >> /root/.bash_history
+
+
+ENV BENCHMARK_FAKE_DATA_PROGRAM="/opt/aleph-vm/examples/example_docker_container"
+ENV FAKE_DATA_MESSAGE="/opt/aleph-vm/examples/message_from_aleph_docker_runtime.json"
+ENV FAKE_DATA_DATA="/opt/aleph-vm/examples/data/"
+ENV FAKE_DATA_RUNTIME="/opt/aleph-vm/runtimes/aleph-docker/rootfs.squashfs"
+ENV FAKE_DATA_VOLUME="/opt/aleph-vm/examples/volumes/docker-data.squashfs"
 
 RUN mkdir /opt/aleph-vm/
 COPY ./vm_supervisor /opt/aleph-vm/vm_supervisor

examples/message_from_aleph_docker_runtime.json

@@ -50,7 +50,7 @@
         "runtime": {
             "ref": "5f31b0706f59404fad3d0bff97ef89ddf24da4761608ea0646329362c662ba51",
             "use_latest": false,
-            "comment": "Aleph Alpine Linux with Python 3.8"
+            "comment": "Aleph Debian Linux with Docker"
         },
         "volumes": [
             {

examples/volumes/build_squashfs.sh

@@ -10,5 +10,7 @@ else
   DOCKER_COMMAND=docker
 fi
 
+echo DOCKER_COMMAND=$DOCKER_COMMAND
+
 $DOCKER_COMMAND build -t aleph-vm-build-squashfs .
 $DOCKER_COMMAND run --rm -v "$(pwd)":/mnt aleph-vm-build-squashfs

runtimes/aleph-alpine-3.13-python/init0.sh

@@ -43,5 +43,7 @@ log "Setup socat"
 socat UNIX-LISTEN:/tmp/socat-socket,fork,reuseaddr VSOCK-CONNECT:2:53 &
 log "Socat ready"
 
+pip show aiohttp
+
 # Replace this script with the manager
 exec /root/init1.py

runtimes/aleph-alpine-3.13-python/init1.py

@@ -10,22 +10,27 @@
 
 logger.debug("Imports starting")
 
-import ctypes
-import asyncio
-import os
-import socket
-from enum import Enum
-import subprocess
-import sys
-import traceback
-from contextlib import redirect_stdout
-from dataclasses import dataclass, field
-from io import StringIO
-from os import system
-from shutil import make_archive
-from typing import Optional, Dict, Any, Tuple, List, NewType, Union, AsyncIterable
-
-import aiohttp
+# import ctypes
+# import asyncio
+# import os
+# import socket
+# from enum import Enum
+# import subprocess
+# import sys
+# import traceback
+# from contextlib import redirect_stdout
+# from dataclasses import dataclass, field
+# from io import StringIO
+# from os import system
+# from shutil import make_archive
+# from typing import Optional, Dict, Any, Tuple, List, NewType, Union, AsyncIterable
+
+from aiohttp import (
+    ClientTimeout,
+    ClientConnectorError,
+    ClientSession
+)
+
 import msgpack
 
 logger.debug("Imports finished")
@@ -326,13 +331,13 @@ async def run_executable_http(scope: dict) -> Tuple[Dict, Dict, str, Optional[by
     headers = None
     body = None
 
-    timeout = aiohttp.ClientTimeout(total=5)
-    async with aiohttp.ClientSession(timeout=timeout) as session:
+    timeout = ClientTimeout(total=5)
+    async with ClientSession(timeout=timeout) as session:
         while not body:
             try:
                 tries += 1
                 headers, body = await make_request(session, scope)
-            except aiohttp.ClientConnectorError:
+            except ClientConnectorError:
                 if tries > 20:
                     raise
                 await asyncio.sleep(0.05)
@@ -361,7 +366,7 @@ async def process_instruction(
             # Close the cached session in aleph_client:
             from aleph_client.asynchronous import get_fallback_session
 
-            session: aiohttp.ClientSession = get_fallback_session()
+            session: ClientSession = get_fallback_session()
             await session.close()
             logger.debug("Aiohttp cached session closed")
         yield b"STOP\n"

runtimes/aleph-debian-11-python/create_disk_image.sh

@@ -17,7 +17,6 @@ apt-get install -y --no-install-recommends --no-install-suggests \
   python3-minimal \
   openssh-server \
   socat libsecp256k1-0 \
-  \
   python3-aiohttp python3-msgpack \
   python3-setuptools \
   python3-pip python3-cytoolz python3-pydantic \

runtimes/aleph-docker/init0.sh

@@ -15,8 +15,6 @@ mkdir -p /overlay
 mkdir -p /overlay/root/rw /overlay/root/work
 /bin/mount -o noatime,lowerdir=/,upperdir=/overlay/root/rw,workdir=/overlay/root/work -t overlay "overlayfs:/overlay/root/rw" /mnt
 
-echo HERE
-stat -f -c %T /overlay/
 
 # Same for /var/lib/docker
 # /data
@@ -41,6 +39,7 @@ mount -t devpts devpts /dev/pts -o mode=0620,gid=5,nosuid,noexec
 mount -t tmpfs shm /dev/shm -omode=1777,nosuid,nodev
 
 cgroupfs-mount
+
 # List block devices
 lsblk
 

runtimes/aleph-docker/init1.py

@@ -11,22 +11,32 @@
 logger.debug("Imports starting")
 
 import ctypes
+logger.debug("1")
 import asyncio
 import os
+logger.debug("2")
 import socket
 from enum import Enum
+logger.debug("3")
 import subprocess
 import sys
 import traceback
+logger.debug("4")
 from contextlib import redirect_stdout
 from dataclasses import dataclass, field
 from io import StringIO
+logger.debug("5")
 from os import system
+logger.debug("6")
 from shutil import make_archive
+logger.debug("7")
 from typing import Optional, Dict, Any, Tuple, List, NewType, Union, AsyncIterable
+logger.debug("8")
 
 import aiohttp
+logger.debug("9")
 import msgpack
+logger.debug("10")
 
 logger.debug("Imports finished")
 
@@ -449,8 +459,17 @@ def receive_config(client) -> ConfigurationPayload:
 
 
 def setup_docker():
+    # tmp docker test overlay
+# mkdir -p /docker
+# /bin/mount -t tmpfs -o noatime,mode=0755 tmpfs /docker
+# mkdir -p /docker/persist/work /docker/persist/upper
+# /bin/mount -o noatime,lowerdir=/opt/docker,upperdir=/docker/persist/upper,workdir=/docker/persist/work -t overlay "overlayfs:/docker/persist/upper" /var/lib/docker
+
+# echo HERE
+# stat -f -c %T /overlay/
     docker_mountpoint = os.environ.get("DOCKER_MOUNTPOINT")
-    system(f"ls {docker_mountpoint}")
+    os.makedirs("/docker", exist_ok=True)
+    system("bin/mount -t tmpfs -o noatime,mode=0755 tmpfs /docker")
     os.makedirs("/docker/persist/work", exist_ok=True)
     os.makedirs("/docker/persist/upper", exist_ok=True)
     system("stat -f /")

vm_supervisor/conf.py

@@ -6,6 +6,7 @@
 from pathlib import Path
 from subprocess import check_output
 from typing import NewType, Optional, List
+from os import environ
 
 from pydantic import BaseSettings, Field
 
@@ -118,23 +119,25 @@ class Settings(BaseSettings):
 
     FAKE_DATA_PROGRAM: Optional[Path] = None
     BENCHMARK_FAKE_DATA_PROGRAM = Path(
-        abspath(join(__file__, "../../examples/example_fastapi"))
-        # abspath(join(__file__, "../../examples/example_docker_container"))
+        environ.get("BENCHMARK_FAKE_DATA_PROGRAM")
+        or abspath(join(__file__, "../../examples/example_fastapi"))
     )
 
     FAKE_DATA_MESSAGE = Path(
-        abspath(join(__file__, "../../examples/message_from_aleph.json"))
+        environ.get("FAKE_DATA_MESSAGE")
+        or abspath(join(__file__, "../../examples/message_from_aleph.json"))
     )
     FAKE_DATA_DATA: Optional[Path] = Path(
-        abspath(join(__file__, "../../examples/data/"))
+        environ.get("FAKE_DATA_DATA")
+        or abspath(join(__file__, "../../examples/data/"))
     )
     FAKE_DATA_RUNTIME = Path(
-        abspath(join(__file__, "../../runtimes/aleph-debian-11-python/rootfs.squashfs"))
-        # abspath(join(__file__, "../../runtimes/aleph-docker/rootfs.squashfs"))
+        environ.get("FAKE_DATA_RUNTIME")
+        or abspath(join(__file__, "../../runtimes/aleph-debian-11-python/rootfs.squashfs"))
     )
     FAKE_DATA_VOLUME: Optional[Path] = Path(
-        abspath(join(__file__, "../../examples/volumes/volume-venv.squashfs"))
-        # abspath(join(__file__, "../../examples/volumes/docker-data.squashfs"))
+        environ.get("FAKE_DATA_VOLUME")
+        or abspath(join(__file__, "../../examples/volumes/volume-venv.squashfs"))
     )
 
     CHECK_FASTAPI_VM_ID = (