From 5fba2af5c6da8f40e74a7f906ce05a906c2bfa47 Mon Sep 17 00:00:00 2001
From: Peter Surda <surda@economicsofbitcoin.com>
Date: Fri, 19 Nov 2021 22:40:28 +0800
Subject: [PATCH 1/2] Remove kata-containers

- docker support was deprecated
---
 docker-install-all.sh | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/docker-install-all.sh b/docker-install-all.sh
index 3be0253..fa00644 100755
--- a/docker-install-all.sh
+++ b/docker-install-all.sh
@@ -26,24 +26,6 @@ cores=$(grep -E '^cpu cores' /proc/cpuinfo |head -1|cut -d: -f2|tr -d '[:space:]
 mem=$(sed -E 's/^MemTotal: +([0-9]+) kB/\1/p;d' < /proc/meminfo)
 mempercore=$(((mem/1024-4096)/cores))
 
-# install kata containers
-if ! docker info 2>/dev/null|grep Runtimes:|grep -qs kata-qemu-virtiofs; then
-    echo "Installing kata...."
-    cid=$(docker run -d --runtime=runc -v /opt/kata:/opt/kata -v /var/run/dbus:/var/run/dbus -v /run/systemd:/run/systemd -v /etc/docker:/etc/docker -it katadocker/kata-deploy kata-deploy-docker install)
-
-    # wait for finish
-    while [ "$(docker container inspect -f '{{.State.Running}}' "$cid")" == "true" ]; do
-        sleep 1
-    done
-
-    # delete container
-    docker rm $cid
-
-    # update default container CPU and memory
-    sed -i "s/default_vcpus = .*/default_vcpus = 2/g;s/default_memory = .*/default-memory = $mempercore/g" /opt/kata/share/defaults/kata-containers/configuration-qemu-virtiofs.toml
-    echo "Kata installed"
-fi
-
 trusty
 xenial
 bionic
-- 
2.45.1


From 753a099748fb84884452f42ff54691b2017bb7b2 Mon Sep 17 00:00:00 2001
From: shekhar-cis <shekhar.c@cisinlabs.com>
Date: Fri, 19 Nov 2021 18:09:55 +0530
Subject: [PATCH 2/2] Added Dockerfile.buildozer dependencies

---
 docker/bionic/Dockerfile | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/docker/bionic/Dockerfile b/docker/bionic/Dockerfile
index e458aba..e3fed81 100644
--- a/docker/bionic/Dockerfile
+++ b/docker/bionic/Dockerfile
@@ -69,6 +69,34 @@ RUN apt-get install -yq --no-install-suggests --no-install-recommends \
 RUN apt-get install -yq --no-install-suggests --no-install-recommends \
     language-pack-en
 
+# Buildozer dependencies
+RUN apt install -qq --yes --no-install-recommends \
+    autoconf \
+    automake \
+    build-essential \
+    ccache \
+    cmake \
+    gettext \
+    git \
+    libffi-dev \
+    libltdl-dev \
+    libssl-dev \
+    libtool \
+    openjdk-8-jdk \
+    patch \
+    pkg-config \
+    python2.7 \
+    python3-pip \
+    python3-venv \
+    python3-setuptools \
+    sudo \
+    unzip \
+    zip \
+    zlib1g-dev
+
+RUN pip3 install "cython==0.28.6"
+RUN pip3 install "buildozer==1.0"
+
 # cleanup
 RUN rm -rf /var/lib/apt/lists/*
 
-- 
2.45.1