switch Dockerfile base from node to golang (for Hugo modules), update deps

[skip ci]
2025-09-15 23:05:31 -04:00 · 2020-06-23 20:53:24 -04:00
parent c1dbe5c0ad
commit f2a4f13932
3 changed files with 42 additions and 32 deletions
--- a/24
+++ b/24
@@ -3,34 +3,44 @@
 #     docker run -v $(pwd):/src -p 1337:1337 jarv.is
 # ...then open http://localhost:1337 for the live-refresh server.
 #
-# Based on: https://github.com/jakejarvis/hugo-build-action/blob/master/Dockerfile
+# Based on: https://hub.docker.com/r/jakejarvis/hugo-extended

-FROM node:lts-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.68.3
 # remove/comment the following line completely to build with vanilla Hugo:
 ENV HUGO_EXTENDED 1

+LABEL maintainer="Jake Jarvis <jake@jarv.is>"
+LABEL homepage="https://jarv.is/"
+LABEL repository="https://github.com/jakejarvis/jarv.is"
+
 # only install libc6-compat & libstdc++ if we're building extended Hugo
 # https://gitlab.com/yaegashi/hugo/commit/22f0d5cbd6114210ba7835468facbdee60609aa2
 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 && \
-    npm install --global postcss-cli autoprefixer && \
-    pip3 install --upgrade pip Pygments==2.* && \
+    npm install --global postcss-cli autoprefixer @babel/core @babel/cli && \
+    pip3 install --upgrade Pygments==2.* && \
    gem install asciidoctor && \
    wget https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_${HUGO_EXTENDED:+extended_}${HUGO_VERSION}_Linux-64bit.tar.gz && \
    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
 RUN hugo env && \
--- a/package.json
+++ b/package.json
@@ -37,11 +37,11 @@
  },
  "dependencies": {},
  "devDependencies": {
-    "autoprefixer": "^9.8.0",
+    "autoprefixer": "^9.8.3",
    "cross-env": "^7.0.2",
-    "eslint": "^7.3.1",
-    "eslint-config-prettier": "^6.11.0",
-    "eslint-plugin-prettier": "^3.1.4",
+    "eslint": "~7.3.1",
+    "eslint-config-prettier": "~6.11.0",
+    "eslint-plugin-prettier": "~3.1.4",
    "html-minifier": "^4.0.0",
    "hugo-extended": "0.68.3",
    "husky": "^4.2.5",
@@ -63,10 +63,10 @@
    "postcss-reporter": "^6.0.1",
    "prettier": "^2.0.5",
    "rimraf": "^3.0.2",
-    "stylelint": "~13.6.0",
-    "stylelint-config-prettier": "^8.0.1",
+    "stylelint": "~13.6.1",
+    "stylelint-config-prettier": "~8.0.2",
    "stylelint-config-sass-guidelines": "~7.0.0",
-    "stylelint-prettier": "^1.1.2",
+    "stylelint-prettier": "~1.1.2",
    "stylelint-scss": "~3.18.0",
    "terser": "^4.8.0"
  },
--- a/yarn.lock
+++ b/yarn.lock
@@ -403,13 +403,13 @@ at-least-node@^1.0.0:
  resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
  integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==

-autoprefixer@^9.8.0:
-  version "9.8.2"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.2.tgz#7347396ee576b18687041bfbacd76d78e27baa56"
-  integrity sha512-9UwMMU8Rg7Fj0c55mbOpXrr/2WrRqoOwOlLNTyyYt+nhiyQdIBWipp5XWzt+Lge8r3DK5y+EHMc1OBf8VpZA6Q==
+autoprefixer@^9.8.0, autoprefixer@^9.8.3:
+  version "9.8.3"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.3.tgz#e04c8b7f72c608e4aef1b74a542946e2ed271753"
+  integrity sha512-Y3CkEPqPqGw0TNBcMoUAxeZT9WEOAh0BPYENOTrN/bEfNBqjlYWjHbR1PKduBrmAVn8WbEZtMA3gAZO5MgV7Pg==
  dependencies:
    browserslist "^4.12.0"
-    caniuse-lite "^1.0.30001084"
+    caniuse-lite "^1.0.30001087"
    kleur "^4.0.1"
    normalize-range "^0.1.2"
    num2fraction "^1.2.2"
@@ -635,10 +635,10 @@ camelcase@^6.0.0:
  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.0.0.tgz#5259f7c30e35e278f1bdc2a4d91230b37cad981e"
  integrity sha512-8KMDF1Vz2gzOq54ONPJS65IvTUaB1cHJ2DMM7MbPmLZljDH1qpzzLsWdiN9pHh6qvkRVDTi/07+eNGch/oLU4w==

