diff --git a/.gitignore b/.gitignore index 9693b4f..9e26b34 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ .DS_Store work/ -files/*.bin +01-initial/files/*.bin diff --git a/Dockerfile-initial b/01-initial/Dockerfile similarity index 87% rename from Dockerfile-initial rename to 01-initial/Dockerfile index 6d63576..529d2f1 100644 --- a/Dockerfile-initial +++ b/01-initial/Dockerfile @@ -4,11 +4,11 @@ RUN apt-get update && apt-get -y upgrade && apt-get install -y libxrender-dev li RUN mkdir -p /opt ADD files/Xilinx_Vivado_SDK_2016.1_0409_1_Lin64.bin /opt/Xilinx_Vivado_SDK_2016.1_0409_1_Lin64.bin -RUN chmod +x /opt/Xilinx_Vivado_SDK_2016.1_0409_1_Lin64.bin +ADD files/install_config.txt /opt/install_config.txt ADD files/install.sh /opt/install.sh -ENV DISPLAY :0 +RUN chmod +x /opt/Xilinx_Vivado_SDK_2016.1_0409_1_Lin64.bin -EXPOSE 5900 +ENV DISPLAY :0 CMD ["/opt/install.sh"] diff --git a/files/install.sh b/01-initial/files/install.sh similarity index 100% rename from files/install.sh rename to 01-initial/files/install.sh diff --git a/01-initial/files/install_config.txt b/01-initial/files/install_config.txt new file mode 100644 index 0000000..ecdda7a --- /dev/null +++ b/01-initial/files/install_config.txt @@ -0,0 +1,27 @@ +#### Vivado HL WebPACK Install Configuration #### +Edition=Vivado HL WebPACK + +# Path where Xilinx software will be installed. +Destination=/opt/Xilinx + +# Choose the Products/Devices the you would like to install. +Modules=Software Development Kit (SDK):0,DocNav:1,Kintex UltraScale:1,Zynq-7000:1,System Generator for DSP:0,Artix-7:0,Kintex-7: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 + +## Shortcuts and File associations ## +# Choose whether Start menu/Application menu shortcuts will be created or not. +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 + +# Choose whether shortcuts will be created for All users or just the Current user. Shortcuts can be created for all users only if you run the installer as administrator. +CreateShortcutsForAllUsers=0 + +# Choose whether shortcuts will be created on the desktop or not. +CreateDesktopShortcuts=1 + +# Choose whether file associations will be created or not. +CreateFileAssociation=1 diff --git a/Dockerfile-commit b/02-commit/Dockerfile similarity index 100% rename from Dockerfile-commit rename to 02-commit/Dockerfile diff --git a/files/entrypoint.sh b/02-commit/files/entrypoint.sh similarity index 100% rename from files/entrypoint.sh rename to 02-commit/files/entrypoint.sh diff --git a/files/xstartup b/02-commit/files/xstartup similarity index 100% rename from files/xstartup rename to 02-commit/files/xstartup diff --git a/README.md b/README.md index 1346de2..b04ec78 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,29 @@ ## Build -Place installer at `files/Xilinx_Vivado_SDK_2016.1_0409_1_Lin64.bin`. +Place installer at `01-initial/files/Xilinx_Vivado_SDK_2016.1_0409_1_Lin64.bin`. + + +### Stage 1 + +Install vivado manually. ``` -docker build -t vivado:initial -f Dockerfile-initial . -docker run -ti -p 5900:5900 --name vivado_install vivado:initial # Install with GUI +cd ./01-initial/ +docker build -t vivado:initial . +docker rm vivado_install +docker run -ti -p 5900:5900 --name vivado_install vivado:initial # Install with GUI on VNC docker commit vivado_install vivado:installed -docker build -t vivado:2016.01 -f Dockerfile-commit . ``` + +### Stage 2 + +``` +cd ./02-commit/ +docker build -t vivado:2016.01 . +``` + + ## Run ```