From 29ef875ed6b38e36aa42517ed1f8de08c999a001 Mon Sep 17 00:00:00 2001
From: Yaman Umuroglu <maltanar@gmail.com>
Date: Tue, 21 Apr 2020 16:48:03 +0100
Subject: [PATCH] [Docker] chmod entry point, make VIVADO_PATH env.var again
---
docker/Dockerfile.finn_ci | 6 +++---
docker/Jenkinsfile | 5 +----
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/docker/Dockerfile.finn_ci b/docker/Dockerfile.finn_ci
index cfaf94747..dd0c28da7 100644
--- a/docker/Dockerfile.finn_ci
+++ b/docker/Dockerfile.finn_ci
@@ -29,7 +29,6 @@
FROM pytorch/pytorch:1.1.0-cuda10.0-cudnn7.5-devel
MAINTAINER Yaman Umuroglu <yamanu@xilinx.com>
ARG PYTHON_VERSION=3.6
-ARG VIVADO_PATH
ARG BUILD_PATH
ARG FINN_CI_BRANCH
@@ -79,15 +78,16 @@ ENV PYTHONPATH "${PYTHONPATH}:/workspace/brevitas_cnv_lfc/training_scripts"
ENV PYTHONPATH "${PYTHONPATH}:/workspace/brevitas"
ENV PYTHONPATH "${PYTHONPATH}:/workspace/pyverilator"
ENV PYNQSHELL_PATH "/workspace/PYNQ-HelloWorld/boards"
+ENV VIVADO_IP_CACHE "$BUILD_PATH/vivado_ip_cache"
# colorful terminal output
RUN echo "PS1='\[\033[1;36m\]\u\[\033[1;31m\]@\[\033[1;32m\]\h:\[\033[1;35m\]\w\[\033[1;31m\]\$\[\033[0m\] '" >> /root/.bashrc
RUN mkdir -p $BUILD_PATH
-RUN mkdir -p $BUILD_PATH/vivado_ip_cache
+RUN mkdir -p $VIVADO_IP_CACHE
WORKDIR /workspace/finn
COPY finn_entrypoint.sh /usr/local/bin/
-RUN ln -s /usr/local/bin/docker-entrypoint.sh / # backwards compat
+RUN chmod 755 /usr/local/bin/finn_entrypoint.sh
ENTRYPOINT ["finn_entrypoint.sh"]
CMD ["bash"]
diff --git a/docker/Jenkinsfile b/docker/Jenkinsfile
index 3cda131b2..4eb8d1f0a 100644
--- a/docker/Jenkinsfile
+++ b/docker/Jenkinsfile
@@ -8,7 +8,6 @@ pipeline {
DOCKER_TAG='finn_ci:$BUILD_ID'
DOCKER_INST_NAME='finn_ci_$BUILD_ID'
BUILD_PATH='/tmp/finn_ci_$BUILD_ID'
- VIVADO_IP_CACHE='$BUILD_PATH/vivado_ip_cache'
DOCKER_CMD="python setup.py test --addopts '-k test_compilation_trafo'"
}
stages {
@@ -23,7 +22,6 @@ pipeline {
docker build -t $DOCKER_TAG -f docker/Dockerfile.finn_ci \
--build-arg BUILD_PATH=$BUILD_PATH \
--build-arg FINN_CI_BRANCH=${params.FINN_CI_BRANCH} \
- --build-arg VIVADO_PATH=${params.VIVADO_PATH} \
docker/
"""
}
@@ -34,9 +32,8 @@ pipeline {
docker run --name $DOCKER_INST_NAME \
--hostname $DOCKER_INST_NAME \
-v ${params.VIVADO_PATH}:${params.VIVADO_PATH}:ro \
- -e VIVADO_PATH=${params.VIVADO_PATH} \
-e FINN_INST_NAME=$DOCKER_INST_NAME \
- -e VIVADO_IP_CACHE="$VIVADO_IP_CACHE" \
+ -e VIVADO_PATH=${params.VIVADO_PATH} \
$DOCKER_TAG bash -c "$DOCKER_CMD"
"""
}
--
GitLab