From b42e08e4aebc55138ea661f7eaa65b40003f9398 Mon Sep 17 00:00:00 2001
From: pvizeli <pvizeli@syshack.ch>
Date: Wed, 15 Mar 2017 08:29:29 +0100
Subject: [PATCH] update build env with new supervisor

---
 build-scripts/yocto-build-env/Dockerfile      |  3 +-
 .../yocto-build-env/{src => }/run-resinos.sh  |  0
 .../yocto-build-env/src/run-supervisor.sh     | 68 -------------------
 3 files changed, 1 insertion(+), 70 deletions(-)
 rename build-scripts/yocto-build-env/{src => }/run-resinos.sh (100%)
 delete mode 100644 build-scripts/yocto-build-env/src/run-supervisor.sh

diff --git a/build-scripts/yocto-build-env/Dockerfile b/build-scripts/yocto-build-env/Dockerfile
index ea003e230..91f26c062 100644
--- a/build-scripts/yocto-build-env/Dockerfile
+++ b/build-scripts/yocto-build-env/Dockerfile
@@ -24,7 +24,6 @@ RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
 RUN add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
 RUN apt-get update && apt-get install -y docker-ce && rm -rf /var/lib/apt/lists/*
 
-COPY src/run-resinos.sh /
-COPY src/run-supervisor.sh /
+COPY run-resinos.sh /
 
 WORKDIR /yocto/image
diff --git a/build-scripts/yocto-build-env/src/run-resinos.sh b/build-scripts/yocto-build-env/run-resinos.sh
similarity index 100%
rename from build-scripts/yocto-build-env/src/run-resinos.sh
rename to build-scripts/yocto-build-env/run-resinos.sh
diff --git a/build-scripts/yocto-build-env/src/run-supervisor.sh b/build-scripts/yocto-build-env/src/run-supervisor.sh
deleted file mode 100644
index baed0ec57..000000000
--- a/build-scripts/yocto-build-env/src/run-supervisor.sh
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/bash
-
-set -e
-
-DOCKER_TIMEOUT=20 # Wait 20 seconds for docker to start
-
-cleanup() {
-    echo "[INFO] Running cleanup..."
-
-    # Stop docker gracefully
-    echo "[INFO] Stopping in container docker..."
-    DOCKERPIDFILE=/var/run/docker.pid
-    if [ -f $DOCKERPIDFILE ] && [ -s $DOCKERPIDFILE ] && ps $(cat $DOCKERPIDFILE) | grep -q docker; then
-        kill $(cat $DOCKERPIDFILE)
-        # Now wait for it to die
-        STARTTIME=$(date +%s)
-        ENDTIME=$(date +%s)
-        while [ -f $DOCKERPIDFILE ] && [ -s $DOCKERPIDFILE ] && ps $(cat $DOCKERPIDFILE) | grep -q docker; do
-            if [ $(($ENDTIME - $STARTTIME)) -le $DOCKER_TIMEOUT ]; then
-                sleep 1
-                ENDTIME=$(date +%s)
-            else
-                echo "[ERROR] Timeout while waiting for in container docker to die."
-                exit 1
-            fi
-        done
-    else
-        echo "[WARN] Can't stop docker container."
-        echo "[WARN] Your host might have been left with unreleased resources (ex. loop devices)."
-    fi
-
-    if [ "$1" == "fail" ]; then
-        exit 1
-    fi
-}
-trap 'cleanup fail' SIGINT SIGTERM
-
-# Create the normal user to be used for bitbake (barys)
-echo "[INFO] Creating and setting builder user $BUILDER_UID:$BUILDER_GID."
-groupadd -g $BUILDER_GID builder
-groupadd docker || true
-useradd -m -u $BUILDER_UID -g $BUILDER_GID -G docker builder
-
-# Start docker
-echo "[INFO] Starting docker."
-dockerd 2> /dev/null &
-echo "[INFO] Waiting for docker to initialize..."
-STARTTIME=$(date +%s)
-ENDTIME=$(date +%s)
-until docker info >/dev/null 2>&1; do
-    if [ $(($ENDTIME - $STARTTIME)) -le $DOCKER_TIMEOUT ]; then
-        sleep 1
-        ENDTIME=$(date +%s)
-    else
-        echo "[ERROR] Timeout while waiting for docker to come up."
-        exit 1
-    fi
-done
-echo "[INFO] Docker was initialized."
-
-# Start barys with all the arguments requested
-echo "[INFO] Running build as builder user..."
-sudo -H -u builder /yocto/image/resin-yocto-scripts/build/barys $@ &
-barys_pid=$!
-wait $barys_pid || true
-
-cleanup
-exit 0