Skip to content

Commit

Permalink
Merge pull request #16708 from markthink/release-1.16
Browse files Browse the repository at this point in the history
Fix local build errors
  • Loading branch information
Xiaolong He authored Oct 7, 2019
2 parents 32b0e53 + aa68520 commit 3e3c6e3
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
DOCKER = docker
HUGO_VERSION = 0.53
HUGO_VERSION = 0.58.3
DOCKER_IMAGE = kubernetes-hugo
DOCKER_RUN = $(DOCKER) run --rm --interactive --tty --volume $(CURDIR):/src
NODE_BIN = node_modules/.bin
Expand Down
2 changes: 1 addition & 1 deletion layouts/shortcodes/code.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{{ $codelang := .Get "language" | default (path.Ext $file | strings.TrimPrefix ".") }}
{{ $fileDir := path.Split $file }}
{{ $bundlePath := path.Join .Page.File.Dir $fileDir.Dir }}
{{ $filename := path.Join $p.File.Dir $file }}
{{ $filename := printf "/content/%s/%s/%s" .Page.Lang $p.File.Dir $file | safeURL }}
{{ $ghlink := printf "https://%s/blob/master/content/%s/%s" site.Params.githubwebsiterepo .Page.Lang $filename | safeURL }}
{{/* First assume this is a bundle and the file is inside it. */}}
{{ $resource := $p.Resources.GetMatch (printf "%s*" $file ) }}
Expand Down
5 changes: 4 additions & 1 deletion netlify.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@ functions = "functions"
command = "make non-production-build"

[build.environment]
HUGO_VERSION = "0.53"
# https://gitmemory.com/kubernetes/website
# https://www.gitmemory.com/zacharysarah
# https://github.com/kubernetes/website/pull/16151/files
HUGO_VERSION = "0.58.3"

[context.production.environment]
HUGO_BASEURL = "https://kubernetes.io/"
Expand Down

0 comments on commit 3e3c6e3

Please sign in to comment.