From f5675c6b0426c4b2791b950f3afc9192255e259d Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pascal.vizeli@syshack.ch>
Date: Tue, 14 Mar 2017 23:55:38 +0100
Subject: [PATCH] cleanup

---
 build-scripts/yocto-build-env/Dockerfile                      | 4 ++--
 build-scripts/yocto-build-env/create-build-env.sh             | 2 +-
 build-scripts/yocto-build-env/{ => src}/run-resinos.sh        | 0
 .../yocto-build-env/{ => src}/run-supervisor-base.sh          | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename build-scripts/yocto-build-env/{ => src}/run-resinos.sh (100%)
 rename build-scripts/yocto-build-env/{ => src}/run-supervisor-base.sh (100%)

diff --git a/build-scripts/yocto-build-env/Dockerfile b/build-scripts/yocto-build-env/Dockerfile
index 82405b931..ec4da748f 100644
--- a/build-scripts/yocto-build-env/Dockerfile
+++ b/build-scripts/yocto-build-env/Dockerfile
@@ -24,7 +24,7 @@ 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 run-resinos.sh /
-COPY run-supervisor-base.sh /
+COPY src/run-resinos.sh /
+COPY src/run-supervisor-base.sh /
 
 WORKDIR /yocto/image
diff --git a/build-scripts/yocto-build-env/create-build-env.sh b/build-scripts/yocto-build-env/create-build-env.sh
index 9c4aecaae..5c3b9d243 100644
--- a/build-scripts/yocto-build-env/create-build-env.sh
+++ b/build-scripts/yocto-build-env/create-build-env.sh
@@ -19,7 +19,7 @@ fi
 docker build --pull --tag ${DOCKER_REPO}/${DOCKER_IMAGE}:${REVISION} -f ${SCRIPTPATH}/Dockerfile ${SCRIPTPATH}
 
 # Tag
-docker tag -f ${DOCKER_REPO}/${DOCKER_IMAGE}:${REVISION} ${DOCKER_REPO}/${DOCKER_IMAGE}:latest
+docker tag ${DOCKER_REPO}/${DOCKER_IMAGE}:${REVISION} ${DOCKER_REPO}/${DOCKER_IMAGE}:latest
 
 # Push
 docker push ${DOCKER_REPO}/${DOCKER_IMAGE}:${REVISION}
diff --git a/build-scripts/yocto-build-env/run-resinos.sh b/build-scripts/yocto-build-env/src/run-resinos.sh
similarity index 100%
rename from build-scripts/yocto-build-env/run-resinos.sh
rename to build-scripts/yocto-build-env/src/run-resinos.sh
diff --git a/build-scripts/yocto-build-env/run-supervisor-base.sh b/build-scripts/yocto-build-env/src/run-supervisor-base.sh
similarity index 100%
rename from build-scripts/yocto-build-env/run-supervisor-base.sh
rename to build-scripts/yocto-build-env/src/run-supervisor-base.sh