do not add the installer files to docker

This commit is contained in:
Christof Harnischmacher 2018-06-29 17:31:24 +02:00
parent 225d27ec27
commit 9bf9bbb64f
7 changed files with 24 additions and 14 deletions

1
.dockerignore Normal file
View File

@ -0,0 +1 @@
xilinx-installer

4
.gitignore vendored
View File

@ -1,2 +1,2 @@
files/root/install/Xilinx_ISE_DS_14.7_1015*
files/root/.Xilinx/Xilinx.lic
xilinx-installer/Xilinx_ISE_DS_14.7_1015*
xilinx-installer/Xilinx.lic

View File

@ -4,7 +4,7 @@ FROM ubuntu:14.04
RUN apt-get update && \
apt-get -y install git expect emacs24-nox locales \
libglib2.0-0 libsm6 libxi6 libxrender1 libxrandr2 \
libfreetype6 libfontconfig1
libfreetype6 libfontconfig1 wget
# Set LOCALE to UTF8
RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && \
@ -15,7 +15,13 @@ RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && \
ADD files /
RUN cd /root/install && \
wget "http://127.0.0.1:8765/Xilinx_ISE_DS_14.7_1015_1-1.tar" && \
wget "http://127.0.0.1:8765/Xilinx_ISE_DS_14.7_1015_1-2.zip.xz" && \
wget "http://127.0.0.1:8765/Xilinx_ISE_DS_14.7_1015_1-3.zip.xz" && \
wget "http://127.0.0.1:8765/Xilinx_ISE_DS_14.7_1015_1-4.zip.xz" && \
wget "http://127.0.0.1:8765/Xilinx.lic" && \
tar xvf Xilinx_ISE_DS_14.7_1015_1-1.tar && \
TERM=xterm /root/setup && \
cd && \
mv /root/install/Xilinx.lic /root/.Xilinx/ && \
rm -rf /root/setup /root/install

View File

@ -21,16 +21,16 @@ To build the docker image, do the following:
- [Windows 7/XP/Server and Linux Install Data B - File 3/4](https://www.xilinx.com/member/forms/download/xef.html?filename=Xilinx_ISE_DS_14.7_1015_1-3.zip.xz)
- [Windows 7/XP/Server and Linux Install Data C - File 4/4](https://www.xilinx.com/member/forms/download/xef.html?filename=Xilinx_ISE_DS_14.7_1015_1-4.zip.xz)
1. Copy Downloads to local install folder:
1. Copy Downloads to xilinx-installer folder:
```
cp ~/Downloads/Xilinx_ISE_DS_14.7_1015_* files/root/install/
cp ~/Downloads/Xilinx_ISE_DS_14.7_1015_* xilinx-installer/
```
1. Create a free license via the [Licensing Solution Center](https://www.xilinx.com/getlicense)
1. Add license:
```
cp ~/Downloads/Xilinx.lic files/root/.Xilinx/
cp ~/Downloads/Xilinx.lic xilinx-installer/
```
1. Run docker build:

17
build
View File

@ -2,17 +2,20 @@
set -e
DOCKER_TARGET=chriz2600
cd $(dirname $0)
DOCKER_TARGET=docker.i74.de:5000
IMAGE_NAME=xilinx-ise
IMAGE_TAG=14.7
docker build --rm -t ${DOCKER_TARGET}/${IMAGE_NAME}:${IMAGE_TAG} .
#if command -v docker-squash ; then
# echo "Running docker-squash as root"
# sudo docker-squash ${DOCKER_TARGET}/${IMAGE_NAME}:${IMAGE_TAG}
#fi
# start small webserver to hold install files
cd xilinx-installer
python3 -m http.server 8765 --bind 127.0.0.1 >/dev/null 2>&1 &
HTTP_SERVER_PID=$!
trap "echo 'stopping $HTTP_SERVER_PID' ; if [ $HTTP_SERVER_PID ] ; then kill $HTTP_SERVER_PID ; fi" SIGINT SIGTERM EXIT
cd ..
docker build --network host --rm -t ${DOCKER_TARGET}/${IMAGE_NAME}:${IMAGE_TAG} .
docker tag ${DOCKER_TARGET}/${IMAGE_NAME}:${IMAGE_TAG} ${DOCKER_TARGET}/${IMAGE_NAME}:latest
read -n1 -p "Do you want to push the image to the registry now [yN]? " answer

2
xilinx
View File

@ -1,3 +1,3 @@
#!/bin/bash
docker run --rm -it -v $(pwd):/build chriz2600/xilinx-ise:latest /usr/local/bin/wrapper "$@"
docker run --rm -it -v $(pwd):/build docker.i74.de:5000/xilinx-ise:latest /usr/local/bin/wrapper "$@"

View File