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

@@ -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

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

staging-container/Dockerfile

@@ -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/

staging-container/start.sh

@@ -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