merge priview into main

.github/workflows/cicd.yml

@@ -7,23 +7,28 @@ on:
       - "main"
       - "preview"
 
-concurrency:
-  group: ${{ github.workflow }}
-  cancel-in-progress: true
-
 jobs:
-  jekyll-build-release-deploy:
-    uses: chnm/.github/.github/workflows/jekyll--build-release-deploy.yml@main
+  build-release:
+    uses: chnm/.github/.github/workflows/hugo--build-release.yml@main
     secrets: inherit
     with:
       container-registry: "ghcr.io"
-      container-image-name: "crdh"
-      context-root: "."
-      devl-url: "https://dev.crdh.rrchnm.org"
-      prod-url: "https://crdh.rrchnm.org"
-
-      build-artifact-name: "crdh"
+      container-image-name: "crdh-website"
+      hugo-context-root: "."
+      hugo-content-path: "/srv"
+      hugo-devl-url: "https://dev.crdh.rrchnm.org"
+      hugo-prod-url: "https://crdh.rrchnm.org"
+
+      build-artifact-name: "crdh-website"
       release-tag-name-type: "iso"
-
+
+      website-devl-fqdn: "dev.crdh.rrchnm.org"
+      website-prod-fqdn: "crdh.rrchnm.org"
+
+  deploy:
+    uses: chnm/.github/.github/workflows/docker--deploy.yml@main
+    needs: [build-release]
+    secrets: inherit
+    with:
       website-devl-fqdn: "dev.crdh.rrchnm.org"
       website-prod-fqdn: "crdh.rrchnm.org"

Dockerfile

@@ -1,17 +1,52 @@
-FROM ruby:3.1.2 AS build-stage
+# syntax=docker/dockerfile:1.7
 
-ARG environment
-ARG configfile
-ENV ENVIRONMENT=$environment
-ENV CONFIG_FILE=$configfile
+FROM stagex/pallet-nodejs AS build-stage
+
+COPY --from=stagex/user-hugo-extended /usr/bin/hugo /usr/local/bin/hugo
+
+ARG hugobuildargs="--buildDrafts --buildFuture"
+ENV HUGO_BUILD_ARGS=$hugobuildargs
 
 WORKDIR /app
-ADD . .
+COPY . .
+
+# Legacy devDependencies (node-sass/gulp) aren't used for the Hugo build;
+# --ignore-scripts skips their postinstall compilation.
+RUN npm ci --ignore-scripts
+
+# Hugo's Dart Sass doesn't resolve node_modules imports, so stage
+# Foundation SCSS sources where Hugo's asset pipeline can find them.
+RUN mkdir -p assets/vendor && \
+    cp -r node_modules/foundation-sites assets/vendor/ && \
+    cp -r node_modules/motion-ui assets/vendor/
+
+RUN hugo ${HUGO_BUILD_ARGS}
+
+FROM stagex/user-caddy
+
+COPY --from=stagex/core-musl / /
+COPY --from=build-stage /app/public /srv
+
+COPY <<'EOF' /etc/caddy/Caddyfile
+{
+	auto_https off
+	admin off
+}
+
+:80 {
+	root * /srv
+	encode gzip zstd
+
+	# Backward compatibility: /img/* serves from /assets/img/*
+	rewrite /img/* /assets{uri}
 
-RUN gem install bundler
-RUN bundle install
-RUN JEKYLL_ENV=${ENVIRONMENT} bundle exec jekyll build --destination ./_site --config _config.yml,${CONFIG_FILE}
+	file_server
+}
+EOF
 
-FROM nginx:1.23-alpine
+ENV XDG_CONFIG_HOME=/tmp/caddy-config \
+    XDG_DATA_HOME=/tmp/caddy-data
 
-COPY --from=build-stage /app/_site/ /usr/share/nginx/html
+EXPOSE 80
+ENTRYPOINT ["/usr/bin/caddy"]
+CMD ["run", "--config", "/etc/caddy/Caddyfile", "--adapter", "caddyfile"]