From 0ca9d2581042b11ff2fb04e9095f033a6edf74a2 Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Wed, 13 Feb 2019 20:57:24 +0000 Subject: Clean up image names. Integrate license management script. --- stage2/Dockerfile | 11 +++++++---- stage2/builder | 6 ++++++ stage2/finish.png | Bin 640 -> 0 bytes 3 files changed, 13 insertions(+), 4 deletions(-) create mode 100755 stage2/builder delete mode 100644 stage2/finish.png (limited to 'stage2') 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 diff --git a/stage2/builder b/stage2/builder new file mode 100755 index 0000000..ac3432b --- /dev/null +++ b/stage2/builder @@ -0,0 +1,6 @@ +#!/bin/sh + +set -ex +cd /xilinx-unpack +./installer +./licenser diff --git a/stage2/finish.png b/stage2/finish.png deleted file mode 100644 index 4129820..0000000 Binary files a/stage2/finish.png and /dev/null differ -- cgit v1.2.3