Skip to content

Commit

Permalink
separate stages
Browse files Browse the repository at this point in the history
  • Loading branch information
chibiegg committed May 7, 2017
1 parent bfb5d83 commit c781fc1
Show file tree
Hide file tree
Showing 8 changed files with 50 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
.DS_Store
work/
files/*.bin
01-initial/files/*.bin
6 changes: 3 additions & 3 deletions Dockerfile-initial → 01-initial/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
File renamed without changes.
27 changes: 27 additions & 0 deletions 01-initial/files/install_config.txt
Original file line number Diff line number Diff line change
@@ -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
File renamed without changes.
File renamed without changes.
File renamed without changes.
23 changes: 19 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -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

```
Expand Down

0 comments on commit c781fc1

Please sign in to comment.