Skip to content
Snippets Groups Projects
Commit a1454a31 authored by auphelia's avatar auphelia
Browse files

Revert "Exit Dockerfile.finn & run_docker.sh process if XRT_DEB_VERSION is not set"

This reverts commit 1f17010e.
parent 803eeb53
No related branches found
No related tags found
No related merge requests found
......@@ -38,12 +38,6 @@ WORKDIR /workspace
ENV TZ="Europe/Dublin"
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
# Make sure the XRT_DEB_VERSION --build-arg was passed to this script
ARG XRT_DEB_VERSION
RUN if [ -z "$XRT_DEB_VERSION" ]; then \
echo "XRT_DEB_VERSION is not set, exiting now" ; exit 1 ; \
fi
RUN apt-get update && \
apt-get install -y \
build-essential \
......@@ -78,6 +72,7 @@ RUN cd verilator && \
make install
# install XRT
ARG XRT_DEB_VERSION
RUN wget https://www.xilinx.com/bin/public/openDownload?filename=$XRT_DEB_VERSION.deb -O /tmp/$XRT_DEB_VERSION.deb
RUN apt install -y /tmp/$XRT_DEB_VERSION.deb
RUN rm /tmp/$XRT_DEB_VERSION.deb
......
......@@ -179,10 +179,6 @@ if [ "$FINN_DOCKER_PREBUILT" = "0" ]; then
OLD_PWD=$(pwd)
cd $SCRIPTPATH
docker build -f docker/Dockerfile.finn --build-arg XRT_DEB_VERSION=$XRT_DEB_VERSION --tag=$FINN_DOCKER_TAG .
if [ "$?" -ne 0 ]; then
echo "Error occurred during docker build, exiting"
exit 1
fi
cd $OLD_PWD
fi
# Launch container with current directory mounted
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment