[Docker] move repo dep setting into entry point script

docker/Dockerfile.finn_ci

@@ -44,29 +44,18 @@ RUN echo "StrictHostKeyChecking no" >> /etc/ssh/ssh_config
 # cloning dependency repos
 # Brevitas
 RUN git clone --branch feature/finn_onnx_export https://github.com/Xilinx/brevitas.git /workspace/brevitas
-RUN git -C /workspace/brevitas checkout 215cf44c76d562339fca368c8c3afee3110033e8
-
 # Brevitas examples
 RUN git clone --branch feature/rework_scaling_clipping https://github.com/maltanar/brevitas_cnv_lfc.git /workspace/brevitas_cnv_lfc
-RUN git -C /workspace/brevitas_cnv_lfc checkout 2059f96bd576bf71f32c757e7f92617a70190c90
-
 # CNPY
 RUN git clone https://github.com/rogersce/cnpy.git /workspace/cnpy
-RUN git -C /workspace/cnpy checkout 4e8810b1a8637695171ed346ce68f6984e585ef4
-
 # FINN hlslib
 RUN git clone https://github.com/maltanar/finn-hlslib.git /workspace/finn-hlslib
-RUN git -C /workspace/finn-hlslib checkout b139bf051ac8f8e0a3625509247f714127cf3317
-
 # PyVerilator
 RUN git clone https://github.com/maltanar/pyverilator /workspace/pyverilator
-RUN git -C /workspace/pyverilator checkout 307fc5c82db748620836307a2002fdc9fe170226
-
 # PYNQ-HelloWorld
 RUN git clone --branch feature/synth_rpt https://github.com/maltanar/PYNQ-HelloWorld.git /workspace/PYNQ-HelloWorld
-RUN git -C /workspace/PYNQ-HelloWorld checkout db7e418767ce2a8e08fe732ddb3aa56ee79b7560
 
-# FINN
+# checkout desired FINN branch for testing
 RUN git clone --branch $FINN_CI_BRANCH https://github.com/Xilinx/finn /workspace/finn
 
 RUN pip install -r /workspace/finn/requirements.txt

docker/Dockerfile.finn_dev

@@ -77,31 +77,19 @@ USER $UNAME
 # cloning dependency repos (as user)
 # Brevitas
 RUN git clone --branch feature/finn_onnx_export https://github.com/Xilinx/brevitas.git /workspace/brevitas
-RUN git -C /workspace/brevitas checkout 215cf44c76d562339fca368c8c3afee3110033e8
-
 # Brevitas examples
 RUN git clone --branch feature/rework_scaling_clipping https://github.com/maltanar/brevitas_cnv_lfc.git /workspace/brevitas_cnv_lfc
-RUN git -C /workspace/brevitas_cnv_lfc checkout 2059f96bd576bf71f32c757e7f92617a70190c90
-
 # CNPY
 RUN git clone https://github.com/rogersce/cnpy.git /workspace/cnpy
-RUN git -C /workspace/cnpy checkout 4e8810b1a8637695171ed346ce68f6984e585ef4
-
 # FINN hlslib
 RUN git clone https://github.com/maltanar/finn-hlslib.git /workspace/finn-hlslib
-RUN git -C /workspace/finn-hlslib checkout b139bf051ac8f8e0a3625509247f714127cf3317
-
 # PyVerilator
 RUN git clone https://github.com/maltanar/pyverilator /workspace/pyverilator
-RUN git -C /workspace/pyverilator checkout 307fc5c82db748620836307a2002fdc9fe170226
-
 # PYNQ-HelloWorld
 RUN git clone --branch feature/synth_rpt https://github.com/maltanar/PYNQ-HelloWorld.git /workspace/PYNQ-HelloWorld
-RUN git -C /workspace/PYNQ-HelloWorld checkout db7e418767ce2a8e08fe732ddb3aa56ee79b7560
 
-# Note that we expect the cloned finn directory on the host to be
-# mounted on /workspace/finn -- see run-docker.sh for an example
-# of how to do this.
+# for this developer-oriented Docker container we assume the FINN repo is cloned and mounted from the host
+# at /workspace/finn -- see run-docker.sh for an example of how to do this.
 ENV PYTHONPATH "${PYTHONPATH}:/workspace/finn/src"
 ENV PYTHONPATH "${PYTHONPATH}:/workspace/brevitas_cnv_lfc/training_scripts"
 ENV PYTHONPATH "${PYTHONPATH}:/workspace/brevitas"

docker/finn_entrypoint.sh

@@ -4,6 +4,22 @@ export XILINX_VIVADO=$VIVADO_PATH
 export SHELL=/bin/bash
 export FINN_ROOT=/workspace/finn
 
+# checkout the correct dependency repo commits
+# the repos themselves are cloned in the Dockerfile
+# Brevitas
+git -C /workspace/brevitas checkout 215cf44c76d562339fca368c8c3afee3110033e8
+# Brevitas examples
+git -C /workspace/brevitas_cnv_lfc checkout 2059f96bd576bf71f32c757e7f92617a70190c90
+# CNPY
+git -C /workspace/cnpy checkout 4e8810b1a8637695171ed346ce68f6984e585ef4
+# FINN hlslib
+git -C /workspace/finn-hlslib checkout b139bf051ac8f8e0a3625509247f714127cf3317
+# PyVerilator
+git -C /workspace/pyverilator checkout 307fc5c82db748620836307a2002fdc9fe170226
+# PYNQ-HelloWorld
+git -C /workspace/PYNQ-HelloWorld checkout db7e418767ce2a8e08fe732ddb3aa56ee79b7560
+
+
 # source Vivado env.vars
 source $VIVADO_PATH/settings64.sh