Merge pull request #42 from ultravioletrs/preload-docker-images

NOISSUE - Preload docker images to the vm
ultravioletrs · Dec 6, 2024 · cb442a4 · cb442a4
2 parents d4b5860 + 752618b
commit cb442a4
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 55 deletions.
diff --git a/hal/buildroot/README.md b/hal/buildroot/README.md
@@ -50,31 +50,14 @@ VEK signed the Attestation Report!
 Measurement from SNP Attestation Report: daa2e216eafd8c6404b72157a130500ab0c0944064c8e1009ebf5e910371caf57a6711654108a01a69baaa1a05759cf0
 ```
 
-Clone the repository. Since this is a private repository, you need to create a classic personal access token with `repo` and `read:packages` permissions.
+By default the docker images have been pulled from docker registry and the the docker composition has been started. The folder which contains the docker compose file is at `/mnt/docker/cube/docker`. To see the running containers, run the following command:
 
 ```bash
-git clone https://github.com/ultravioletrs/cube.git
+docker ps -a
 ```
 
-Your username is your github username and your password is the access token you generated in step above.
-
-Login to the docker registry
-
-```bash
-docker login ghcr.io
-```
-
-Your username is your github username and your password is the access token you generated in step above.
-
-Pull the docker images
-
-```bash
-cd cube/docker/
-docker compose pull
-```
-
-Start the docker composition
+For local development, replace the following IP address entries in `docker/.env` with the IP address of the qemu virtual machine as follows:
 
 ```bash
-docker compose up -d
+ UV_CUBE_NEXTAUTH_URL=http://<ip-address>:${UI_PORT}
 ```
diff --git a/hal/buildroot/linux/systemd/setup-cube.sh b/hal/buildroot/linux/systemd/setup-cube.sh
@@ -44,3 +44,10 @@ tee /etc/docker/daemon.json > /dev/null <<EOF
 EOF
 
 systemctl start docker
+
+# Setup Cube AI
+cd /mnt/docker
+git clone https://github.com/ultravioletrs/cube.git
+cd cube/docker
+docker compose pull
+docker compose up -d
diff --git a/hal/buildroot/qemu.sh b/hal/buildroot/qemu.sh
@@ -47,7 +47,7 @@ function start_qemu(){
     -cpu $CPU_TYPE \
     -machine q35 \
     -enable-kvm \
-    -netdev user,id=vmnic,hostfwd=tcp::6190-:22,hostfwd=tcp::6191-:80,hostfwd=tcp::6192-:443,hostfwd=tcp::6193-:3001,dns=8.8.8.8 \
+    -netdev user,id=vmnic,hostfwd=tcp::6190-:22,hostfwd=tcp::6191-:80,hostfwd=tcp::6192-:443,hostfwd=tcp::6193-:6193,dns=8.8.8.8 \
     -device virtio-net-pci,disable-legacy=on,iommu_platform=true,netdev=vmnic,romfile= \
     -nographic \
     -no-reboot \
@@ -74,7 +74,7 @@ function start_cvm(){
     -cpu $CPU_TYPE \
     -machine q35 \
     -enable-kvm \
-    -netdev user,id=vmnic,hostfwd=tcp::6190-:22,hostfwd=tcp::6191-:80,hostfwd=tcp::6192-:443,hostfwd=tcp::6193-:3001,dns=8.8.8.8 \
+    -netdev user,id=vmnic,hostfwd=tcp::6190-:22,hostfwd=tcp::6191-:80,hostfwd=tcp::6192-:443,hostfwd=tcp::6193-:6193,dns=8.8.8.8 \
     -device virtio-net-pci,disable-legacy=on,iommu_platform=true,netdev=vmnic,romfile= \
     -nographic \
     -no-reboot \

diff --git a/hal/ubuntu/README.md b/hal/ubuntu/README.md
@@ -4,38 +4,8 @@ This directory contains the cloud-init configuration files for Cube AI.
 
 ## After the first boot
 
-1. Generate access token from github to be able to pull the docker images and code from github
-2. Login to the docker registry
+For local development, replace the following IP address entries in `docker/.env` with the IP address of the qemu virtual machine as follows:
 
 ```bash
-docker login ghcr.io
-```
-
-Your username is your github username and your password is the access token you generated in step 1.
-
-3. Clone the repository
-
-```bash
-git clone https://github.com/ultravioletrs/cube.git
-```
-
-Your username is your github username and your password is the access token you generated in step 1.
-
-4. Pull the docker images
-
-```bash
-cd cube/docker/
-docker compose pull
-```
-
-5. For local development, replace the following IP address entries in `docker/.env` with your local IP address as follows:
-
-```bash
- UV_CUBE_NEXTAUTH_URL=http://localhost:${UI_PORT}
-```
-
-6. Start the docker containers
-
-```bash
-docker compose up -d
+ UV_CUBE_NEXTAUTH_URL=http://<ip-address>:${UI_PORT}
 ```
diff --git a/hal/ubuntu/qemu.sh b/hal/ubuntu/qemu.sh
@@ -78,6 +78,10 @@ runcmd:
   - groupadd docker
   - usermod -aG docker $USER
   - newgrp docker
+  - git clone https://github.com/ultravioletrs/cube.git
+  - cd cube/docker
+  - docker compose pull
+  - docker compose up -d
 
 final_message: "Docker installation complete."
 EOF