From bbb91092762a0a039755c7473eb68b9a2765a604 Mon Sep 17 00:00:00 2001
From: Walter Schulze <awalterschulze@gmail.com>
Date: Sat, 27 Jun 2015 11:58:18 +0200
Subject: [PATCH] trying make all

---
 Dockerfile | 11 ++++++-----
 Makefile   |  4 ++--
 build.sh   |  4 +---
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e93527e..be452ec 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,12 +5,13 @@
 FROM ubuntu:trusty
 ENV DEBIAN_FRONTEND noninteractive
 
-RUN apt-get update -q \
-	&& apt-get install -qy \
+RUN apt-get update -q
+RUN apt-get install -qy texlive-full
+RUN apt-get install -qy \
             gnuplot \
-            python-pygments \
-        	texlive-full \
-            wget
+#            python-pygments \
+            wget \
+            build-essential
 
 ADD ./getFiraFont.sh ./getFiraFont.sh
 RUN ./getFiraFont.sh
diff --git a/Makefile b/Makefile
index 42337e8..cb7c885 100644
--- a/Makefile
+++ b/Makefile
@@ -62,10 +62,10 @@ uninstall:
 	@rmdir $(INSTALL_DIR)
 	@rmdir $(MANUAL_DIR)
 
-docker-run: docker-build
+docker-run: docker-build $(DEMO_PDF) $(MANUAL_PDF) $(STY)
 	docker run --rm=true --name $(DOCKER_CONTAINER) -i -t -v `pwd`:/data $(DOCKER_IMAGE) /data/build.sh
 
-docker-build:
+docker-build: 
 	docker build -t $(DOCKER_IMAGE) .
 
 docker-rm:
diff --git a/build.sh b/build.sh
index 7733e5f..34b256c 100755
--- a/build.sh
+++ b/build.sh
@@ -1,5 +1,3 @@
 #!/bin/sh
 set -xe
-xelatex mtheme.ins
-xelatex -shell-escape demo.tex
-xelatex -shell-escape demo.tex
+make all