[Docker] fix tzdata problems, tag Vitis separately, ultra96v2

docker/Dockerfile.finn_ci

@@ -31,6 +31,11 @@ LABEL maintainer="Yaman Umuroglu <yamanu@xilinx.com>"
 
 WORKDIR /workspace
 
+# some Vitis deps require a timezone to be specified, which hangs in Docker
+# use workaround from https://grigorkh.medium.com/fix-tzdata-hangs-docker-image-build-cdb52cc3360d
+ENV TZ="Europe/Dublin"
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+
 RUN apt-get update
 RUN apt-get -y upgrade
 RUN apt-get install -y build-essential

docker/Dockerfile.finn_dev

@@ -36,6 +36,12 @@ ARG PASSWD
 
 WORKDIR /workspace
 
+# some Vitis deps require a timezone to be specified, which hangs in Docker
+# use workaround from https://grigorkh.medium.com/fix-tzdata-hangs-docker-image-build-cdb52cc3360d
+ENV TZ="Europe/Dublin"
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+
+
 RUN apt-get update
 RUN apt-get -y upgrade
 RUN apt-get install -y build-essential

docker/finn_entrypoint.sh

@@ -80,7 +80,7 @@ if [ ! -d "/workspace/finn/board_files" ]; then
     rm pynq-z2.zip
     cd $OLD_PWD
 fi
-if [ ! -d "/workspace/finn/board_files/ultra96v1" ]; then
+if [ ! -d "/workspace/finn/board_files/ultra96v2" ]; then
     gecho "Downloading Avnet BDF files into board_files"
     OLD_PWD=$(pwd)
     cd /workspace/finn

run-docker.sh

@@ -74,7 +74,13 @@ DOCKER_PASSWD="finn"
 # generate a random number per-run to allow multiple
 # containers from the same user
 DOCKER_RND=$(shuf -i0-32768 -n1)
-DOCKER_TAG="finn_dev_${DOCKER_UNAME}"
+# create a separate tag when Vitis enabled, since Docker image needs
+# additional dependencies installed
+if [ ! -z "$VITIS_PATH" ];then
+  DOCKER_TAG="finn_dev_vitis_${DOCKER_UNAME}"
+else
+  DOCKER_TAG="finn_dev_${DOCKER_UNAME}"
+fi
 # uncomment to run multiple instances with different names
 # DOCKER_INST_NAME="finn_${DOCKER_UNAME}_${DOCKER_RND}"
 DOCKER_INST_NAME="finn_dev_${DOCKER_UNAME}"