haskal
/
moloch-dragon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #107 from awalterschulze/master 

Removed build.sh and Pygments dependency
This commit is contained in:
Matthias Vogelgesang 2015-06-29 08:05:44 +02:00
parent 5429f2c646 4407bf2777
commit f15d18ed05
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Dockerfile
View File

@ -5,12 +5,12 @@
FROM ubuntu:trusty FROM ubuntu:trusty
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive
RUN apt-get update -q \ RUN apt-get update -q
&& apt-get install -qy \ RUN apt-get install -qy texlive-full
RUN apt-get install -qy \
gnuplot \ gnuplot \
python-pygments \ wget \
texlive-full \ build-essential
wget
ADD ./getFiraFont.sh ./getFiraFont.sh ADD ./getFiraFont.sh ./getFiraFont.sh
RUN ./getFiraFont.sh RUN ./getFiraFont.sh

2
Makefile
View File

@ -63,7 +63,7 @@ uninstall:
@rmdir $(MANUAL_DIR) @rmdir $(MANUAL_DIR)
docker-run: docker-build 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:
docker build -t $(DOCKER_IMAGE) . docker build -t $(DOCKER_IMAGE) .

5
build.sh
View File

@ -1,5 +0,0 @@
#!/bin/sh
set -xe
xelatex mtheme.ins
xelatex -shell-escape demo.tex
xelatex -shell-escape demo.tex