From 216e6f27b7370e0a0c38b7d7802a791d49c2d992 Mon Sep 17 00:00:00 2001
From: Jake Jarvis <jake@jarv.is>
Date: Tue, 23 Jun 2020 20:48:06 -0400
Subject: [PATCH] switch from Node to Golang base image to support Hugo modules

turns out it's much simpler to install Node on the Go image than vice-versa
---
 Dockerfile | 16 ++++++++++------
 README.md  |  9 ++++++---
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6fd1f5b..a41c5d1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
-# using a base image cached by GitHub:
-# https://github.com/actions/virtual-environments/blob/master/images/linux/scripts/installers/docker-moby.sh#L42
-FROM node:12-alpine
+# Hugo doesn't require Go to run, *except* if you're using Hugo Modules. It's
+# much easier to install Node on the Go base image than vice-versa.
+FROM golang:1.14-alpine
 
 ENV HUGO_VERSION 0.73.0
 # remove/comment the following line completely to build with vanilla Hugo:
@@ -22,7 +22,11 @@ RUN apk update && \
     apk add --no-cache \
       ca-certificates \
       git \
+      nodejs \
+      npm \
+      yarn \
       python3 \
+      py3-pip \
       ruby \
       ${HUGO_EXTENDED:+libc6-compat libstdc++} && \
     update-ca-certificates && \
@@ -33,9 +37,9 @@ RUN apk update && \
     wget https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_${HUGO_VERSION}_checksums.txt && \
     grep hugo_${HUGO_EXTENDED:+extended_}${HUGO_VERSION}_Linux-64bit.tar.gz hugo_${HUGO_VERSION}_checksums.txt | sha256sum -c && \
     tar xf hugo_${HUGO_EXTENDED:+extended_}${HUGO_VERSION}_Linux-64bit.tar.gz && \
-    mv ./hugo /usr/bin && \
-    chmod +x /usr/bin/hugo && \
-    rm -rf hugo_*
+    mv ./hugo /usr/local/bin/ && \
+    chmod +x /usr/local/bin/hugo && \
+    rm -rf hugo_* LICENSE README.md
 
 # verify everything's OK, fail otherwise
 RUN hugo version && \
diff --git a/README.md b/README.md
index cfacf01..0dfd876 100644
--- a/README.md
+++ b/README.md
@@ -31,12 +31,15 @@ jobs:
 
 ## Included Software
 
-Just in case, the final container includes a few small third-party tools that are required by certain optional Hugo features.
+Just in case, the final container includes a few small third-party tools that are required by certain optional Hugo features:
 
-- [Asciidoctor](https://asciidoctor.org/)
-- [Pygments](https://pygments.org/)
 - [PostCSS (CLI)](https://github.com/postcss/postcss-cli)
 - [Autoprefixer](https://github.com/postcss/autoprefixer)
+- [Babel (CLI)](https://babeljs.io/)
+- [Pygments](https://pygments.org/)
+- [Asciidoctor](https://asciidoctor.org/)
+
+Node (with NPM and Yarn) and Go (for [Hugo Modules](https://gohugo.io/hugo-modules/) support) are also pre-installed.
 
 ## Licenses