Uses official Jekyll Docker image to serve and build website locally
diff --git a/docker-build.fish b/docker-build.fish
index fc017a0..f950c11 100755
--- a/docker-build.fish
+++ b/docker-build.fish
@@ -1,2 +1,5 @@
 #!/usr/local/bin/fish
-docker build -t theapachestruts/struts-site-jekyll --pull docker/
+set -x JEKYLL_VERSION 3.8
+
+docker run --rm -v $PWD:/srv/jekyll -it jekyll/jekyll:$JEKYLL_VERSION jekyll build
+
diff --git a/docker-build.sh b/docker-build.sh
index ae6a6b3..f331738 100755
--- a/docker-build.sh
+++ b/docker-build.sh
@@ -1,2 +1,5 @@
 #!/bin/sh
-docker build -t theapachestruts/struts-site-jekyll --pull docker/
+export JEKYLL_VERSION=3.8
+
+docker run --rm -v $PWD:/srv/jekyll -it jekyll/jekyll:$JEKYLL_VERSION jekyll build
+
diff --git a/docker-run.fish b/docker-run.fish
index 1cb2809..6bba623 100755
--- a/docker-run.fish
+++ b/docker-run.fish
@@ -1,2 +1,4 @@
 #!/usr/local/bin/fish
-docker run -v $PWD:/srv/jekyll -it -p 4000:4000 theapachestruts/struts-site-jekyll
+set -x JEKYLL_VERSION 3.8
+
+docker run --rm -v $PWD:/srv/jekyll -it jekyll/jekyll:$JEKYLL_VERSION jekyll serve --watch --trace --host=0.0.0.0 --force_polling --incremental
diff --git a/docker-run.sh b/docker-run.sh
index 3e5d930..70011ab 100755
--- a/docker-run.sh
+++ b/docker-run.sh
@@ -1,2 +1,5 @@
 #!/bin/sh
-docker run -v $(pwd):/srv/jekyll -it -p 4000:4000 theapachestruts/struts-site-jekyll
+export JEKYLL_VERSION 3.8
+
+docker run --rm -v $PWD:/srv/jekyll -it jekyll/jekyll:$JEKYLL_VERSION jekyll serve --watch --trace --host=0.0.0.0 --force_polling --incremental
+