From 6d4ea99b12888f5b2ae33aaef17809d0b20f7eb9 Mon Sep 17 00:00:00 2001
From: Jeff Mendoza <jeffmendoza@google.com>
Date: Tue, 20 Sep 2016 10:17:53 -0700
Subject: [PATCH] Move staging container to gcr, check in Dockerfile.

---
 README.md                    |  6 +++---
 docs/templatedemos/index.md  |  6 +++---
 staging-container/Dockerfile | 13 +++++++++++++
 3 files changed, 19 insertions(+), 6 deletions(-)
 create mode 100644 staging-container/Dockerfile

diff --git a/README.md b/README.md
index a5c774ba66..e2fc558f9d 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ change the name of the fork to be:
 
     YOUR_GITHUB_USERNAME.github.io
 
-Then make your changes. 
+Then make your changes.
 
 When you visit [http://YOUR_GITHUB_USERNAME.github.io](http://YOUR_GITHUB_USERNAME.github.io) you should see a special-to-you version of the site that contains the changes you just made.
 
@@ -21,11 +21,11 @@ Don't like installing stuff? Download and run a local staging server with a sing
 
     git clone https://github.com/kubernetes/kubernetes.github.io.git
     cd kubernetes.github.io
-    docker run -ti --rm -v "$PWD":/k8sdocs -p 4000:4000 johndmulhausen/k8sdocs
+    docker run -ti --rm -v "$PWD":/k8sdocs -p 4000:4000 gcr.io/google-samples/k8sdocs:1.0
 
 Then visit [http://localhost:4000](http://localhost:4000) to see our site. Any changes you make on your local machine will be automatically staged.
 
-If you're interested you can view [the Dockerfile for this image](https://gist.github.com/johndmulhausen/f8f0ab8d82d2c755af3a4709729e1859).
+If you're interested you can view [the Dockerfile for this image](https://github.com/kubernetes/kubernetes.github.io/blob/master/staging-container/Dockerfile).
 
 ## Staging the site locally (from scratch setup)
 
diff --git a/docs/templatedemos/index.md b/docs/templatedemos/index.md
index ad58731bd7..88a94159f1 100644
--- a/docs/templatedemos/index.md
+++ b/docs/templatedemos/index.md
@@ -37,14 +37,14 @@ git fetch upstream
 git reset --hard upstream/docsv2
 ```
 
-### Step 3: Make sure you can serve rendered docs 
+### Step 3: Make sure you can serve rendered docs
 
 One option is to simply rename your fork's repo on GitHub.com to `yourusername.github.io`, which will auto-stage your commits at that URL. 
 
 Or, just use Docker! Run this from within your local `kubernetes.github.io` directory and you should be good:
 
 ```shell
-docker run -ti --rm -v "$PWD":/k8sdocs -p 4000:4000 johndmulhausen/k8sdocs
+docker run -ti --rm -v "$PWD":/k8sdocs -p 4000:4000 gcr.io/google-samples/k8sdocs:1.0
 ```
 
 The site will then be viewable at [http://localhost:4000/](http://localhost:4000/).
@@ -246,4 +246,4 @@ You probably shouldn't be using this, but we also have templates which consume Y
 
 ### Adding page to navigation
 
-Once your page is saved, somewhere in the `/docs/` directory, add a reference to the `reference.yml` file under `/_data/` so that it will appear in the left-hand navigation of the site. This is also where you add a title to the page.
\ No newline at end of file
+Once your page is saved, somewhere in the `/docs/` directory, add a reference to the `reference.yml` file under `/_data/` so that it will appear in the left-hand navigation of the site. This is also where you add a title to the page.
diff --git a/staging-container/Dockerfile b/staging-container/Dockerfile
new file mode 100644
index 0000000000..a5b41625b5
--- /dev/null
+++ b/staging-container/Dockerfile
@@ -0,0 +1,13 @@
+FROM starefossen/ruby-node:2-4
+
+RUN gem install github-pages
+
+VOLUME /k8sdocs
+
+EXPOSE 4000
+
+WORKDIR /k8sdocs
+
+CMD bundle && jekyll clean && jekyll serve -H 0.0.0.0 -P 4000
+
+# For instructions, see http://kubernetes.io/editdocs/