From 45fd1b144035540d31a23333affe08604b8d10f3 Mon Sep 17 00:00:00 2001
From: Peri Diane Jones <dsmouse@users.noreply.github.com>
Date: Sat, 11 Aug 2018 16:01:35 -0400
Subject: Docker build improvements

Fix missing dependencies and repositories, make the makefile exit with 1 if ISO file wasn't built.
---
 Dockerfile         | 4 +++-
 scripts/copy-image | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 924ddb12..932fe9f3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,8 @@
 # in order to easy exprort images built to "external" world 
 FROM debian:jessie
 
-RUN apt-get update &&\
+RUN echo 'deb http://ftp.debian.org/debian jessie-backports main' | tee -a /etc/apt/sources.list &&\
+    apt-get update &&\
     apt-get install -y \
       vim \
       git \
@@ -28,6 +29,7 @@ RUN apt-get update &&\
       bison \
       libperl-dev \
       libnfnetlink-dev \
+      python3-git \
     && rm -rf /var/lib/apt/lists/*
 
 WORKDIR ~
diff --git a/scripts/copy-image b/scripts/copy-image
index 01af511d..75e15b37 100755
--- a/scripts/copy-image
+++ b/scripts/copy-image
@@ -4,4 +4,6 @@ BUILD_DIR=$(scripts/query-json build/build-config.json build_dir)
 BUILD_ARCH=$(scripts/query-json build/build-config.json architecture)
 VERSION=$(cat $BUILD_DIR/version)
 
-ln -nsf $BUILD_DIR/live-image-$BUILD_ARCH.hybrid.iso $BUILD_DIR/vyos-$VERSION-$BUILD_ARCH.iso
+ln -rnsf $BUILD_DIR/live-image-$BUILD_ARCH.hybrid.iso $BUILD_DIR/vyos-$VERSION-$BUILD_ARCH.iso 
+
+
-- 
cgit v1.2.3