Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .devcontainer/on-create.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,13 @@ set -euo pipefail
cd $(mktemp -d)

# hugo
scurl -O https://github.com/gohugoio/hugo/releases/download/v0.142.0/hugo_extended_0.142.0_linux-amd64.deb
scurl -O https://github.com/gohugoio/hugo/releases/download/v0.142.0/hugo_0.142.0_linux-amd64.deb
sudo dpkg -i hugo*.deb
rm hugo*.deb

# dart sass
sudo npm install -g sass-embedded@1.97.3

# htmltest
scurl https://htmltest.wjdp.uk | bash
sudo mv bin/htmltest /usr/local/bin
Expand Down
6 changes: 4 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ endef
HAS_GSUTIL := $(shell command -v gsutil;)
HAS_FLARECTL := $(shell command -v flarectl;)
HAS_HUGO := $(shell command -v hugo;)
HAS_SASS := $(shell command -v sass;)
HAS_HTMLTEST := $(shell command -v htmltest;)
HAS_MDLINT := $(shell command -v markdownlint;)

Expand Down Expand Up @@ -115,6 +116,9 @@ build-linkerd.io: get-versions tmp/linkerd.io
@# Build linkerd.io
ifndef HAS_HUGO
@printf "Install hugo first. For OSX: brew install hugo\n"; exit 1
endif
ifndef HAS_SASS
@printf "Install Dart Sass first: npm install sass\n"; exit 1
endif
cd tmp/linkerd.io && ./build

Expand Down Expand Up @@ -146,5 +150,3 @@ has-env-%:
.PHONY: clean
clean:
rm -rf tmp


6 changes: 4 additions & 2 deletions linkerd.io/Makefile
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
production-build:
hugo \
npm install --save-dev sass-embedded
PATH="$(CURDIR)/node_modules/.bin:$$PATH" hugo \
--cleanDestinationDir \
--minify

preview-build:
hugo \
npm install --save-dev sass-embedded
PATH="$(CURDIR)/node_modules/.bin:$$PATH" hugo \
--baseURL $(DEPLOY_PRIME_URL) \
--buildDrafts \
--buildFuture \
Expand Down
22 changes: 14 additions & 8 deletions linkerd.io/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,27 @@ docker run \

### Install Hugo to develop locally

For Mac users:
Install Dart Sass first:

```bash
brew install sass/sass/sass
```

Then install Hugo:

```bash
brew install hugo
```

Or download the **extended** release of Hugo from the GitHub
Or download the release of Hugo from the GitHub
[release page](https://github.com/gohugoio/hugo/releases/).

## Hugo version requirements

The minimum version of Hugo needed to build the site is `v0.142.0`.

When linkerd.io is deployed to production, we use Hugo `v0.142.0`.

### Run Hugo locally

From the root `/website` directory, build site and run Hugo in development mode:
Expand All @@ -32,12 +44,6 @@ hugo server -s linkerd.io
You should see the site on localhost:1313, and it should reload automatically
upon file write.

## Hugo version requirements

The minimum version of Hugo needed to build the site is `v0.142.0`.

When linkerd.io is deployed to production, we use Hugo `v0.142.0`.

## Website images

Please do not put files in the `static` directory that are referenced on
Expand Down
272 changes: 0 additions & 272 deletions linkerd.io/assets/scss/_base.scss

This file was deleted.

Loading