Skip to content

Commit 257d74f

Browse files
crosbymichaelcrosbymichael
authored
Merge pull request #2342 from lucperkins/lperkins/hugo-migration
Migrate website to Hugo
2 parents b511c39 + d1503dc commit 257d74f

67 files changed

Lines changed: 235 additions & 240 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.ruby-version‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎Gemfile‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎Gemfile.lock‎

Lines changed: 0 additions & 69 deletions
This file was deleted.

‎docs/.editorconfig‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
[*]
2+
end_of_line = lf
3+
charset = utf-8
4+
max_line_length = 80
5+
trim_trailing_whitespace = true
6+
insert_final_newline = false
7+
8+
[*.{html,js,sh,sass,md,mmark}]
9+
indent_style = space
10+
indent_size = 2
11+
12+
[Makefile]
13+
indent_style = tab

‎docs/.gitignore‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
**/.DS_Store
22
**/desktop.ini
3-
.bundle/**
4-
.jekyll-metadata
5-
_site/**
6-
.sass-cache/**
73
CNAME
8-
Gemfile.lock
4+
5+
# Hugo-generated content
6+
public/

‎docs/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@
1515

1616
FROM nginx
1717

18-
COPY _site /usr/share/nginx/html
18+
COPY public /usr/share/nginx/html

docs/hooks/pre_build renamed to docs/Makefile

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#!/bin/bash
2-
31
# Copyright The containerd Authors.
42

53
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,13 +12,20 @@
1412
# See the License for the specific language governing permissions and
1513
# limitations under the License.
1614

15+
HUGO = hugo
16+
BASE_URL = https://containerd.io
17+
18+
clean:
19+
rm -rf public
20+
21+
build: clean
22+
$(HUGO) \
23+
--baseURL $(BASE_URL)
1724

18-
echo "=> Building the binary"
19-
docker run --privileged \
20-
-v $(pwd):/usr/src/app \
21-
-v /var/run/docker.sock:/var/run/docker.sock \
22-
starefossen/github-pages jekyll build
23-
echo $(pwd)
24-
ls -la
25-
ls -la _site
25+
build-preview: clean
26+
$(HUGO)
2627

28+
dev: clean
29+
$(HUGO) server \
30+
--disableFastRender \
31+
--ignoreCache

‎docs/README.md‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
# Containerd website
22

3-
The containerd website is built using Jekyll and published to Github pages.
3+
The containerd website at https://containerd.io is built using [Hugo](https://gohugo.io) and published to [Netlify](https://netlify.com).
44

5-
In order to build and test locally:
6-
```
7-
docker run -it -v "$PWD":/usr/src/app -p "4000:4000" starefossen/github-pages
5+
To develop the site locally in "watch" mode (using Docker):
6+
7+
```bash
8+
$ docker run -it -v $(pwd):/src -p "1313:1313" -e HUGO_WATCH=true jojomi/hugo
89
```
9-
Then browser to localhost:4000 to see the rendered site. The site autorefreshes when you modify files locally.
10+
11+
You can then open up your browser to localhost:1313 to see the rendered site. The site auto-refreshes when you modify files locally.
1012

‎docs/_config.yml‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎docs/_includes/footer.html‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)