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

.github/workflows/cicd.yml

@@ -0,0 +1,24 @@
+name: "[ct-website] Build, Release, Deploy"
+
+on:
+  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: "ct-website"
+      hugo-context-root: "."
+      hugo-devl-url: "https://dev.connectingthreads.co.uk"
+      hugo-prod-url: "https://connectingthreads.co.uk"
+
+      build-artifact-name: "ct-website"
+      release-tag-name-type: "iso"
+
+      website-devl-fqdn: "dev.connectingthreads.co.uk"
+      website-prod-fqdn: "connectingthreads.co.uk"

Dockerfile

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

Makefile

@@ -4,10 +4,3 @@ preview :
 
 build :
 	hugo --minify
-
-deploy : hugo
-	@echo "\nDeploying the site with rsync ..."
-	rsync --delete --itemize-changes --omit-dir-times \
-		--checksum -avz --no-t --no-perms --exclude-from=rsync-excludes \
-		public/ chnmdev:/websites/conthreads/www | egrep -v '^\.'
-	@echo "Finished deploying the site to dev with rsync."