aboutsummaryrefslogtreecommitdiff
path: root/stage2/Dockerfile
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2019-02-11 07:39:38 +0000
committerRob Austein <sra@hactrn.net>2019-02-11 07:39:38 +0000
commite556e6643e5d2300a38e4373bde45e83178becaf (patch)
treec9e271d04b8564e0680bb1d58a25045db50d7ac8 /stage2/Dockerfile
parent6f526cc4567cb551feb4cae121f9a067d491f711 (diff)
debootstrap, XiLinx installation.
Diffstat (limited to 'stage2/Dockerfile')
-rw-r--r--stage2/Dockerfile20
1 files changed, 6 insertions, 14 deletions
diff --git a/stage2/Dockerfile b/stage2/Dockerfile
index 3878080..ae2b272 100644
--- a/stage2/Dockerfile
+++ b/stage2/Dockerfile
@@ -1,22 +1,14 @@
-FROM xilinx:loadonly
-
-# Whack /bin/sh (known issue with XiLinx tools not working with /bin/dash)
+FROM xilinx:loaded
RUN ln -sf /bin/bash /bin/sh
-# Here's where it gets really fun: let's see if we can drive the
-# frelling XiLinx installation under Xvfb. Need some tools first,
-# then some manual debugging to get the details right. Don't expect
-# to need all of the following once we've debugged this.
-
RUN apt-get update && apt-get install -y \
libglib2.0-0 \
python-xvfbwrapper \
- ratpoison \
- x11-apps \
- x11-utils \
- x11-xserver-utils \
- xautomation
+ ratpoison
COPY installer /xilinx-unpack/
-CMD /xilinx-unpack/installer
+
+RUN /xilinx-unpack/installer
+
+#RUN rm -rf /xilinx-unpack