fix: docker images

Author: hazre

.github/workflows/docker-publish.yml

@@ -5,6 +5,10 @@ on:
     branches: [dev]
     tags:
       - 'sable/v*'
+  pull_request:
+    paths:
+      - 'Dockerfile'
+      - '.github/workflows/docker-publish.yml'
 
 env:
   REGISTRY: ghcr.io
@@ -27,6 +31,7 @@ jobs:
           persist-credentials: false
 
       - name: Log in to GitHub Container Registry
+        if: github.event_name != 'pull_request'
         uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
         with:
           registry: ${{ env.REGISTRY }}
@@ -62,21 +67,23 @@ jobs:
             type=semver,pattern={{major}}.{{minor}},value=${{ steps.release_tag.outputs.value }},enable=${{ steps.release_tag.outputs.is_release == 'true' }}
             type=semver,pattern={{major}},value=${{ steps.release_tag.outputs.value }},enable=${{ steps.release_tag.outputs.is_release == 'true' && !startsWith(steps.release_tag.outputs.value, 'v0.') }}
 
-      - name: Compute short SHA
-        id: vars
-        run: echo "short_sha=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
+      # TODO: CI build temporarily disabled — site is now built inside Docker.
+      # Re-enable these steps (and build-contexts below) once we move the build back to CI.
+      # - name: Compute short SHA
+      #   id: vars
+      #   run: echo "short_sha=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
 
-      - name: Setup app
-        uses: ./.github/actions/setup
-        with:
-          install-command: pnpm install --frozen-lockfile --ignore-scripts
+      # - name: Setup app
+      #   uses: ./.github/actions/setup
+      #   with:
+      #     install-command: pnpm install --frozen-lockfile --ignore-scripts
 
-      - name: Build site
-        env:
-          VITE_BUILD_HASH: ${{ steps.vars.outputs.short_sha }}
-          VITE_IS_RELEASE_TAG: ${{ steps.release_tag.outputs.is_release }}
-        run: |
-          NODE_OPTIONS=--max_old_space_size=4096 pnpm run build
+      # - name: Build site
+      #   env:
+      #     VITE_BUILD_HASH: ${{ steps.vars.outputs.short_sha }}
+      #     VITE_IS_RELEASE_TAG: ${{ steps.release_tag.outputs.is_release }}
+      #   run: |
+      #     NODE_OPTIONS=--max_old_space_size=4096 pnpm run build
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0
@@ -89,16 +96,18 @@ jobs:
         uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
         with:
           context: .
-          push: true
+          push: ${{ github.event_name != 'pull_request' }}
           platforms: linux/amd64,linux/arm64
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
-          build-contexts: |
-            site-dist=./dist
+          # TODO: re-enable once CI build is restored
+          # build-contexts: |
+          #   site-dist=./dist
 
       - name: Generate artifact attestation
+        if: github.event_name != 'pull_request'
         uses: actions/attest-build-provenance@a2bbfa25375fe432b6a289bc6b6cd05ecd0c4c32 # v4.1.0
         with:
           subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}

Dockerfile

@@ -3,6 +3,7 @@ FROM --platform=$BUILDPLATFORM node:24.13.1-alpine AS base
 ENV PNPM_HOME="/pnpm"
 ENV PATH="$PNPM_HOME:$PATH"
 RUN corepack enable
+RUN apk add --no-cache git
 
 ## Builder
 FROM base AS builder
@@ -13,10 +14,10 @@ ARG VITE_BUILD_HASH
 ARG VITE_IS_RELEASE_TAG=false
 ENV VITE_BUILD_HASH=$VITE_BUILD_HASH
 ENV VITE_IS_RELEASE_TAG=$VITE_IS_RELEASE_TAG
-COPY pnpm-lock.yaml /src/
+COPY pnpm-lock.yaml pnpm-workspace.yaml /src/
 RUN pnpm fetch
 COPY . /src/
-RUN pnpm install --offline --frozen-lockfile --ignore-scripts
+RUN pnpm install --offline --frozen-lockfile
 ENV NODE_OPTIONS=--max_old_space_size=4096
 RUN pnpm run build
 

vite.config.ts

@@ -93,14 +93,14 @@ const copyFiles = {
 const require = createRequire(import.meta.url);
 
 function serverMatrixSdkCryptoWasm() {
-  const resolvedPath = path.join(
-    path.dirname(require.resolve('@matrix-org/matrix-sdk-crypto-wasm')),
-    'pkg/matrix_sdk_crypto_wasm_bg.wasm'
-  );
-
   return {
     name: 'vite-plugin-serve-matrix-sdk-crypto-wasm',
     configureServer(server: ViteDevServer) {
+      const resolvedPath = path.join(
+        path.dirname(require.resolve('@matrix-org/matrix-sdk-crypto-wasm')),
+        'pkg/matrix_sdk_crypto_wasm_bg.wasm'
+      );
+
       server.middlewares.use((req, res, next) => {
         if (!req.url?.endsWith('matrix_sdk_crypto_wasm_bg.wasm')) {
           next();