Merge pull request #11 from sbamin/dev

Updated sitebuilder

Author: sbamin

Dockerfile

@@ -1,17 +1,18 @@
 ############################################################
 # Dockerfile for website build using jekyll, hugo, or mkdocs
 ############################################################
-## ruby version should be compliant with netlify and github-pages
-## managed build nodes, https://pages.github.com/versions/
+## ruby version should be compliant with github-pages
+## managed build nodes, https://pages.github.com/versions/ or
+## Dockerfile at https://github.com/github/pages-gem
 FROM ruby:3.3.7
 
 ## pull docker buildx platform arg
 ARG TARGETPLATFORM
 
 ## NOTE: installing beta version of mkdocs-material with blog support.
-LABEL version="1.5.7" \
-	mode="sitebuilder-1.5.7" \
-	author="Samirkumar Amin; tweet:sbamin; sbamin.com/contact" \
+LABEL version="1.5.8" \
+	mode="sitebuilder-1.5.8" \
+	author="Samirkumar Amin" \
 	description="docker image to build jekyll, hugo or mkdocs supported website" \
 	website="https://github.com/sbamin/sitebuilder" \
 	LICENSE="MIT License, https://github.com/sbamin/sitebuilder/blob/master/LICENSE" \
@@ -37,8 +38,9 @@ RUN apt-get update && \
 ENV LC_ALL="C.UTF-8"
 ENV LANG="en_US.UTF-8"
 ENV LANGUAGE="en_US.UTF-8"
-ENV myhugo="0.145.0"
-ENV mygo="1.24.1"
+ENV myhugo="0.153.2"
+ENV mygo="1.25.5"
+ENV mydartsass="1.97.1"
 
 #### Python 3 venv ####
 # Create and activate a Python virtual environment
@@ -85,8 +87,8 @@ RUN	rm -rf /var/lib/apt/lists/partial && \
 ## install latest hugo extended, including GO
 ## requires OS arch variable
 RUN case "$TARGETPLATFORM" in \
-        "linux/amd64") ARCH="amd64" ;; \
-        "linux/arm64") ARCH="arm64" ;; \
+        "linux/amd64") ARCH="amd64"; ARCH2="x64" ;; \
+        "linux/arm64") ARCH="arm64"; ARCH2="arm64" ;; \
         *) echo "Unsupported architecture: $TARGETPLATFORM" && exit 1 ;; \
     esac && \
     echo "Building for ARCH=$ARCH" && \
@@ -98,8 +100,14 @@ RUN case "$TARGETPLATFORM" in \
 	mkdir -p /opt/go/bin && \
 	chmod 775 /opt/go && \
 	chmod 775 /opt/go/bin && \
+	wget https://github.com/sass/dart-sass/releases/download/${mydartsass}/dart-sass-${mydartsass}-linux-${ARCH2}-musl.tar.gz && \
+	mkdir -p /opt/dart && \
+	chmod 775 /opt/dart && \
+	tar -C /opt/dart -xvzf dart-sass-${mydartsass}-linux-${ARCH2}-musl.tar.gz && \
+	mv -f /opt/dart/dart-sass /opt/dart/bin && \
 	apt-get clean && \
 	rm -f go${mygo}.linux-${ARCH}.tar.gz && \
