Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move into hugo modules and adapt existing code and docs #131

Merged
merged 4 commits into from
Sep 26, 2024
Merged
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
1 change: 1 addition & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ GEM
asciidoctor (2.0.17)

PLATFORMS
universal-darwin-23
x86_64-linux

DEPENDENCIES
Expand Down
18 changes: 8 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ all: build

.PHONY: build
build: clean ## build the site
hugo -t docsy --minify
hugo -F --minify

.PHONY: build-preview
build-preview: clean ## build a preview, with future-dated content allowed.
hugo -t docsy -F --minify
hugo -F --minify

.PHONY: clean
clean: ## clean the build assets
Expand All @@ -17,15 +17,17 @@ clean: ## clean the build assets
install: ## install dependencies
bundle
npm install
hugo mod get
hugo mod graph
hugo mod get github.com/google/docsy

.PHONY: netlify
netlify: submodule-init ## build the site for Netlify
git submodule update --init --recursive --depth 1
netlify:
$(MAKE) install
$(MAKE) build

.PHONY: netlify-preview
netlify-preview: submodule-init ## build a preview of the site for Netlify
netlify-preview: ## build a preview of the site for Netlify
$(MAKE) install
$(MAKE) build-preview

Expand All @@ -35,8 +37,4 @@ serve: ## serve the content locally for testing

.PHONY: serve-preview
serve-preview: ## serve the preview content locally for testing
hugo -t docsy server -F

.PHONY: submodule-init
submodule-init:
git submodule update --init --recursive --depth 1
hugo -t docsy server -F
Binary file added assets/img/cncf-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 14 additions & 1 deletion assets/scss/_styles_project.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,17 @@

img.height-50 {
height: 50px;
}
}

.td-navbar .navbar-brand__name {
display: none;
}

.td-footer__all_rights_reserved {
display: inline;
}

.tradem img {
width: 500px;
height: auto;
}
189 changes: 0 additions & 189 deletions config.toml

This file was deleted.

16 changes: 7 additions & 9 deletions content/en/_index.html
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
+++
title = "Shipwright"
linkTitle = "Shipwright"

+++

{{< blocks/cover title="Shipwright: A framework for building container images on Kubernetes" image_anchor="top" height="full" color="orange" >}}

{{< blocks/cover title="Shipwright: A framework for building container images on Kubernetes" image_anchor="top" height="full" color="dark">}}
<div class="mx-auto">
<!-- <a class="btn btn-lg btn-primary mr-3 mb-4" href="{{< relref "/docs" >}}">
Learn More <i class="fas fa-arrow-alt-circle-right ml-2"></i>
Expand All @@ -24,12 +24,13 @@
Declare and reuse build strategies to build your container images.

Shipwright supports popular tools such as
[Kaniko](https://github.com/GoogleContainerTools/kaniko),
[Cloud Native Buildpacks](https://buildpacks.io/), [Buildah](https://buildah.io/), and more!
<a href="https://github.com/GoogleContainerTools/kaniko">Kaniko</a>,
<a href="https://buildpacks.io/">Cloud Native Buildpacks</a>,
<a href="https://buildah.io/">Buildah</a> and more!

{{% /blocks/lead %}}

{{< blocks/section color="dark" >}}
{{< blocks/section color="dark" type="row">}}

{{% blocks/feature icon="fab" %}}
{{% /blocks/feature %}}
Expand All @@ -43,7 +44,7 @@

{{< /blocks/section >}}

{{< blocks/section >}}
{{< blocks/section type="row" >}}

{{% blocks/feature icon="fab" %}}
{{% /blocks/feature %}}
Expand All @@ -52,11 +53,8 @@
Our source code is available on [GitHub](https://github.com/shipwright-io/build). Feel free to submit a [pull request](https://github.com/shipwright-io/build/pulls) - new users are always welcome!
{{% /blocks/feature %}}


{{% blocks/feature icon="fab" %}}
{{% /blocks/feature %}}


{{< /blocks/section >}}

<small class="text-left"><a href="https://www.flickr.com/photos/95012874@N00/2483655809">"Container ship"</a><span> by <a href="https://www.flickr.com/photos/95012874@N00">Martin Pettitt</a></span> is licensed under <a href="https://creativecommons.org/licenses/by/2.0/?ref=ccsearch&atype=html" style="margin-right: 5px;">CC BY 2.0</a><a href="https://creativecommons.org/licenses/by/2.0/?ref=ccsearch&atype=html" target="_blank" rel="noopener noreferrer" style="display: inline-block;white-space: none;margin-top: 2px;margin-left: 3px;height: 22px !important;"><img style="height: inherit;margin-right: 3px;display: inline-block;" src="https://search.creativecommons.org/static/img/cc_icon.svg" /><img style="height: inherit;margin-right: 3px;display: inline-block;" src="https://search.creativecommons.org/static/img/cc-by_icon.svg" /></a></small>
7 changes: 7 additions & 0 deletions content/en/community/_index.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
title: Community
menu: {main: {weight: 40}}
params:
contributingUrl: https://github.com/shipwright-io/.github/blob/main/CONTRIBUTING.md
---

10 changes: 3 additions & 7 deletions content/en/docs/_index.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
---
title: "Welcome to Shipwright"
linkTitle: "Documentation"
draft: false
title: "Documentation"
linkTitle: "Docs"
weight: 20
no_list: true
menu:
main:
weight: 20
menu: {main: {weight: 20}}
---


Expand Down
Loading