save progress

Author: AmozPay

docker/run_vm_supervisor_2.sh

@@ -10,11 +10,12 @@ fi
 
 $DOCKER_COMMAND build -t alephim/vm-supervisor-dev -f docker/vm_supervisor-dev-docker.dockerfile .
 
-$DOCKER_COMMAND run -ti --privileged --rm \
+$DOCKER_COMMAND run -ti --privileged --name=vm_supervisor_docker --rm \
+  -v "$(pwd)/runtimes/aleph-docker/:/opt/aleph-vm/runtimes/aleph-docker/:ro" \
+  -v "$(pwd)/examples/volumes/docker-data.squashfs:/opt/aleph-vm/examples/volumes/docker-data.squashfs:ro" \
+  -v "$(pwd)/examples/example_docker_container:/opt/aleph-vm/examples/example_docker_container: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-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" \

runtimes/aleph-docker/create_disk_image.sh

@@ -18,7 +18,7 @@ apt-get install -y --no-install-recommends --no-install-suggests \
   openssh-server \
   socat libsecp256k1-0 \
   \
-  python3-aiohttp python3-msgpack \
+  python3-msgpack \
   python3-setuptools \
   python3-pip python3-cytoolz python3-pydantic \
   iproute2 unzip \
@@ -27,6 +27,8 @@ apt-get install -y --no-install-recommends --no-install-suggests \
   cgroupfs-mount \
   build-essential python3-dev
 pip3 install 'fastapi~=0.71.0'
+pip3 install aiohttp
+
 
 
 echo "Pip installing aleph-client"
@@ -51,8 +53,6 @@ EOT
 echo "PermitRootLogin yes" >> ./rootfs/etc/ssh/sshd_config
 
 echo -ne '{\n"storage-driver": "vfs"\n}\n' > ./rootfs/etc/docker/daemon.json
-rm -fr ./rootfs/var/lib/docker
-mkdir ./rootfs/var/lib/docker
 
 # Generate SSH host keys
 #systemd-nspawn -D ./rootfs/ ssh-keygen -q -N "" -t dsa -f /etc/ssh/ssh_host_dsa_key

runtimes/aleph-docker/init0.sh

@@ -14,15 +14,6 @@ mkdir -p /overlay
 /bin/mount -t tmpfs -o noatime,mode=0755 tmpfs /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
-
-
-# Same for /var/lib/docker
-# /data
-
-# mkdir -p /overlay/docker/ro /overlay/docker/rw /overlay/docker/work
-# /bin/mount -o lowerdir=/opt/docker/ro,upperdir=/overlay/docker/rw,workdir=/overlay/docker/work -t overlay "overlayfs:/overlay/docker/rw" /var/lib
-
-
 mkdir -p /mnt/rom
 pivot_root /mnt /mnt/rom
 
@@ -38,7 +29,6 @@ mount -t tmpfs run /run -o mode=0755,nosuid,nodev
 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
@@ -54,6 +44,12 @@ log "Setup socat"
 socat UNIX-LISTEN:/tmp/socat-socket,fork,reuseaddr VSOCK-CONNECT:2:53 &
 log "Socat ready"
 
-log "INIT 0 DONE"
+cgroupfs-mount
+
+export PATH=$PATH:/usr/local/bin:/usr/bin:/usr/sbin
+
+/usr/sbin/dockerd 2>&1 | tee /log_docker.txt &
+
+log "INIT 0 DONE2"
 # Replace this script with the manager
 exec /root/init1.py

runtimes/aleph-docker/init1.py

@@ -1,6 +1,7 @@
 #!/usr/bin/python3 -OO
 
 import logging
+from time import sleep
 
 logging.basicConfig(
     level=logging.DEBUG,
@@ -11,37 +12,27 @@
 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")
 
 ASGIApplication = NewType("AsgiApplication", Any)
-docker_daemon = None
 
 class Encoding(str, Enum):
     plain = "plain"
@@ -459,37 +450,28 @@ 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")
     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 /")
-    system(f"stat -f {docker_mountpoint}")
-    system("stat -f /docker/")
-    system("stat -f /docker/persist/")
-    system("stat -f /docker/persist/upper")
-    system("stat -f /docker/persist/work")
-    system("stat -f /var/lib/docker")
+    # system("stat -f /")
+    # system(f"stat -f {docker_mountpoint}")
+    # system("stat -f /docker/")
+    # system("stat -f /docker/persist/")
+    # system("stat -f /docker/persist/upper")
+    # system("stat -f /docker/persist/work")
+    # system("stat -f /var/lib/docker")
     logger.debug(os.path.isdir("/docker/persist"))
     logger.debug(os.path.isdir("/docker/persist/upper"))
     system(f'/bin/mount -o noatime,lowerdir={docker_mountpoint},upperdir=/docker/persist/upper,workdir=/docker/persist/work -t overlay "overlayfs:/docker/persist/upper" /var/lib/docker')
-    docker_daemon = subprocess.Popen("/usr/sbin/dockerd", stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-
+    return subprocess.Popen("/usr/sbin/dockerd", stderr=subprocess.PIPE, encoding='utf-8')
 
 def setup_system(config: ConfigurationPayload):
     setup_hostname(config.vm_hash)
     setup_variables(config.variables)
     setup_volumes(config.volumes)
-    setup_docker()
+    docker_daemon = setup_docker()
     setup_network(config.ip, config.route, config.dns_servers)
     setup_input_data(config.input_data)
     logger.debug("Setup finished")