From f59c0e8235775a15aa2fd6c81c708c3ce458ebaf Mon Sep 17 00:00:00 2001
From: Tim Fogarty <tim@tfogo.com>
Date: Fri, 27 Jul 2018 10:33:57 -0700
Subject: [PATCH] Change stage target to docker-serve in Makefile (#9216)

* Change stage target to docker-serve in Makefile

docker-serve is documented in the readme (from #9128).

* 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.

* Remove old Dockerfile for Jekyll site

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

diff --git a/Makefile b/Makefile
index 46adc39e6b64d..9318b4ee4f973 100644
--- a/Makefile
+++ b/Makefile
@@ -25,5 +25,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
diff --git a/README.md b/README.md
index b2f1f45fda70d..dbd6fac00816c 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,9 @@ docker run \
   --volume $(PWD):/src \
   -p 1313:1313 \
   kubernetes-hugo \
-  hugo server --watch --bind 0.0.0.0
+  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).
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