Clean up image names. Integrate license management script.

1 files changed, 7 insertions, 4 deletions

diff --git a/stage2/Dockerfile b/stage2/Dockerfile
index 6b1c170..f9fc768 100644
--- a/stage2/Dockerfile
+++ b/stage2/Dockerfile
@@ -1,4 +1,4 @@
-FROM xilinx:loaded
+FROM cryptech-builder:stage1
 
 RUN ln -sf /bin/bash /bin/sh
 
@@ -8,7 +8,10 @@ RUN apt-get update && apt-get install -y \
     python-xvfbwrapper \
     ratpoison
 
-COPY installer /xilinx-unpack/
+COPY builder installer licenser /xilinx-unpack/
 
-#RUN /xilinx-unpack/installer
-#RUN rm -rf /xilinx-unpack
+# For the moment we're licensing as root.  Probably need to change
+# that since building as root is a really bad idea.  License file goes
+# in home directory of user who will be running the builds.
+
+COPY Xilinx.lic /root