Koldun/mapserver
1
0
Fork 0
forked from MTSR/mapserver
Code Pull Requests Activity

docker stuff

Browse Source
This commit is contained in:
Thomas Rudin 2019-04-02 19:12:53 +02:00
parent 9daf878049
commit 70ab8ee90a
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@ -3,9 +3,7 @@ OUT_DIR=output
MOD_ZIP=$(OUT_DIR)/mapserver-mod.zip MOD_ZIP=$(OUT_DIR)/mapserver-mod.zip
VERSION=git-$(shell git rev-parse HEAD) VERSION=git-$(shell git rev-parse HEAD)
all: $(OUT_DIR) $(MOD_ZIP) all: builder_image $(OUT_DIR) $(MOD_ZIP)
# build the docker image with all dependencies
$(MAKE) -C docker_builder build
# build all with the docker image # build all with the docker image
sudo docker run --rm -it\ sudo docker run --rm -it\
-v $(shell pwd)/server/:/app\ -v $(shell pwd)/server/:/app\
@ -16,10 +14,15 @@ all: $(OUT_DIR) $(MOD_ZIP)
# copy generated files to output dir # copy generated files to output dir
cp server/output/* $(OUT_DIR)/ cp server/output/* $(OUT_DIR)/
builder_image:
# build the docker image with all dependencies
$(MAKE) -C docker_builder build
$(OUT_DIR): $(OUT_DIR):
mkdir $@ mkdir $@
$(MOD_ZIP): $(OUT_DIR) $(MOD_ZIP): builder_image $(OUT_DIR)
# lint with luacheck # lint with luacheck
sudo docker run --rm -it\ sudo docker run --rm -it\
-v $(shell pwd)/mapserver_mod/mapserver:/app\ -v $(shell pwd)/mapserver_mod/mapserver:/app\