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 1/4] 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

From eb58bbed6d3a1147c76d181de0368dd2faf3b656 Mon Sep 17 00:00:00 2001
From: Walter Schulze <awalterschulze@gmail.com>
Date: Sat, 27 Jun 2015 12:08:48 +0200
Subject: [PATCH 2/4] fixed Makefile

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index cb7c885..d903aba 100644
--- a/Makefile
+++ b/Makefile
@@ -62,7 +62,7 @@ uninstall:
 	@rmdir $(INSTALL_DIR)
 	@rmdir $(MANUAL_DIR)
 
-docker-run: docker-build $(DEMO_PDF) $(MANUAL_PDF) $(STY)
+docker-run: docker-build
 	docker run --rm=true --name $(DOCKER_CONTAINER) -i -t -v `pwd`:/data $(DOCKER_IMAGE) /data/build.sh
 
 docker-build: 

From 349997b8281ee4862a150b4f1e4e6c96f2bfabfa Mon Sep 17 00:00:00 2001
From: Walter Schulze <awalterschulze@gmail.com>
Date: Sat, 27 Jun 2015 12:10:12 +0200
Subject: [PATCH 3/4] minor cleanup

---
 Dockerfile | 1 -
 Makefile   | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index be452ec..c8a3269 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,6 @@ RUN apt-get update -q
 RUN apt-get install -qy texlive-full
 RUN apt-get install -qy \
             gnuplot \
-#            python-pygments \
             wget \
             build-essential
 
diff --git a/Makefile b/Makefile
index d903aba..42337e8 100644
--- a/Makefile
+++ b/Makefile
@@ -65,7 +65,7 @@ uninstall:
 docker-run: docker-build
 	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:

From 4407bf2777780c96538534b8a91b85990321a05e Mon Sep 17 00:00:00 2001
From: Walter Schulze <awalterschulze@gmail.com>
Date: Sat, 27 Jun 2015 12:33:01 +0200
Subject: [PATCH 4/4] no more need for build.sh

---
 Makefile | 2 +-
 build.sh | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)
 delete mode 100755 build.sh

diff --git a/Makefile b/Makefile
index 42337e8..205245a 100644
--- a/Makefile
+++ b/Makefile
@@ -63,7 +63,7 @@ uninstall:
 	@rmdir $(MANUAL_DIR)
 
 docker-run: docker-build
-	docker run --rm=true --name $(DOCKER_CONTAINER) -i -t -v `pwd`:/data $(DOCKER_IMAGE) /data/build.sh
+	docker run --rm=true --name $(DOCKER_CONTAINER) -i -t -v `pwd`:/data $(DOCKER_IMAGE) make
 
 docker-build:
 	docker build -t $(DOCKER_IMAGE) .
diff --git a/build.sh b/build.sh
deleted file mode 100755
index 34b256c..0000000
--- a/build.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-set -xe
-make all