fixing docs due to upgrade in Hugo

Author: Darien-Lin

deploy/docs-v2/build.sh

@@ -22,4 +22,10 @@ cd docs-v2
 mkdir -p themes
 ln -s /app/docs/themes/docsy ./themes/docsy
 ln -s /app/docs/node_modules ./node_modules
+
+# Hugo was updated to be more strict about shortcodes. 
+# to prevent changing existing structure, we will copy over the files before hugo invocation.
+mkdir -p layouts/partials/shortcodes
+cp -r layouts/shortcodes layouts/partials/
+
 hugo --baseURL=${BASE_URL}

deploy/webhook-v2/Dockerfile

@@ -14,16 +14,19 @@
 
 # Download Docsy theme for Hugo
 FROM alpine:3.10 AS download-docsy
-# v0.3.0
-ENV DOCSY_VERSION=9f55cf34808d720bcfff9398c9f9bb7fd8fce4ec
+# v0.14.1
+ENV DOCSY_VERSION=v0.14.1
 ENV DOCSY_URL=https://github.com/google/docsy.git
-RUN apk add --no-cache git
+RUN apk add --no-cache git npm
 WORKDIR /docsy
 RUN git clone "${DOCSY_URL}" . && \
-    git reset --hard "${DOCSY_VERSION}" && \
-    git submodule update --init --recursive && \
+    git checkout "${DOCSY_VERSION}" && \
+    git submodule update --init --recursive --force && \
     rm -rf .git
 
+# vendors are installed via npm.
+RUN npm install
+
 # Download Hugo
 FROM alpine:3.10 AS download-hugo
 ENV HUGO_VERSION=0.155.3

docs-v2/config.toml

@@ -4,8 +4,11 @@ Title = "Skaffold"
 
 enableRobotsTXT = true
 
-# Hugo allows theme composition (and inheritance). The precedence is from left to right.
-theme = ["docsy"]
+# Use of Hugo modules to import Docsy.
+[module]
+replacements = "github.com/FortAwesome/Font-Awesome -> ., github.com/twbs/bootstrap -> ."
+[[module.imports]]
+path = "docsy"
 
 # Will give values to .Lastmod etc.
 enableGitInfo = true
@@ -72,6 +75,7 @@ id = "UA-120945544-1"
 title = "Skaffold"
 description = "Easy and Repeatable Container & Kubernetes Development"
 languageName ="English"
+contentDir = "content/en"
 # Weight used for sorting.
 weight = 1
 

docs-v2/content/en/docs/install/_index.md

@@ -25,7 +25,7 @@ Your use of this software is subject to the [Google Privacy Policy](https://poli
 
 {{% tab "CLOUD CODE" %}}
 
-[Cloud Code](https://cloud.google.com/code) provides a managed experience of using Skaffold in supported IDEs. You can install the `Cloud Code` extension for [Visual Studio Code]([https://cloud.google.com/code/docs/vscode/quickstart-k8s#installing](https://cloud.google.com/code/docs/vscode/install#installing)) or the plugin for [JetBrains IDEs](https://cloud.google.com/code/docs/intellij/quickstart-k8s#installing_the_plugin). It manages and keeps Skaffold  up-to-date, along with other common dependencies, and works with any kubernetes cluster.
+[Cloud Code](https://cloud.google.com/code) provides a managed experience of using Skaffold in supported IDEs. You can install the `Cloud Code` extension for [Visual Studio Code](https://cloud.google.com/code/docs/vscode/install) or the plugin for [JetBrains IDEs](https://cloud.google.com/code/docs/intellij/quickstart-k8s#installing_the_plugin). It manages and keeps Skaffold  up-to-date, along with other common dependencies, and works with any kubernetes cluster.
 
 {{% /tab %}}
 

docs-v2/layouts/shortcodes/maturity-table.html

@@ -12,7 +12,7 @@
         {{ if not $data.feature }}
             <tr>
                 <td><a href="{{$data.url}}">{{$data.area}}</a></td>
-                <td>{{ template "shortcodes/maturity-label.html" $data }}</td>
+                <td>{{ partial "shortcodes/maturity-label.html" $data }}</td>
                 <td>{{$data.description}}</td>
             </tr>
         {{end}}