aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2019-02-11 16:11:50 +0000
committerRob Austein <sra@hactrn.net>2019-02-11 16:11:50 +0000
commitc2b870dce68ea9a0cc207cd7e7f6bbcffe40fcb2 (patch)
tree8ce18f0d5145f12da1e83f930b1431a41a6fa40d
parente556e6643e5d2300a38e4373bde45e83178becaf (diff)
Missing library.
Pretty sure these changes are correct, but Xvfb is refusing to start under `docker build`. Worked under `docker run`. Investigate when next I have time to spend on this hack.
-rw-r--r--Makefile6
-rw-r--r--stage2/Dockerfile1
2 files changed, 4 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 3162bad..58db110 100644
--- a/Makefile
+++ b/Makefile
@@ -14,15 +14,15 @@ stage0.stamp:
sudo rm -rf stage0/jessie_chroot
touch $@
-stage1.stamp: stage0.stamp
+stage1.stamp: stage0.stamp stage1/Dockerfile
cd stage1; docker build -t xilinx:loaded .
touch $@
-stage2.stamp: stage1.stamp
+stage2.stamp: stage1.stamp stage2/Dockerfile
cd stage2; docker build -t xilinx:installed .
touch $@
-stage3.stamp: stage2.stamp
+stage3.stamp: stage2.stamp stage3/Dockerfile
cd stage3; docker build -t cryptech-alpha-builder .
touch $@
diff --git a/stage2/Dockerfile b/stage2/Dockerfile
index ae2b272..7b69f88 100644
--- a/stage2/Dockerfile
+++ b/stage2/Dockerfile
@@ -4,6 +4,7 @@ RUN ln -sf /bin/bash /bin/sh
RUN apt-get update && apt-get install -y \
libglib2.0-0 \
+ libxrandr2 \
python-xvfbwrapper \
ratpoison