From d690980bf5e4f30cf3c81a7f8086f647234096f6 Mon Sep 17 00:00:00 2001
From: auphelia <jakobapk@web.de>
Date: Tue, 14 Apr 2020 14:37:51 +0100
Subject: [PATCH] [Docker] First draft of changing the way dependency repos are
 cloned

---
 Dockerfile    | 12 ++++++++++++
 run-docker.sh |  7 +++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c220e6ac6..3b31d8c39 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -49,6 +49,18 @@ RUN echo "StrictHostKeyChecking no" >> /etc/ssh/ssh_config
 RUN pip install sphinx
 RUN pip install sphinx_rtd_theme
 
+# dependency repos
+#ARG BREVITAS_REPO="https://github.com/Xilinx/brevitas.git"
+#ARG EXAMPLES_REPO=https://github.com/maltanar/brevitas_cnv_lfc.git
+#ARG CNPY_REPO=https://github.com/rogersce/cnpy.git
+#ARG FINN_HLS_REPO=https://github.com/Xilinx/finn-hlslib.git
+#ARG PYVERILATOR_REPO=https://github.com/maltanar/pyverilator
+#ARG PYNQSHELL_REPO=https://github.com/maltanar/PYNQ-HelloWorld.git
+
+
+# cloning dependency repos
+RUN git clone --branch feature/finn_onnx_export https://github.com/Xilinx/brevitas.git /workspace/brevitas  
+
 
 # Note that we expect the cloned finn directory on the host to be
 # mounted on /workspace/finn -- see run-docker.sh for an example
diff --git a/run-docker.sh b/run-docker.sh
index 6883f13c7..adddb33ff 100755
--- a/run-docker.sh
+++ b/run-docker.sh
@@ -65,14 +65,14 @@ SCRIPT=$(readlink -f "$0")
 # Absolute path this script is in, thus /home/user/bin
 SCRIPTPATH=$(dirname "$SCRIPT")
 
-BREVITAS_REPO=https://github.com/Xilinx/brevitas.git
+#BREVITAS_REPO=https://github.com/Xilinx/brevitas.git
 EXAMPLES_REPO=https://github.com/maltanar/brevitas_cnv_lfc.git
 CNPY_REPO=https://github.com/rogersce/cnpy.git
 FINN_HLS_REPO=https://github.com/Xilinx/finn-hlslib.git
 PYVERILATOR_REPO=https://github.com/maltanar/pyverilator
 PYNQSHELL_REPO=https://github.com/maltanar/PYNQ-HelloWorld.git
 
-BREVITAS_LOCAL=$SCRIPTPATH/brevitas
+#BREVITAS_LOCAL=$SCRIPTPATH/brevitas
 EXAMPLES_LOCAL=$SCRIPTPATH/brevitas_cnv_lfc
 CNPY_LOCAL=$SCRIPTPATH/cnpy
 FINN_HLS_LOCAL=$SCRIPTPATH/finn-hlslib
@@ -83,7 +83,7 @@ VIVADO_HLS_LOCAL=$VIVADO_PATH
 VIVADO_IP_CACHE=$BUILD_LOCAL/vivado_ip_cache
 
 # clone dependency repos
-git clone --branch feature/finn_onnx_export $BREVITAS_REPO $BREVITAS_LOCAL ||  git -C "$BREVITAS_LOCAL" pull
+#git clone --branch feature/finn_onnx_export $BREVITAS_REPO $BREVITAS_LOCAL ||  git -C "$BREVITAS_LOCAL" pull
 git clone $EXAMPLES_REPO $EXAMPLES_LOCAL ||  git -C "$EXAMPLES_LOCAL" pull
 git clone $CNPY_REPO $CNPY_LOCAL ||  git -C "$CNPY_LOCAL" pull
 git clone $FINN_HLS_REPO $FINN_HLS_LOCAL; git -C "$FINN_HLS_LOCAL" checkout b5dc957a16017b8356a7010144b0a4e2f8cfd124 ||  git -C "$FINN_HLS_LOCAL" checkout b5dc957a16017b8356a7010144b0a4e2f8cfd124
@@ -136,7 +136,6 @@ docker run -t --rm --name $DOCKER_INST_NAME -it \
 -e "XILINX_VIVADO=$VIVADO_PATH" \
 -e "SHELL=/bin/bash" \
 -v $SCRIPTPATH:/workspace/finn \
--v $SCRIPTPATH/brevitas:/workspace/brevitas \
 -v $SCRIPTPATH/brevitas_cnv_lfc:/workspace/brevitas_cnv_lfc \
 -v $SCRIPTPATH/cnpy:/workspace/cnpy \
 -v $SCRIPTPATH/finn-hlslib:/workspace/finn-hlslib \
-- 
GitLab