Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

static-linux: allow setting TREE to build from arbitrary git commit.

Browse source
This commit is contained in:
John MacFarlane 2017-03-19 10:24:25 +01:00
parent 18ff3db1f0
commit 5922237b58
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
static-linux/Dockerfile
View file

@ -20,6 +20,7 @@ RUN stack install --stack-yaml stack.pkg.yaml --only-dependencies \
--test --ghc-options '-O2 -optc-Os -optl-static -fPIC' \ --test --ghc-options '-O2 -optc-Os -optl-static -fPIC' \
pandoc pandoc-citeproc pandoc pandoc-citeproc
CMD git pull && \ CMD git pull && \
git checkout -b work $TREE && \
export VERSION=`grep '^Version:' pandoc.cabal | awk '{print $$2;}'` && \ export VERSION=`grep '^Version:' pandoc.cabal | awk '{print $$2;}'` && \
stack install --stack-yaml stack.pkg.yaml \ stack install --stack-yaml stack.pkg.yaml \
--local-bin-path /artifacts --flag 'pandoc:embed_data_files' \ --local-bin-path /artifacts --flag 'pandoc:embed_data_files' \

5
static-linux/Makefile
View file

@ -1,11 +1,12 @@
TREE?=HEAD
ARTIFACTS=`pwd`/artifacts ARTIFACTS=`pwd`/artifacts
build: build:
mkdir -p $(ARTIFACTS) mkdir -p $(ARTIFACTS)
docker run -v $(ARTIFACTS):/artifacts alpine-pandoc docker build -t alpine-pandoc .
docker run --env TREE=$(TREE) -v $(ARTIFACTS):/artifacts alpine-pandoc
setup: setup:
docker pull alpine:edge docker pull alpine:edge
docker build -t alpine-pandoc .
.PHONY: build setup .PHONY: build setup