changes for 2018.1

Dockerfile

 FROM ubuntu:16.04
 
-MAINTAINER Colm Ryan <cryan@bbn.com>
+MAINTAINER z4yx <z4yx@users.noreply.github.com>
 
-# 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 .
+# build with docker build --build-arg VIVADO_VERSION=2018.1 --build-arg VIVADO_TAR_FILE=Xilinx_Vivado_SDK_2018.1_0405_1.tar.gz -t vivado:2018.1 .
 
 #install dependences for:
 # * downloading Vivado (wget)
 # * xsim (gcc build-essential to also get make)
 # * MIG tool (libglib2.0-0 libsm6 libxi6 libxrender1 libxrandr2 libfreetype6 libfontconfig)
 # * CI (git)
-RUN apt-get update && apt-get install -y \
-  wget \
+RUN sed -i.bak s/archive.ubuntu.com/mirror.tuna.tsinghua.edu.cn/g /etc/apt/sources.list && \
+  apt-get update && apt-get install -y \
   build-essential \
+  sudo \
+  libxtst6 \
   libglib2.0-0 \
   libsm6 \
   libxi6 \
@@ -21,26 +23,31 @@ RUN apt-get update && apt-get install -y \
   libfontconfig \
   git
 
-# copy in config file
+ARG VIVADO_VERSION
+ARG VIVADO_TAR_FILE
+
 COPY install_config.txt /
+COPY ${VIVADO_INSTALL_FILE} /
+
+# run the install
+RUN mkdir /install_vivado && \
+  tar -xf ${VIVADO_TAR_FILE} -C /install_vivado && \
+  /install_vivado/*/xsetup --agree 3rdPartyEULA,WebTalkTerms,XilinxEULA --batch Install --config /install_config.txt && \
+  rm -rf /install_vivado
 
-# download and run the install
-ARG VIVADO_TAR_HOST
-ARG VIVADO_TAR_FILE
-ARG VIVADO_VERSION
-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 ${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
+RUN usermod -aG sudo vivado
+RUN echo "vivado ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
+
 USER vivado
 WORKDIR /home/vivado
+ENV HOME /home/vivado
 #add vivado tools to path
 RUN echo "source /opt/Xilinx/Vivado/${VIVADO_VERSION}/settings64.sh" >> /home/vivado/.bashrc
 
 #copy in the license file
-RUN mkdir /home/vivado/.Xilinx
-COPY Xilinx.lic /home/vivado/.Xilinx/
+#RUN mkdir /home/vivado/.Xilinx
+#COPY Xilinx.lic /home/vivado/.Xilinx/
+
+CMD ["/opt/Xilinx/Vivado/${VIVADO_VERSION}/bin/vivado"]

install_config.txt

@@ -5,14 +5,14 @@ Edition=Vivado HL WebPACK
 Destination=/opt/Xilinx
 
 # Choose the Products/Devices the you would like to install.
-Modules=Software Development Kit (SDK):0,DocNav:0,Kintex UltraScale:0,Zynq-7000:1,System Generator for DSP:0,Artix-7:1,Kintex-7:0
+Modules=DocNav:0,Kintex UltraScale:0,Virtex UltraScale+ HBM ES:0,Spartan-7:0,Artix-7:1,Kintex UltraScale+ ES:0,Model Composer:0,ARM Cortex-A53:0,Zynq UltraScale+ MPSoC:0,Zynq-7000:0,SDK Core Tools:0,ARM Cortex-A9:0,ARM Cortex R5:0,Virtex UltraScale+ ES:0,Zynq UltraScale+ MPSoC ES:0,System Generator for DSP:0,Kintex-7:0,Kintex UltraScale+:0,MicroBlaze:0
 
 # Choose the post install scripts you'd like to run as part of the finalization step. Please note that some of these scripts may require user interaction during runtime.
-InstallOptions=Acquire or Manage a License Key:0,Enable WebTalk for SDK to send usage statistics to Xilinx:0
+InstallOptions=Enable WebTalk for SDK to send usage statistics to Xilinx:1
 
 ## Shortcuts and File associations ##
 # Choose whether Start menu/Application menu shortcuts will be created or not.
-CreateProgramGroupShortcuts=0
+CreateProgramGroupShortcuts=1
 
 # Choose the name of the Start menu/Application menu shortcut. This setting will be ignored if you choose NOT to create shortcuts.
 ProgramGroupFolder=Xilinx Design Tools
@@ -21,7 +21,7 @@ ProgramGroupFolder=Xilinx Design Tools
 CreateShortcutsForAllUsers=0
 
 # Choose whether shortcuts will be created on the desktop or not.
-CreateDesktopShortcuts=0
+CreateDesktopShortcuts=1
 
 # Choose whether file associations will be created or not.
-CreateFileAssociation=0
+CreateFileAssociation=1