From 98bdedbee835b70370993dd4e7d6230884054155 Mon Sep 17 00:00:00 2001 From: Julien Dessaux Date: Tue, 31 Jan 2023 19:12:45 +0100 Subject: Update www docs with a separate page for container images --- content/docs/adyxax.org/www/containers.md | 24 ++++++++++++++++++++++++ content/docs/adyxax.org/www/install.md | 20 +------------------- 2 files changed, 25 insertions(+), 19 deletions(-) create mode 100644 content/docs/adyxax.org/www/containers.md diff --git a/content/docs/adyxax.org/www/containers.md b/content/docs/adyxax.org/www/containers.md new file mode 100644 index 0000000..f8bd309 --- /dev/null +++ b/content/docs/adyxax.org/www/containers.md @@ -0,0 +1,24 @@ +--- +title: Container images +description: How container images are built, where they are stored and how they are deployed +--- + +## Building + +There are two container images to serve a fully functional website: +- One for the hugo static website, running nginx and serving this site's static files +- One for the search web service written in go + +These are both built with `buildah` using [the same script](https://git.adyxax.org/adyxax/ev-scripts/tree/www/build-images.sh). + +Images are based on the latest alpine linux distribution available when building. + +## Registry + +The images are pushed to https://quay.io/. + +## Continuous deployment + +The build and deployment of the website is handled by `eventline` with the following jobs called from git hooks by `gitolite` when I `git push`: +- [www-build](https://git.adyxax.org/adyxax/ev-scripts/tree/www/www-build.yaml) +- [www-deploy](https://git.adyxax.org/adyxax/ev-scripts/tree/www/www-deploy.yaml) diff --git a/content/docs/adyxax.org/www/install.md b/content/docs/adyxax.org/www/install.md index d7ee65b..3b8a225 100644 --- a/content/docs/adyxax.org/www/install.md +++ b/content/docs/adyxax.org/www/install.md @@ -1,25 +1,13 @@ --- title: "Installation" description: Installation notes of www on k3s -tags: -- hugo -- k3s -- kubernetes --- ## Introduction This is a static website built using hugo. -## Container images - -There are two container images: -- One for the hugo static website -- One for the search web service - -These are both built with `buildah` using [the same script](https://git.adyxax.org/adyxax/ev-scripts/tree/www/build-images.sh). - -## Kubernetes manifests +## Kubernetes manifest [The whole manifest is here](https://git.adyxax.org/adyxax/www/tree/deploy/www.yaml). @@ -45,9 +33,3 @@ acme.sh --config-home "$HOME/.acme.sh" --server letsencrypt --dns dns_cf --issue kubectl -n www create secret tls wildcard-adyxax-org --cert=$HOME/.acme.sh/adyxax.org/fullchain.cer \ --key=$HOME/.acme.sh/adyxax.org/adyxax.org.key -o yaml --save-config --dry-run=client | kubectl apply -f - ``` - -## CI/CD - -The build and deployment of the website is handled by `eventline` with the following git hooks called by `gitolite` when I git push: -- [www-build](https://git.adyxax.org/adyxax/ev-scripts/tree/www/www-build.yaml) -- [www-deploy](https://git.adyxax.org/adyxax/ev-scripts/tree/www/www-deploy.yaml) -- cgit v1.2.3