Skip to content

Commit 6d4ea99

Browse files
committed
Move staging container to gcr, check in Dockerfile.
1 parent b4b944b commit 6d4ea99

File tree

3 files changed

+19
-6
lines changed

3 files changed

+19
-6
lines changed

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ change the name of the fork to be:
1111

1212
YOUR_GITHUB_USERNAME.github.io
1313

14-
Then make your changes.
14+
Then make your changes.
1515

1616
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.
1717

@@ -21,11 +21,11 @@ Don't like installing stuff? Download and run a local staging server with a sing
2121

2222
git clone https://github.com/kubernetes/kubernetes.github.io.git
2323
cd kubernetes.github.io
24-
docker run -ti --rm -v "$PWD":/k8sdocs -p 4000:4000 johndmulhausen/k8sdocs
24+
docker run -ti --rm -v "$PWD":/k8sdocs -p 4000:4000 gcr.io/google-samples/k8sdocs:1.0
2525

2626
Then visit [http://localhost:4000](http://localhost:4000) to see our site. Any changes you make on your local machine will be automatically staged.
2727

28-
If you're interested you can view [the Dockerfile for this image](https://gist.github.com/johndmulhausen/f8f0ab8d82d2c755af3a4709729e1859).
28+
If you're interested you can view [the Dockerfile for this image](https://github.com/kubernetes/kubernetes.github.io/blob/master/staging-container/Dockerfile).
2929

3030
## Staging the site locally (from scratch setup)
3131

docs/templatedemos/index.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@ git fetch upstream
3737
git reset --hard upstream/docsv2
3838
```
3939

40-
### Step 3: Make sure you can serve rendered docs
40+
### Step 3: Make sure you can serve rendered docs
4141

4242
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.
4343

4444
Or, just use Docker! Run this from within your local `kubernetes.github.io` directory and you should be good:
4545

4646
```shell
47-
docker run -ti --rm -v "$PWD":/k8sdocs -p 4000:4000 johndmulhausen/k8sdocs
47+
docker run -ti --rm -v "$PWD":/k8sdocs -p 4000:4000 gcr.io/google-samples/k8sdocs:1.0
4848
```
4949

5050
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
246246

247247
### Adding page to navigation
248248

249-
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.
249+
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.

staging-container/Dockerfile

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
FROM starefossen/ruby-node:2-4
2+
3+
RUN gem install github-pages
4+
5+
VOLUME /k8sdocs
6+
7+
EXPOSE 4000
8+
9+
WORKDIR /k8sdocs
10+
11+
CMD bundle && jekyll clean && jekyll serve -H 0.0.0.0 -P 4000
12+
13+
# For instructions, see http://kubernetes.io/editdocs/

0 commit comments

Comments
 (0)