+	rm -f dart-sass-${mydartsass}-linux-${ARCH2}-musl.tar.gz && \
 	rm -rf /var/lib/apt/lists/*
 
 ENV GOPATH="/opt/go"
@@ -111,7 +119,7 @@ WORKDIR /web
 ## for mkdocstrings, set an intended path to python modules
 ENV PYTHONPATH="/web/api/py"
 
-ENV PATH="/opt/venv/bin:/usr/local/bundle/bin:/usr/local/bundle/gems/bin:/usr/local/go/bin:/opt/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+ENV PATH="/opt/venv/bin:/usr/local/bundle/bin:/usr/local/bundle/gems/bin:/usr/local/go/bin:/opt/go/bin:/opt/dart/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
 
 #### expose ports for jekyll, mkdocs, and hugo serve command ####
 EXPOSE 4000

Gemfile.lock

@@ -1,59 +1,58 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (8.0.2)
+    activesupport (8.1.1)
       base64
-      benchmark (>= 0.3)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
+      json
       logger (>= 1.4.2)
       minitest (>= 5.1)
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
       uri (>= 0.13.1)
-    addressable (2.8.7)
-      public_suffix (>= 2.0.2, < 7.0)
-    base64 (0.2.0)
-    benchmark (0.4.0)
-    bigdecimal (3.1.9)
+    addressable (2.8.8)
+      public_suffix (>= 2.0.2, < 8.0)
+    base64 (0.3.0)
+    bigdecimal (4.0.1)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
     colorator (1.1.0)
-    commonmarker (0.23.11)
-    concurrent-ruby (1.3.5)
-    connection_pool (2.5.0)
-    csv (3.3.3)
-    dnsruby (1.72.4)
-      base64 (~> 0.2.0)
-      logger (~> 1.6.5)
+    commonmarker (0.23.12)
+    concurrent-ruby (1.3.6)
+    connection_pool (3.0.2)
+    csv (3.3.5)
+    dnsruby (1.73.1)
+      base64 (>= 0.2)
+      logger (~> 1.6)
       simpleidn (~> 0.2.1)
-    drb (2.2.1)
+    drb (2.2.3)
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
-    ethon (0.16.0)
+    ethon (0.15.0)
       ffi (>= 1.15.0)
     eventmachine (1.2.7)
     execjs (2.10.0)
-    faraday (2.12.2)
+    faraday (2.14.0)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
-    faraday-net_http (3.4.0)
-      net-http (>= 0.5.0)
-    ffi (1.17.1-aarch64-linux-gnu)
-    ffi (1.17.1-aarch64-linux-musl)
-    ffi (1.17.1-arm-linux-gnu)
-    ffi (1.17.1-arm-linux-musl)
-    ffi (1.17.1-arm64-darwin)
-    ffi (1.17.1-x86_64-darwin)
-    ffi (1.17.1-x86_64-linux-gnu)
-    ffi (1.17.1-x86_64-linux-musl)
+    faraday-net_http (3.4.2)
+      net-http (~> 0.5)
+    ffi (1.17.2-aarch64-linux-gnu)
+    ffi (1.17.2-aarch64-linux-musl)
+    ffi (1.17.2-arm-linux-gnu)
+    ffi (1.17.2-arm-linux-musl)
+    ffi (1.17.2-arm64-darwin)
+    ffi (1.17.2-x86_64-darwin)
+    ffi (1.17.2-x86_64-linux-gnu)
+    ffi (1.17.2-x86_64-linux-musl)
     forwardable-extended (2.6.0)
     gemoji (4.1.0)
     github-pages (232)
@@ -111,8 +110,8 @@ GEM
     html-pipeline (2.14.3)
       activesupport (>= 2)
       nokogiri (>= 1.4)
-    http_parser.rb (0.8.0)
-    i18n (1.14.7)
+    http_parser.rb (0.8.1)
+    i18n (1.14.8)
       concurrent-ruby (~> 1.0)
     jekyll (3.10.0)
       addressable (~> 2.4)
@@ -225,7 +224,7 @@ GEM
       gemoji (>= 3, < 5)
       html-pipeline (~> 2.2)
       jekyll (>= 3.0, < 5.0)
-    json (2.10.2)
+    json (2.18.0)
     kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
@@ -234,42 +233,44 @@ GEM
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    logger (1.6.6)
+    logger (1.7.0)
     mercenary (0.3.6)
     minima (2.5.1)
       jekyll (>= 3.5, < 5.0)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
-    minitest (5.25.5)
-    net-http (0.6.0)
-      uri
-    nokogiri (1.18.6-aarch64-linux-gnu)
+    minitest (6.0.0)
+      prism (~> 1.5)
+    net-http (0.9.1)
+      uri (>= 0.11.1)
+    nokogiri (1.18.10-aarch64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.18.6-aarch64-linux-musl)
+    nokogiri (1.18.10-aarch64-linux-musl)
       racc (~> 1.4)
-    nokogiri (1.18.6-arm-linux-gnu)
+    nokogiri (1.18.10-arm-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.18.6-arm-linux-musl)
+    nokogiri (1.18.10-arm-linux-musl)
       racc (~> 1.4)
-    nokogiri (1.18.6-arm64-darwin)
+    nokogiri (1.18.10-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.6-x86_64-darwin)
+    nokogiri (1.18.10-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.6-x86_64-linux-gnu)
+    nokogiri (1.18.10-x86_64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.18.6-x86_64-linux-musl)
+    nokogiri (1.18.10-x86_64-linux-musl)
       racc (~> 1.4)
     octokit (4.25.1)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
+    prism (1.7.0)
     public_suffix (5.1.1)
     racc (1.8.1)
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rexml (3.4.1)
+    rexml (3.4.4)
     rouge (3.30.0)
     rubyzip (2.4.1)
     safe_yaml (1.0.5)
@@ -278,20 +279,20 @@ GEM
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    sawyer (0.9.2)
+    sawyer (0.9.3)
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
     securerandom (0.4.1)
     simpleidn (0.2.3)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
-    typhoeus (1.4.1)
-      ethon (>= 0.9.0)
+    typhoeus (1.5.0)
+      ethon (>= 0.9.0, < 0.16.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (1.8.0)
-    uri (1.0.3)
-    webrick (1.9.1)
+    uri (1.1.1)
+    webrick (1.9.2)
 
 PLATFORMS
   aarch64-linux-gnu

README.md

@@ -25,6 +25,8 @@ For MkDocs, docker image is using [mkdocs-material](https://squidfunk.github.io/
 docker run -v "$(pwd):/web" --rm -P -p 127.0.0.1:4000:4000 sbamin/sitebuilder mkdocs serve -a 0.0.0.0:4000
 
 ## jekyll, preview at http://0.0.0.0:4000
+## PS: For jekyll serve, --no-watch may be needed on apple silicon
+## with an open issue with rb-notify gem.
 docker run -v "$(pwd):/web" --rm -P -p 127.0.0.1:4000:4000 sbamin/sitebuilder jekyll serve --watch --host=0.0.0.0 -c _devconfig.yml -d _sitelocal
 
 ## hugo, preview at http://0.0.0.0:4000

update_sitebuilder.md

@@ -17,9 +17,9 @@ git status
 
 ### Update packages
 
-*   Define docker image tag, e.g., `1.5.6` typically a level up than [the current version](https://hub.docker.com/r/sbamin/sitebuilder/tags). You need to manually update several of commands below to reflect an updated tag.
+*   Define docker image tag, e.g., `1.5.8` typically a level up than [the current version](https://hub.docker.com/r/sbamin/sitebuilder/tags). You need to manually update several of commands below to reflect an updated tag.
 
-*   Update `Dockerfile` as per your custom changes. At minimum, update LABEL version and mode to reflect an updated tag. You can also update `hugo extended` to the [current release](https://github.com/gohugoio/hugo/releases) by updating *myhugo* ENV variable in `Dockerfile`. Optionally, [update related go version](https://go.dev/dl/) with *mygo* ENV variable.
+*   Update `Dockerfile` as per your custom changes. At minimum, update LABEL version and mode to reflect an updated tag. You can also update `hugo extended` to the [current release](https://github.com/gohugoio/hugo/releases) by updating *myhugo* ENV variable in `Dockerfile`. Optionally, [update related go version](https://go.dev/dl/) with *mygo* ENV variable and [dart-sass](https://github.com/sass/dart-sass/releases) with *mydartsass* variable. Change installation commands for prebuilt go and dart-sass binaries as and when required.
 
 *   If you need to update [jekyll](https://jekyllrb.com/) related gems, update `Gemfile` while ensuring gem [version requirements](https://pages.github.com/versions/) for [github-pages](https://github.com/github/pages-gem) gem.
 
@@ -39,20 +39,22 @@ Here, I am using `docker buildx build` from [Docker Desktop v4.22.0 on mac os 15
 ## replace --push with --load to load arch specific image locally
 docker buildx build \
 	--platform linux/arm64/v8,linux/amd64 \
-	--tag sbamin/sitebuilder:1.5.7 \
+	--tag sbamin/sitebuilder:1.5.8 \
 	--tag sbamin/sitebuilder:latest \
 	--push \
 	--file Dockerfile .
 ```
 
+Check [docker hub: sbamin/sitebuilder](https://hub.docker.com/r/sbamin/sitebuilder/tags) and should show an updated tag. If so, update local image using `docker images` and then `docker pull sbamin/sitebuilder` to get a latest tag.
+
 ### update Gemfile.lock
 
 *   Once image is successfully built, copy `Gemfile.lock` back to host, so that we can update it with the most recent versions of gems.
 
 ```sh
 ## start container in an interactive session and mount local (host) directory
 ## to an empty location in the docker container.
-docker run --rm -it -v "$(pwd)":/hostspace sbamin/sitebuilder:1.5.7 /bin/bash
+docker run --rm -it -v "$(pwd)":/hostspace sbamin/sitebuilder /bin/bash
 
 ## copy (overwrite) local Gemfile.lock with an updated version from 
 ## the container
@@ -75,61 +77,61 @@ docker run --platform linux/amd64 --rm sbamin/sitebuilder /bin/bash -c "jekyll -
 ### Update github releases
 
 ```sh
-git add Dockerfile Dockerfile_arm64 Gemfile Gemfile.lock update_sitebuilder.md README.md
+git add Dockerfile Gemfile Gemfile.lock update_sitebuilder.md README.md
 
 ## write a multiline git commit message
 ## -s requires a valid gpg key for signing a message
 git commit -s -F- <<EOF
 Updated sitebuilder
-v1.5.7
+v1.5.8
 
 ## amd64
 
 jekyll 3.10.0
-hugo v0.145.0-666444f0a52132f9fec9f71cf25b441cc6a4f355+extended linux/amd64 BuildDate=2025-02-26T15:41:25Z VendorInfo=gohugoio
+hugo v0.153.2-798533a2013eab97198b0a155a8f4afab7e79865+extended linux/amd64 BuildDate=2025-12-22T16:53:01Z VendorInfo=gohugoio
 git version 2.39.5
-go version go1.24.1 linux/amd64
+go version go1.25.5 linux/amd64
 mkdocs                                    1.6.1
-mkdocs-autorefs                           1.4.1
+mkdocs-autorefs                           1.4.3
 mkdocs-get-deps                           0.2.0
-mkdocs-git-authors-plugin                 0.9.4
+mkdocs-git-authors-plugin                 0.10.0
 mkdocs-git-committers-plugin-2            2.5.0
-mkdocs-git-revision-date-localized-plugin 1.4.5
+mkdocs-git-revision-date-localized-plugin 1.5.0
 mkdocs-git-revision-date-plugin           0.3.2
-mkdocs-glightbox                          0.4.0
-mkdocs-macros-plugin                      1.3.7
-mkdocs-material                           9.6.9
+mkdocs-glightbox                          0.5.2
+mkdocs-macros-plugin                      1.5.0
+mkdocs-material                           9.7.1
 mkdocs-material-extensions                1.3.1
 mkdocs-minify-plugin                      0.8.0
 mkdocs-redirects                          1.2.2
-mkdocs-rss-plugin                         1.17.1
-mkdocstrings                              0.29.0
-mkdocstrings-python                       1.16.8
-mkdocstrings-shell                        1.0.1
+mkdocs-rss-plugin                         1.17.7
+mkdocstrings                              1.0.0
+mkdocstrings-python                       2.0.1
+mkdocstrings-shell                        1.0.4
 
 ## arm64
 
 jekyll 3.10.0
-hugo v0.145.0-666444f0a52132f9fec9f71cf25b441cc6a4f355+extended linux/arm64 BuildDate=2025-02-26T15:41:25Z VendorInfo=gohugoio
+hugo v0.153.2-798533a2013eab97198b0a155a8f4afab7e79865+extended linux/arm64 BuildDate=2025-12-22T16:53:01Z VendorInfo=gohugoio
 git version 2.39.5
-go version go1.24.1 linux/arm64
+go version go1.25.5 linux/arm64
 mkdocs                                    1.6.1
-mkdocs-autorefs                           1.4.1
+mkdocs-autorefs                           1.4.3
 mkdocs-get-deps                           0.2.0
-mkdocs-git-authors-plugin                 0.9.4
+mkdocs-git-authors-plugin                 0.10.0
 mkdocs-git-committers-plugin-2            2.5.0
-mkdocs-git-revision-date-localized-plugin 1.4.5
+mkdocs-git-revision-date-localized-plugin 1.5.0
 mkdocs-git-revision-date-plugin           0.3.2
-mkdocs-glightbox                          0.4.0
-mkdocs-macros-plugin                      1.3.7
-mkdocs-material                           9.6.9
+mkdocs-glightbox                          0.5.2
+mkdocs-macros-plugin                      1.5.0
+mkdocs-material                           9.7.1
 mkdocs-material-extensions                1.3.1
 mkdocs-minify-plugin                      0.8.0
 mkdocs-redirects                          1.2.2
-mkdocs-rss-plugin                         1.17.1
-mkdocstrings                              0.29.0
-mkdocstrings-python                       1.16.8
-mkdocstrings-shell                        1.0.1
+mkdocs-rss-plugin                         1.17.7
+mkdocstrings                              1.0.0
+mkdocstrings-python                       2.0.1
+mkdocstrings-shell                        1.0.4
 
 EOF