feat: Mount the site on the Mac too.

Included a workaround for containers/podman#22343 that means incremental mode won't work properly on the Mac.

Signed-off-by: Keith Wall <[email protected]>

Author: k-wall

Dockerfile

@@ -41,7 +41,7 @@ RUN ./bootstrap_setup.sh
 
 RUN mkdir /site/
 WORKDIR /site/
-COPY . .
 
 EXPOSE 4000
+# Note --incremental mode is ineffective on the Mac owing to https://github.com/containers/podman/issues/22343.  Use force_regenerate.sh to trigger the incremental reload after changing the file on the host.
 CMD eval "$(rbenv init -)" && cp -r /css/_sass/bootstrap /site/_sass/ && bundle exec jekyll serve --host ${JEKYLL_SERVE_BIND} --incremental --disable-disk-cache --destination /tmp/site

force_regenerate.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+# Work around for the inability to utilise to Jekyll's incremental development
+# when running the website with the ./run.sh script on a Mac.
+# Edit the file as normal on the host then retrigger a rebuild:
+# force_regenerate.sh [<file glob>]
+# <file glob> defaults to *.markdown
+
+NAME=${1:-*.markdown}
+podman exec jekll_serve find  -type f  -name "${NAME}" -exec touch {} \;

run.sh

@@ -1,4 +1,8 @@
 #!/bin/bash
+# Runs the Kroxylicious website locally, for development purposes, within a container.
+# Point your browser at http://localhost:4000
+#
+# Jekyll is run on incremental mode so changes made to the host filesystem should be soon visible in your browser. Note however incremental mode won't work on Mac OS X (owing to http://github.com/containers/podman/issues/22343). Use the force_regenerate.sh to trigger the incremental reload after the edit is made on the host.
 OS=$(uname)
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 cd ${SCRIPT_DIR}
@@ -7,12 +11,15 @@ CONTAINER_ENGINE=${CONTAINER_ENGINE:-podman}
 RUN_ARGS=()
 if [ "$OS" = 'Darwin' ]; then
    RUN_ARGS+=(--env JEKYLL_SERVE_BIND=0.0.0.0 --publish 4000:4000)
-elif [ "$CONTAINER_ENGINE" = 'podman' ]; then
-   RUN_ARGS+=(--net host -v $(pwd):/site/:Z)
 else
    RUN_ARGS+=(--net host)
 fi
-RUN_ARGS+=(--rm -it kroxylicious-website)
+
+if [ "$CONTAINER_ENGINE" = 'podman' ]; then
+   RUN_ARGS+=(-v $(pwd):/site/:Z)
+fi
+
+RUN_ARGS+=(--rm --name jekll_serve -it kroxylicious-website)
 
 ${CONTAINER_ENGINE} build . -t kroxylicious-website