Browse code

Merge pull request #22890 from thaJeztah/docs/slashes

fix docs not building if branch-name contains slashes
(cherry picked from commit 07f79621ea3aef5220d6c275fcab03bb4ed6ce22)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Vincent Demeester authored on 2016/05/23 00:49:08
Showing 1 changed files
... ...
@@ -24,9 +24,8 @@ HUGO_BASE_URL=$(shell test -z "$(DOCKER_IP)" && echo localhost || echo "$(DOCKER
24 24
 HUGO_BIND_IP=0.0.0.0
25 25
 
26 26
 GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null)
27
-DOCKER_IMAGE := docker$(if $(GIT_BRANCH),:$(GIT_BRANCH))
28
-DOCKER_DOCS_IMAGE := docs-base$(if $(GIT_BRANCH),:$(GIT_BRANCH))
29
-
27
+GIT_BRANCH_CLEAN := $(shell echo $(GIT_BRANCH) | sed -e "s/[^[:alnum:]]/-/g")
28
+DOCKER_DOCS_IMAGE := docker-docs$(if $(GIT_BRANCH_CLEAN),:$(GIT_BRANCH_CLEAN))
30 29
 
31 30
 DOCKER_RUN_DOCS := docker run --rm -it $(DOCS_MOUNT) -e AWS_S3_BUCKET -e NOCACHE
32 31