pull Vivado tar file out into build-arg

Dockerfile

@@ -2,7 +2,7 @@ FROM ubuntu:14.04
 
 MAINTAINER Colm Ryan <cryan@bbn.com>
 
-# build with docker build --build-arg VIVADO_TAR_HOST=host:port -t vivado .
+# build with docker build --build-arg VIVADO_TAR_HOST=host:port --build-arg VIVADO_TAR_FILE=Xilinx_Vivado_SDK_2016.3_1011_1 -t vivado .
 
 #install dependences for:
 # * downloading Vivado (wget)
@@ -26,13 +26,13 @@ COPY install_config.txt /
 
 # download and run the install
 ARG VIVADO_TAR_HOST
-RUN echo "Downloading Vivado from ${VIVADO_TAR_HOST}" && \
-  wget ${VIVADO_TAR_HOST}/Xilinx_Vivado_SDK_2016.1_0409_1.tar.gz -q && \
+ARG VIVADO_TAR_FILE
+RUN echo "Downloading ${VIVADO_TAR_FILE} from ${VIVADO_TAR_HOST}" && \
+  wget ${VIVADO_TAR_HOST}/${VIVADO_TAR_FILE}.tar.gz -q && \
   echo "Extracting Vivado tar file" && \
-  tar xzf Xilinx_Vivado_SDK_2016.1_0409_1.tar.gz && \
-  /Xilinx_Vivado_SDK_2016.1_0409_1/xsetup --agree 3rdPartyEULA,WebTalkTerms,XilinxEULA --batch Install --config install_config.txt && \
-  rm -rf Xilinx_Vivado_SDK_2016.1_0409_1*
-
+  tar xzf ${VIVADO_TAR_FILE}.tar.gz && \
+  /${VIVADO_TAR_FILE}/xsetup --agree 3rdPartyEULA,WebTalkTerms,XilinxEULA --batch Install --config install_config.txt && \
+  rm -rf ${VIVADO_TAR_FILE}*
 #make a Vivado user
 RUN adduser --disabled-password --gecos '' vivado
 USER vivado

README.md

@@ -13,7 +13,7 @@ Vivado installed into a docker image for CI purposes.
 3. Potentialy modify the `install_config.txt` to change the install options.
 4. Build the image (will take about 10 minutes) passing in a build arg
     ```shell
-    docker build --build-arg HOST=HOST_NAME:8000 -t vivado:2016.1 .
+    docker build --build-arg VIVADO_TAR_HOST=host_ip:8000 --build-arg VIVADO_TAR_FILE=Xilinx_Vivado_SDK_2016.3_1011_1 -t vivado:2016.3 .
     ```
 
 ## Running