From d9593850c48ad807b6c4c494ad0fcb3cdff65c59 Mon Sep 17 00:00:00 2001
From: Tim Fogarty <tim@tfogo.com>
Date: Sun, 24 Jun 2018 18:20:42 -0700
Subject: [PATCH 1/3] Change stage target to docker-serve in Makefile

docker-serve is documented in the readme (from #9128).
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index fcbd8438206a7..b06dc682e55e3 100644
--- a/Makefile
+++ b/Makefile
@@ -29,5 +29,5 @@ docker-image:
 docker-build:
 	$(DOCKER_RUN) $(DOCKER_IMAGE) hugo
 
-stage:
+docker-serve:
 	$(DOCKER_RUN) -p 1313:1313 $(DOCKER_IMAGE) hugo server --watch --bind 0.0.0.0

From 9c9ba1879c7d25b520f701a3817b0c2b24d7e097 Mon Sep 17 00:00:00 2001
From: Tim Fogarty <tim@tfogo.com>
Date: Mon, 25 Jun 2018 09:12:47 -0700
Subject: [PATCH 2/3] Update underlying command for make docker-serve

The underlying command listed in the README wasn't exactly the
same as the command in the Makefile.
---
 README.md | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 31cf792ea08c4..37428397a37b1 100644
--- a/README.md
+++ b/README.md
@@ -41,8 +41,11 @@ $ docker run \
   --interactive \
   --tty \
   --volume $(PWD):/src \
-  kubernetes-hugo:latest \
-  hugo
+  -p 1313:1313 \
+  kubernetes-hugo \
+  hugo server \
+  --watch \
+  --bind 0.0.0.0
 ```
 
 As when building without using a Docker container, the results of the build will be published to the `public` directory (the default output directory for [Hugo](https://gohugo.io), the static site generator used to build this site).

From 4600da65411469910549f8fa53bb24b2303a8fbd Mon Sep 17 00:00:00 2001
From: Tim Fogarty <tim@tfogo.com>
Date: Sun, 24 Jun 2018 17:48:31 -0700
Subject: [PATCH 3/3] Remove old Dockerfile for Jekyll site

PR #9128 added a new Dockerfile for the Hugo site. The old
staging container is no longer needed.
---
 staging-container/Dockerfile | 26 --------------------------
 staging-container/start.sh   |  7 -------
 2 files changed, 33 deletions(-)
 delete mode 100644 staging-container/Dockerfile
 delete mode 100755 staging-container/start.sh

diff --git a/staging-container/Dockerfile b/staging-container/Dockerfile
deleted file mode 100644
index 04fb4f75ba446..0000000000000
--- a/staging-container/Dockerfile
+++ /dev/null
@@ -1,26 +0,0 @@
-FROM alpine:3.7
-
-RUN apk add --no-cache \
-	build-base \
-	ca-certificates \
-	libffi-dev \
-	nodejs \
-	ruby-dev \
-	ruby-nokogiri \
-	zlib-dev
-
-RUN	gem install \
-	bundler \
-	github-pages \
-	io-console \
-	--no-rdoc --no-ri
-
-VOLUME /k8sdocs
-
-EXPOSE 4000
-
-COPY start.sh /start.sh
-WORKDIR /k8sdocs
-
-CMD [ "/start.sh" ]
-# For instructions, see http://kubernetes.io/editdocs/
diff --git a/staging-container/start.sh b/staging-container/start.sh
deleted file mode 100755
index 890e4bb385049..0000000000000
--- a/staging-container/start.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-set -e
-set -x
-
-bundle
-bundle exec jekyll clean
-bundle exec jekyll serve -H 0.0.0.0 -P 4000