-caniuse-lite@^1.0.30001043, caniuse-lite@^1.0.30001084:
-  version "1.0.30001085"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001085.tgz#bed28bd51ff7425d33ee23e730c7f3b703711db6"
-  integrity sha512-x0YRFRE0pmOD90z+9Xk7jwO58p4feVNXP+U8kWV+Uo/HADyrgESlepzIkUqPgaXkpyceZU6siM1gsK7sHgplqA==
+caniuse-lite@^1.0.30001043, caniuse-lite@^1.0.30001087:
+  version "1.0.30001087"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001087.tgz#4a0bdc5998a114fcf8b7954e7ba6c2c29831c54a"
+  integrity sha512-KAQRGtt+eGCQBSp2iZTQibdCf9oe6cNTi5lmpsW38NnxP4WMYzfU6HCRmh4kJyh6LrTM9/uyElK4xcO93kafpg==

 caw@^2.0.0, caw@^2.0.1:
  version "2.0.1"
@@ -1219,9 +1219,9 @@ duplexer3@^0.1.4:
  integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=

 electron-to-chromium@^1.3.413:
-  version "1.3.480"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.480.tgz#190ae45074578349a4c4f336fba29e76b20e9ef5"
-  integrity sha512-wnuUfQCBMAdzu5Xe+F4FjaRK+6ToG6WvwG72s8k/3E6b+hoGVYGiQE7JD1NhiCMcqF3+wV+c2vAnaLGRSSWVqA==
+  version "1.3.481"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.481.tgz#0d59e72a0aaeb876b43fb1d6e84bf0dfc99617e8"
+  integrity sha512-q2PeCP2PQXSYadDo9uNY+uHXjdB9PcsUpCVoGlY8TZOPHGlXdevlqW9PkKeqCxn2QBkGB8b6AcMO++gh8X82bA==

 emoji-regex@^7.0.1:
  version "7.0.3"
@@ -1295,14 +1295,14 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=

-eslint-config-prettier@^6.11.0:
+eslint-config-prettier@~6.11.0:
  version "6.11.0"
  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.11.0.tgz#f6d2238c1290d01c859a8b5c1f7d352a0b0da8b1"
  integrity sha512-oB8cpLWSAjOVFEJhhyMZh6NOEOtBVziaqdDQ86+qhDHFbZXoRTM7pNSvFRfW/W/L/LrQ38C99J5CGuRBBzBsdA==
  dependencies:
    get-stdin "^6.0.0"

-eslint-plugin-prettier@^3.1.4:
+eslint-plugin-prettier@~3.1.4:
  version "3.1.4"
  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.4.tgz#168ab43154e2ea57db992a2cd097c828171f75c2"
  integrity sha512-jZDa8z76klRqo+TdGDTFJSavwbnWK2ZpqGKNZ+VvweMW516pDUMmQ2koXvxEE4JhzNvTv+radye/bWGBmA6jmg==
@@ -1329,7 +1329,7 @@ eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.2.0:
  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
  integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==

-eslint@^7.3.1:
+eslint@~7.3.1:
  version "7.3.1"
  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.3.1.tgz#76392bd7e44468d046149ba128d1566c59acbe19"
  integrity sha512-cQC/xj9bhWUcyi/RuMbRtC3I0eW8MH0jhRELSvpKYkWep3C6YZ2OkvcvJVUeO6gcunABmzptbXBuDoXsjHmfTA==
@@ -4473,7 +4473,7 @@ style-search@^0.1.0:
  resolved "https://registry.yarnpkg.com/style-search/-/style-search-0.1.0.tgz#7958c793e47e32e07d2b5cafe5c0bf8e12e77902"
  integrity sha1-eVjHk+R+MuB9K1yv5cC/jhLneQI=

-stylelint-config-prettier@^8.0.1:
+stylelint-config-prettier@~8.0.2:
  version "8.0.2"
  resolved "https://registry.yarnpkg.com/stylelint-config-prettier/-/stylelint-config-prettier-8.0.2.tgz#da9de33da4c56893cbe7e26df239a7374045e14e"
  integrity sha512-TN1l93iVTXpF9NJstlvP7nOu9zY2k+mN0NSFQ/VEGz15ZIP9ohdDZTtCWHs5LjctAhSAzaILULGbgiM0ItId3A==
@@ -4495,7 +4495,7 @@ stylelint-order@^4.0.0:
    postcss "^7.0.31"
    postcss-sorting "^5.0.1"

-stylelint-prettier@^1.1.2:
+stylelint-prettier@~1.1.2:
  version "1.1.2"
  resolved "https://registry.yarnpkg.com/stylelint-prettier/-/stylelint-prettier-1.1.2.tgz#2b19abe40789c380bffee3d4267c413d981a86ea"
  integrity sha512-8QZ+EtBpMCXYB6cY0hNE3aCDKMySIx4Q8/malLaqgU/KXXa6Cj2KK8ulG1AJvUMD5XSSP8rOotqaCzR/BW6qAA==
@@ -4513,7 +4513,7 @@ stylelint-scss@^3.4.0, stylelint-scss@~3.18.0:
    postcss-selector-parser "^6.0.2"
    postcss-value-parser "^4.1.0"

-stylelint@~13.6.0:
+stylelint@~13.6.1:
  version "13.6.1"
  resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-13.6.1.tgz#cc1d76338116d55e8ff2be94c4a4386c1239b878"
  integrity sha512-XyvKyNE7eyrqkuZ85Citd/Uv3ljGiuYHC6UiztTR6sWS9rza8j3UeQv/eGcQS9NZz/imiC4GKdk1EVL3wst5vw==