Merge pull request #2052 from SvenDowideit/v1.0.x-make-live

make live fixes

.dockerignore

@@ -15,3 +15,4 @@ tests/integration/.tox
 #.dapper
 vendor/*/*/*/.git
 tmp
+docs/_site

docs/Dockerfile.build

@@ -6,6 +6,11 @@ COPY _config.yml /build
 RUN jekyll build
 COPY . /build
 
+# IMPORTANT: this line moves the development docs to where they would be in rancher/rancher.gihub.io
+RUN mv os os-orig \
+    && mkdir -p os/v1.0/en \
+    && mv os-orig/* os/v1.0/en/
+
 # Set up the latest pages that get converted into redirects
 ENV OS_DOCS_LATEST v1.0
 RUN mkdir -p os/latest/en \

docs/Makefile

@@ -16,7 +16,7 @@ run: build-nginx
 # this target will use the jekyll image and bind mount your local repo, when you modify a file, the html will be automatically rebuilt. (the redirects from latest won't work)
 # You can also examine the output html in the _sites dir.
 live:
-	docker run --rm -it -p 80:4000 -v $(PWD):/build rancher/rancher.github.io:build jekyll serve -w -P 4000 --incremental
+	docker run --rm -it -p 80:4000 -v $(PWD)/os:/build/os/v1.0/en rancher/rancher.github.io:build jekyll serve -w -P 4000 --incremental
 
 clean:
 	rm -rf _sites