adjustments after forking

.gitlab-ci.yml

+variables:
+  # Installer files are located on Zerberus NFS share
+  VIVADO_TAR_FILE: "Xilinx_Vivado_SDK_2019.1_0524_1430.tar.gz"
+  VIVADO_VERSION: "2019.1"
+
+stages:
+- build
+
+build:
+  stage: build
+  before_script:
+  - cp /global/installers/${VIVADO_TAR_FILE} .
+  - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD} ${CI_REGISTRY}
+  script:
+  - docker pull ${CI_REGISTRY_IMAGE}:${VIVADO_VERSION} || true
+  - docker build --cache-from ${CI_REGISTRY_IMAGE}:${VIVADO_VERSION} --build-arg VIVADO_VERSION=${VIVADO_VERSION} --build-arg VIVADO_TAR_FILE=${VIVADO_TAR_FILE} --tag ${CI_REGISTRY_IMAGE}:latest --tag ${CI_REGISTRY_IMAGE}:${VIVADO_VERSION} .
+  - docker push ${CI_REGISTRY_IMAGE}:${VIVADO_VERSION}
+  - docker push ${CI_REGISTRY_IMAGE}:latest
+  tags:
+  - shell
+  - linux

Dockerfile

-FROM ubuntu:16.04
+FROM ubuntu:18.04
 
 MAINTAINER z4yx <z4yx@users.noreply.github.com>
 
-# 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 .
+# Build with:
+# docker build \
+#   --build-arg VIVADO_VERSION=2018.1 \
+#   --build-arg VIVADO_TAR_FILE=Xilinx_Vivado_SDK_2018.1_0405_1.tar.gz \
+#    --tag vivado:2018.1 .
 
-ARG UBUNTU_MIRROR=mirror.tuna.tsinghua.edu.cn
-
-#install dependences for:
+# 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 sed -i.bak s/archive.ubuntu.com/${UBUNTU_MIRROR}/g /etc/apt/sources.list && \
-  apt-get update && apt-get install -y \
-  build-essential \
-  sudo \
-  libxtst6 \
-  libglib2.0-0 \
-  libsm6 \
-  libxi6 \
-  libxrender1 \
-  libxrandr2 \
-  libfreetype6 \
-  libfontconfig \
-  lsb-release \
-  git
+RUN apt-get update && \
+    apt-get install -y \
+        build-essential \
+        sudo \
+        libxtst6 \
+        libglib2.0-0 \
+        libsm6 \
+        libxi6 \
+        libxrender1 \
+        libxrandr2 \
+        libfreetype6 \
+        libfontconfig \
+        lsb-release
 
 ARG VIVADO_VERSION
 ARG VIVADO_TAR_FILE
 
 RUN mkdir /install_vivado
 COPY install_config.txt /
+
 # ADD does the extraction
 ADD ${VIVADO_TAR_FILE} /install_vivado/
 
-# run the install
+# Run the install
 RUN /install_vivado/*/xsetup --agree 3rdPartyEULA,WebTalkTerms,XilinxEULA --batch Install --config /install_config.txt && \
   rm -rf /${VIVADO_TAR_FILE} /install_config.txt /install_vivado
 
-#make a Vivado user
+# Make a Vivado user
 RUN adduser --disabled-password --gecos '' vivado &&\
   usermod -aG sudo vivado &&\
   echo "vivado ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
@@ -48,10 +50,10 @@ WORKDIR /home/vivado
 ENV HOME /home/vivado
 ENV VIVADO_VERSION ${VIVADO_VERSION}
 
-#add vivado tools to path
+# Add vivado tools to path
 RUN echo "source /opt/Xilinx/Vivado/${VIVADO_VERSION}/settings64.sh" >> /home/vivado/.bashrc
 
-#copy in the license file
+# Copy in the license file
 #RUN mkdir /home/vivado/.Xilinx
 #COPY Xilinx.lic /home/vivado/.Xilinx/
 

install_config.txt

@@ -5,7 +5,7 @@ Edition=Vivado HL WebPACK
 Destination=/opt/Xilinx
 
 # Choose the Products/Devices the you would like to install.
-Modules=DocNav:0,Kintex UltraScale:0,Spartan-7:0,Artix-7:1,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+ 58G ES:0,Zynq UltraScale+ MPSoC ES:0,System Generator for DSP:0,Kintex-7:0,Kintex UltraScale+:0,MicroBlaze:0,Virtex UltraScale+ HBM ES:0
+Modules=DocNav:1,Kintex UltraScale:0,Spartan-7:0,Artix-7:0,Model Composer:0,ARM Cortex-A53:1,Zynq UltraScale+ MPSoC:1,Zynq-7000:1,SDK Core Tools:1,ARM Cortex-A9:1,ARM Cortex R5:1,Virtex UltraScale+ 58G ES:0,Zynq UltraScale+ MPSoC ES:0,System Generator for DSP:1,Kintex-7:0,Kintex UltraScale+:1,MicroBlaze:1,Virtex UltraScale+ HBM ES: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=Enable WebTalk for SDK to send usage statistics to Xilinx:1
@@ -25,4 +25,3 @@ CreateDesktopShortcuts=1
 
 # Choose whether file associations will be created or not.
 CreateFileAssociation=1
-