From 1310e0b5635ee2bd4215a2fbfaa23b7d15e0377c Mon Sep 17 00:00:00 2001
From: Rob Austein <sra@hactrn.net>
Date: Thu, 14 Feb 2019 14:40:54 +0000
Subject: Install now working but not licensing

---
 Builder1 | 7 +++++++
 Builder2 | 7 -------
 Makefile | 6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Builder1 b/Builder1
index 5285458..96ac1f1 100755
--- a/Builder1
+++ b/Builder1
@@ -15,3 +15,10 @@ apt-get install -y \
     python-xvfbwrapper \
     ratpoison \
     sudo
+
+/cryptech-builder/ratinox ise-install
+
+rm -rf /Xilinx_ISE_DS_Lin_14.7_1015_1
+
+adduser --disabled-password --gecos 'Cryptech Build Bot' --shell /bin/sh builder
+echo >/etc/sudoers.d/builder 'builder ALL = (ALL) NOPASSWD: SETENV: ALL'
diff --git a/Builder2 b/Builder2
index c464435..fdbb7fb 100755
--- a/Builder2
+++ b/Builder2
@@ -2,13 +2,6 @@
 
 set -ex
 
-/cryptech-builder/ratinox ise-install
-
-rm -rf /Xilinx_ISE_DS_Lin_14.7_1015_1
-
-adduser --disabled-password --gecos 'Cryptech Build Bot' --shell /bin/sh builder
-echo >/etc/sudoers.d/builder 'builder ALL = (ALL) NOPASSWD: SETENV: ALL'
-
 install -o builder -g builder /cryptech-builder/Xilinx.lic /home/builder/Xilinx.lic
 
 sudo -u builder /cryptech-builder/ratinox license-user
diff --git a/Makefile b/Makefile
index 6e8b401..2029ea1 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ stage0.stamp:
 	sudo rm -rf fs
 	touch $@
 
-stage1.stamp: stage0.stamp
+stage1.stamp: stage0.stamp Builder1
 	docker run -it --name cryptech-builder-stage1 \
 		--mount type=bind,source=$(abspath .),target=/cryptech-builder \
 		cryptech-builder:stage0 \
@@ -17,7 +17,7 @@ stage1.stamp: stage0.stamp
 	docker container rm cryptech-builder-stage1
 	touch $@
 
-stage2.stamp: stage1.stamp
+stage2.stamp: stage1.stamp Builder2
 	docker run -it --name cryptech-builder-stage2 \
 		--mount type=bind,source=$(abspath .),target=/cryptech-builder \
 		cryptech-builder:stage1 \
@@ -26,7 +26,7 @@ stage2.stamp: stage1.stamp
 	docker container rm cryptech-builder-stage2
 	touch $@
 
-stage3.stamp: stage2.stamp
+stage3.stamp: stage2.stamp Dockerfile
 	docker build -t cryptech-builder .
 	touch $@
 
-- 
cgit v1.2.3