Merge remote-tracking branch 'refs/remotes/origin/main'

.github/workflows/cicd.yml

@@ -0,0 +1,25 @@
+name: "[relec-website] Build, Release, Deploy"
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - "main"
+      - "preview"
+
+jobs:
+  hugo-build-release-deploy:
+    uses: chnm/.github/.github/workflows/hugo--build-release-deploy.yml@main
+    secrets: inherit
+    with:
+      container-registry: "ghcr.io"
+      container-image-name: "relec-website"
+      hugo-context-root: "."
+      hugo-devl-url: "http://dev.religiousecologies.org"
+      hugo-prod-url: "https://religiousecologies.org"
+
+      build-artifact-name: "relec-website"
+      release-tag-name-type: "iso"
+
+      website-devl-fqdn: "dev.religiousecologies.org"
+      website-prod-fqdn: "religiousecologies.org"

Dockerfile

@@ -0,0 +1,17 @@
+FROM klakegg/hugo:0.107.0-ext-alpine as build-stage
+
+ARG hugobuildargs
+ENV HUGO_BUILD_ARGS $hugobuildargs
+
+RUN apk add npm
+
+WORKDIR /app
+ADD . .
+
+RUN npm install -y
+RUN hugo ${HUGO_BUILD_ARGS}
+
+FROM nginx:1.23-alpine
+
+COPY --from=build-stage /app/public/ /usr/share/nginx/html
+

Makefile

@@ -7,23 +7,9 @@ build :
 	hugo --cleanDestinationDir --buildDrafts --buildFuture --baseURL https://dev.religiousecologies.org/
 	@echo "Website finished building."
 
-deploy : build
-	@echo "\nDeploying the site to dev with rsync ..."
-	rsync --delete --itemize-changes --omit-dir-times \
-		--checksum -avz --no-t --no-perms --exclude-from=rsync-excludes \
-		public/ athena:/websites/relecodev/www/ | egrep -v '^\.'
-	@echo "Finished deploying the site to dev with rsync."
-
 build-prod :
 	@echo "\nBuilding the site with Hugo ..."
 	hugo --cleanDestinationDir --minify
 	@echo "Website finished building."
 
-deploy-prod : build-prod
-	@echo "\nDeploying the site to production with rsync ..."
-	rsync --delete --itemize-changes --omit-dir-times \
-		--checksum -avz --no-t --no-perms --exclude-from=rsync-excludes \
-		public/ athena:/websites/religiousecologies.org/ | egrep -v '^\.'
-	@echo "Finished deploying the site to production with rsync."
-
 .PHONY : preview build deploy

config.yaml

@@ -15,3 +15,5 @@ markup:
   goldmark:
     renderer:
       unsafe: true
+
+timeout: "120s"