Skip to content

Commit 2486c72

Browse files
using cloudposse-specific repo to install hugo and htmltest (#517)
* using cloudposse-specific repo to install hugo and htmltest * small modifications to bring the docs website up to spec with hugo v0.80.0 * no need to force hugo and htmltest installation from cloudposse repo right now * changing spacing in Dockerfile to improve interpretation * Update tasks/Makefile.hugo Co-authored-by: Erik Osterman (CEO @ Cloud Posse) <erik@cloudposse.com> * removing --trace option from hugo * fixed two hugo dperecation warnings Co-authored-by: Erik Osterman (CEO @ Cloud Posse) <erik@cloudposse.com>
1 parent d04a770 commit 2486c72

File tree

5 files changed

+6
-13
lines changed

5 files changed

+6
-13
lines changed

Dockerfile

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
1-
FROM cloudposse/packages:0.93.0 as packages
2-
3-
ENV INSTALL_PATH=/dist
4-
RUN mkdir -p ${INSTALL_PATH}
5-
RUN make -C /packages/install hugo HUGO_VERSION=0.42.1
6-
RUN make -C /packages/install htmltest HTMLTEST_VERSION=0.9.1
7-
81
FROM node:11.2-stretch
92

10-
COPY --from=packages /dist/ /usr/local/bin/
3+
RUN curl -1sLf 'https://dl.cloudsmith.io/public/cloudposse/packages/setup.deb.sh' | bash
4+
RUN apt-get install hugo htmltest
115

126
WORKDIR /src
137

config.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ notAlternative = true
5353

5454
[mediaTypes]
5555
[mediaTypes."application/algolia"]
56-
suffix = "algolia.json"
56+
suffixes = ["algolia.json"]
5757

5858
[outputFormats.algolia]
5959
isPlainText = true

layouts/_default/list.algolia.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{{- $section := $.Site.GetPage "section" .Section }}
44
{{- range .Site.AllPages -}}
55
{{- if or (and (.IsDescendant $section) (and (not .Draft) (not .Params.private))) $section.IsHome -}}
6-
{{- $.Scratch.Add "index" (dict "objectID" .UniqueID "date" .Date.UTC.Unix "description" (.Description | markdownify | plainify) "dir" .Dir "expirydate" .ExpiryDate.UTC.Unix "fuzzywordcount" .FuzzyWordCount "keywords" .Keywords "kind" .Kind "lang" .Lang "lastmod" .Lastmod.UTC.Unix "permalink" .Permalink "publishdate" .PublishDate "readingtime" .ReadingTime "relpermalink" .RelPermalink "summary" (.Summary | markdownify | plainify) "title" .Title "type" .Type "url" .URL "weight" .Weight "wordcount" .WordCount "section" .Section "tags" .Params.Tags "categories" .Params.Categories "authors" .Params.Authors)}}
6+
{{- $.Scratch.Add "index" (dict "objectID" .File.UniqueID "date" .Date.UTC.Unix "description" (.Description | markdownify | plainify) "dir" .File.Dir "expirydate" .ExpiryDate.UTC.Unix "fuzzywordcount" .FuzzyWordCount "keywords" .Keywords "kind" .Kind "lang" .Lang "lastmod" .Lastmod.UTC.Unix "permalink" .Permalink "publishdate" .PublishDate "readingtime" .ReadingTime "relpermalink" .RelPermalink "summary" (.Summary | markdownify | plainify) "title" .Title "type" .Type "url" .URL "weight" .Weight "wordcount" .WordCount "section" .Section "tags" .Params.Tags "categories" .Params.Categories "authors" .Params.Authors)}}
77
{{- end -}}
88
{{- end -}}
99
{{- $.Scratch.Get "index" | jsonify -}}

layouts/partials/flex/head.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<meta http-equiv="refresh" content="0;url={{ .Page.Params.redirect | absURL }}" />
66
{{- end -}}
77

8-
{{ .Hugo.Generator }}
8+
{{ hugo.Generator }}
99
<title>{{ .Title }}&nbsp;&mdash;&nbsp;{{ .Site.Title }}</title>
1010
<link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,700,900" rel="stylesheet">
1111
<link rel="shortcut icon" href="{{"images/favicon.png" | relURL}}" type="image/x-icon" />

tasks/Makefile.hugo

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,5 @@ hugo/run: components/build
1010
hugo/build: components/build
1111
@[ "$(HUGO_PUBLISH_DIR)" != "/" ] || (echo "Invalid HUGO_PUBLISH_DIR=$(HUGO_PUBLISH_DIR)"; exit 1)
1212
rm -rf $(HUGO_PUBLISH_DIR)
13-
$(DOCKER_RUN) hugo --templateMetrics --stepAnalysis --config $(HUGO_CONFIG)
14-
13+
$(DOCKER_RUN) hugo --templateMetrics --config $(HUGO_CONFIG)
1514

0 commit comments

Comments
 (0)