From 9316d94dc361b2c8d32237e69f47c1eb722d7dd0 Mon Sep 17 00:00:00 2001 From: Sven Dowideit Date: Wed, 15 Jul 2015 20:29:24 -0700 Subject: [PATCH] WIP fixing hugo linking Signed-off-by: Sven Dowideit --- Dockerfile | 25 ++++++++++++++++--------- Makefile | 8 ++++++++ 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2e4ef69a89..0ca2ca2fd2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,6 +6,13 @@ COPY . /src COPY . /docs/content/docker-trusted-registry/ +WORKDIR /docs/content + +ADD touch-up.sh /docs/content/touch-up.sh +RUN /docs/content/touch-up.sh + +WORKDIR /docs + # Sed to process GitHub Markdown # 1-2 Remove comment code from metadata block # 3 Change ](/word to ](/project/ in links @@ -15,12 +22,12 @@ COPY . /docs/content/docker-trusted-registry/ # 7 Change ](../../ to ](/project/ # 8 Change ](../ to ](/project/ # -RUN find /docs/content/docker-trusted-registry -type f -name "*.md" -exec sed -i.old \ - -e '/^/g' \ - -e '/^/g' \ - -e 's/\(\]\)\([(]\)\(\/\)/\1\2\/docker-trusted-registry\//g' \ - -e 's/\(\][(]\)\([A-z].*\)\(\.md\)/\1\/docker-trusted-registry\/\2/g' \ - -e 's/\([(]\)\(.*\)\(\.md\)/\1\2/g' \ - -e 's/\(\][(]\)\(\.\/\)/\1\/docker-trusted-registry\//g' \ - -e 's/\(\][(]\)\(\.\.\/\.\.\/\)/\1\/docker-trusted-registry\//g' \ - -e 's/\(\][(]\)\(\.\.\/\)/\1\/docker-trusted-registry\//g' {} \; +#RUN find /docs/content/docker-trusted-registry -type f -name "*.md" -exec sed -i.old \ +# -e '/^/g' \ +# -e '/^/g' \ +# -e 's/\(\]\)\([(]\)\(\/\)/\1\2\/docker-trusted-registry\//g' \ +# -e 's/\(\][(]\)\([A-z].*\)\(\.md\)/\1\/docker-trusted-registry\/\2/g' \ +# -e 's/\([(]\)\(.*\)\(\.md\)/\1\2/g' \ +# -e 's/\(\][(]\)\(\.\/\)/\1\/docker-trusted-registry\//g' \ +# -e 's/\(\][(]\)\(\.\.\/\.\.\/\)/\1\/docker-trusted-registry\//g' \ +# -e 's/\(\][(]\)\(\.\.\/\)/\1\/docker-trusted-registry\//g' {} \; diff --git a/Makefile b/Makefile index 021e8f6e5e..5647aba07d 100644 --- a/Makefile +++ b/Makefile @@ -36,6 +36,14 @@ GITCOMMIT := $(shell git rev-parse --short HEAD 2>/dev/null) default: docs +test: docs-build + $(DOCKER_RUN_DOCS) -p $(if $(DOCSPORT),$(DOCSPORT):)8000 \ + -v $(CURDIR):/docs/content/docker-hub/ \ + -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" \ + hugo server \ + --log --watch --buildDrafts=true \ + --port=$(DOCSPORT) --baseUrl=$(HUGO_BASE_URL) --bind=$(HUGO_BIND_IP) + docs: docs-build $(DOCKER_RUN_DOCS) -p $(if $(DOCSPORT),$(DOCSPORT):)8000 -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" hugo server --port=$(DOCSPORT) --baseUrl=$(HUGO_BASE_URL) --bind=$(HUGO_BIND_IP)