Might actually be working?

5 files changed, 16 insertions, 6 deletions

diff --git a/.dockerignore b/.dockerignore
index 7acbd49..aea2508 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,10 +1,12 @@
 Builder
+cryptech-builder-stage1.xz
 .git
 .gitignore
 *.log
 Makefile
 ratinox
 README.md
+screenshots/*.png
 *.stamp
 Xilinx_ISE_DS_Lin_14.7_1015_1.tar
 Xilinx.lic
diff --git a/Builder b/Builder
index 31e79d6..b74f92d 100755
--- a/Builder
+++ b/Builder
@@ -24,4 +24,6 @@ ln -sf /bin/bash /bin/sh
 
 /cryptech-builder/Ratinox
 
+chown -R builder:builder /home/builder
+
 rm -rf /Xilinx_ISE_DS_Lin_14.7_1015_1 /home/builder/Xilinx.lic
diff --git a/Dockerfile b/Dockerfile
index 2771f40..0a787bf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM cryptech-builder:stage1
+FROM cryptech-builder:stage2
 
 RUN echo 'deb http://deb.debian.org/debian jessie-backports main' > /etc/apt/sources.list.d/backports.list
 
diff --git a/Makefile b/Makefile
index 84fcd7c..8ebb87b 100644
--- a/Makefile
+++ b/Makefile
@@ -13,14 +13,20 @@ stage1.stamp: stage0.stamp Builder Ratinox
 		--mount type=bind,source=$(abspath .),target=/cryptech-builder \
 		cryptech-builder:stage0 \
 		/cryptech-builder/Builder
-	docker commit cryptech-builder-stage1 cryptech-builder:stage1
+	docker export cryptech-builder-stage1 | \
+		xz -v >cryptech-builder-stage1.xz
 	docker container rm cryptech-builder-stage1
 	touch $@
 
-stage2.stamp: stage1.stamp Dockerfile
+stage2.stamp: stage1.stamp
+	docker rmi cryptech-builder:stage0
+	docker import cryptech-builder-stage1.xz cryptech-builder:stage2
+#	rm cryptech-builder-stage1.xz
+	touch $@
+
+stage3.stamp: stage2.stamp Dockerfile
 	docker build -t cryptech-builder .
 	touch $@
 
 clean:
-	rm -f *.stamp Xvfb_screen*
-
+	rm -f *.stamp Xvfb_screen* cryptech-builder-stage1.xz
diff --git a/Ratinox b/Ratinox
index e3b2f43..67421e3 100755
--- a/Ratinox
+++ b/Ratinox
@@ -17,7 +17,7 @@ def click(*coordinates):
     assert len(coordinates) in (0, 2)
     if coordinates:
         subprocess.check_call(("ratpoison", "-c", "ratwarp {:d} {:d}".format(*coordinates)))
-    shutil.copy(screencap_file, "{}.{:f}".format(screencap_file, time.time()))
+    shutil.copy(screencap_file, "{}.{:f}.xwd".format(screencap_file, time.time()))
     subprocess.check_call(("ratpoison", "-c", "ratclick"))
 
 with xvfbwrapper.Xvfb(fbdir = screencap_dir):