Split out website builds for edge and release versions

So these can be deployed to separate .silverbullet.md subdomains later

Author: zefhemel

.github/workflows/docker-website.yml

@@ -0,0 +1,45 @@
+name: Docker Website (Manual)
+
+on:
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: "Website image tag to build"
+        required: true
+        default: "edge"
+        type: choice
+        options:
+          - edge
+          - latest
+      base_image:
+        description: "Base SilverBullet image (e.g. zefhemel/silverbullet:v2)"
+        required: true
+        default: "zefhemel/silverbullet:v2"
+
+env:
+  WEBSITE_IMAGE: zefhemel/silverbullet-website
+
+jobs:
+  docker-website:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Setup repo
+        uses: actions/checkout@v3
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: "Website: Build and push"
+        uses: docker/build-push-action@v6.18.0
+        with:
+          context: .
+          file: Dockerfile.website
+          push: true
+          provenance: false
+          build-args: |
+            BASE_IMAGE=${{ inputs.base_image }}
+          tags: ${{ env.WEBSITE_IMAGE }}:${{ inputs.tag }}

.github/workflows/docker.yml

@@ -121,6 +121,21 @@ jobs:
           cache-from: type=gha
           cache-to: type=gha,mode=max
 
+  docker-website:
+    runs-on: ubuntu-latest
+    # Wait for main image so the base image is available (especially for release tags)
+    needs: docker-main
+
+    steps:
+      - name: Setup repo
+        uses: actions/checkout@v3
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
       - name: "Website: Extract metadata (tags, labels) for docker"
         id: website_meta
         uses: docker/metadata-action@v4.4.0
@@ -129,17 +144,15 @@ jobs:
           tags: |
             type=edge,branch=main
             type=semver,pattern=latest,enable=true
-            type=semver,pattern=latest,enable=true
 
-      - name: "Website: Build and push website docker images"
-        uses: docker/build-push-action@v4.0.0
+      - name: "Website: Build and push"
+        uses: docker/build-push-action@v6.18.0
         with:
           context: .
           file: Dockerfile.website
-          platforms: ${{ env.ARCHITECTURES }}
           push: true
           provenance: false
+          build-args: |
+            BASE_IMAGE=zefhemel/silverbullet:${{ startsWith(github.ref, 'refs/tags/') && 'latest' || 'v2' }}
           tags: ${{ steps.website_meta.outputs.tags }}
           labels: ${{ steps.website_meta.outputs.labels }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max

Dockerfile.website

@@ -1,4 +1,5 @@
-FROM zefhemel/silverbullet:v2
+ARG BASE_IMAGE=zefhemel/silverbullet:v2
+FROM ${BASE_IMAGE}
 
 # Set some environment variables
 ENV SB_INDEX_PAGE=SilverBullet