From 096b63c586be44f4c07b9854e3a6a9826744891c Mon Sep 17 00:00:00 2001
From: nexy7574 <git@nexy7574.co.uk>
Date: Thu, 4 Jul 2024 15:45:16 +0100
Subject: [PATCH] CI and nav improvements

* Added docker image (mainly for dev work)
* Addded docker CI
* Fixed the QR code for keyoxide being tiny
---
 .forgejo/workflows/docker-build.yml | 42 +++++++++++++++++++++++++++++
 Dockerfile                          |  7 +++++
 ssg/src/_includes/nav.njk           |  2 +-
 ssg/src/css/bundle.css              |  1 +
 4 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 .forgejo/workflows/docker-build.yml
 create mode 100644 Dockerfile

diff --git a/.forgejo/workflows/docker-build.yml b/.forgejo/workflows/docker-build.yml
new file mode 100644
index 0000000..da5c0db
--- /dev/null
+++ b/.forgejo/workflows/docker-build.yml
@@ -0,0 +1,42 @@
+name: Build and Publish
+run-name: Build and Publish
+on: [push]
+
+env:
+  image: website
+  registry: git.i-am.nexus
+  username: nex
+
+jobs:
+  build_and_publish:
+    runs-on: [ubuntu-latest]
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.registry }}/${{ env.username }}/${{ env.image }}
+
+      - name: Log into forgejo CR
+        if: ${{ github.event_name != 'pull_request' }}
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.registry }}
+          username: ${{ env.username }}
+          password: ${{ secrets.CR_PASSWORD }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=registry,ref=${{ env.registry }}/${{ env.username }}/${{ env.image }}
+          cache-to: type=inline
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..ff23b19
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,7 @@
+FROM node:22-alpine
+WORKDIR /app
+COPY ssg/package.json /app/
+# COPY ssg/package-lock.json /app/
+RUN npm install
+COPY ssg/ /app/
+CMD ["npm", "start"]
diff --git a/ssg/src/_includes/nav.njk b/ssg/src/_includes/nav.njk
index 9b32f30..fce8c24 100644
--- a/ssg/src/_includes/nav.njk
+++ b/ssg/src/_includes/nav.njk
@@ -26,7 +26,7 @@
             </div>
             <div>
                 <a href="https://keyoxide.org/aspe:keyoxide.org:SXB3ZU42WOVGPHY7OIZMIB3TYE" rel="noopener noreferrer" target="_blank" class="icon">
-                    <img src="/img/keyoxide.png" alt="Keyoxide" title="Keyoxide metaprofile" width="32px" height="32px" class="icon"/>
+                    <img src="/img/keyoxide.png" alt="Keyoxide" title="Keyoxide metaprofile" width="32px" height="32px" class="icon" style="height:3rem;width:auto;margin:0;padding:0"/>
                 </a>
             </div>
         </div>
diff --git a/ssg/src/css/bundle.css b/ssg/src/css/bundle.css
index 583611d..ef13fda 100644
--- a/ssg/src/css/bundle.css
+++ b/ssg/src/css/bundle.css
@@ -49,6 +49,7 @@ a:hover, a:visited {
 
 a.icon {
     text-decoration: none;
+    font-size: 2em;
 }
 img.icon {
     vertical-align: middle;