From 17319842b3b9ec4465562e2569000be5bc92f6b7 Mon Sep 17 00:00:00 2001 From: Thomas Rudin Date: Fri, 8 Feb 2019 21:38:08 +0100 Subject: [PATCH] doc fixes --- Makefile | 2 +- doc/config.md | 2 +- server/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 9143152..67f12a1 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ OUT_DIR=output MOD_ZIP=$(OUT_DIR)/mapserver-mod.zip all: $(OUT_DIR) $(MOD_ZIP) - $(MAKE) -C server all + $(MAKE) -C server build-docker cp server/output/* $(OUT_DIR)/ $(OUT_DIR): diff --git a/doc/config.md b/doc/config.md index 39ea47b..02b280f 100644 --- a/doc/config.md +++ b/doc/config.md @@ -51,7 +51,7 @@ The mapserver will generate a fresh `mapserver.json` if there is none at startup The port on which the server listens to #### webapi.secretkey -The generated secret for the [mod bridge](./mod) +The generated secret for the [mod bridge](./mod.md) #### layers The layers as a list diff --git a/server/Makefile b/server/Makefile index 4a5a2e1..b0fd301 100644 --- a/server/Makefile +++ b/server/Makefile @@ -21,7 +21,7 @@ $(STATIC_VFS): go run github.com/mjibson/esc -o vfs/static.go -prefix="static/" -pkg vfs static build-docker: - docker run --rm -it -v /home/thomas/git/mapserver/server/:/app -v mapserver-volume:/root/go -w /app mapserver-builder make + sudo docker run --rm -it -v $(shell pwd)/:/app -v mapserver-volume:/root/go -w /app mapserver-builder make build: $(STATIC_VFS) $(OUT_DIR) # native