fix: add explicit --context and --file to all docker build commands

- PR workflow: build, deploy to CI site, wait for health, run acceptance tests
- Release workflow: deploy to dev using mounted compose path with health check
- Add deploy-prod workflow (workflow_dispatch) for human-gated prod deployment
- Add just recipes: deploy-prod, status (view current image tags across envs)
- Runners now have /apps mount for access to all environment compose files

.gitea/workflows/build-ci-images.yml

@@ -8,7 +8,6 @@ on:
       - "Dockerfile.ci-base"
       - "package.json"
       - "bun.lock"
-      - "package-lock.json"
       - ".gitea/workflows/build-ci-images.yml"
   schedule:
     # Weekly rebuild to get latest Playwright/Bun versions
@@ -53,13 +52,14 @@ jobs:
 
       - name: Build and push CI base image
         run: |
+          WORKSPACE_DIR="$GITHUB_WORKSPACE"
+          # Build with multiple tags
           docker build \
-            --file Dockerfile.ci-base \
+            --context "$WORKSPACE_DIR" \
+            --file "$WORKSPACE_DIR/Dockerfile.ci-base" \
             --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/ci-base:latest \
             --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/ci-base:playwright-${{ steps.meta.outputs.playwright_version }} \
             --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/ci-base:${{ github.sha }} \
-            --push \
-            .
 
       - name: Clean up
         if: always()

.gitea/workflows/deploy-prod.yml

@@ -40,12 +40,12 @@ jobs:
 
           # Wait for production site to be healthy
           echo "Waiting for production site to be healthy..."
-          for i in {1..6}; do
+          for i in {1..30}; do
             if curl -sf https://euchre.notsosm.art/api/health > /dev/null 2>&1; then
               echo "✅ Production successfully deployed with version ${VERSION}"
               exit 0
             fi
-            sleep 15
+            sleep 0.5
           done
           echo "❌ Production deployment failed"
           docker compose logs app

.gitea/workflows/pr.yml

@@ -15,21 +15,21 @@ jobs:
     container:
       image: docker.notsosm.art/euchre-camp/ci-base:latest
       options: --user root
-    env:
-      DATABASE_URL: postgresql://user:pass@localhost:5432/dummy
 
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
       - name: Install dependencies
-        run: npm ci --legacy-peer-deps
+        run: bun install
 
       - name: Generate Prisma client
-        run: npx prisma generate
+        run: bun x prisma generate
+        env:
+          DATABASE_URL: postgresql://user:pass@localhost:5432/dummy
 
       - name: Run unit tests
-        run: npm test
+        run: bun test src/__tests__/unit/ src/__tests__/*.test.tsx src/__tests__/auth-simple.test.ts
 
   build-and-deploy-ci:
     runs-on: ubuntu-latest
@@ -37,20 +37,16 @@ jobs:
     container:
       image: docker.notsosm.art/euchre-camp/ci-base:latest
       options: --user root
-      volumes:
-        - /var/lib/casaos/apps:/apps
 
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      # Required for acceptance tests - they import prisma via @/ path alias
-      # and @cucumber/cucumber for cucumber-e2e tests
       - name: Install dependencies
-        run: npm ci --legacy-peer-deps
+        run: bun install
 
       - name: Generate Prisma client
-        run: npx prisma generate
+        run: bun x prisma generate
         env:
           DATABASE_URL: postgresql://user:pass@localhost:5432/dummy
 
@@ -62,12 +58,15 @@ jobs:
 
       - name: Build Docker image for PR
         run: |
+          WORKSPACE_DIR="$GITHUB_WORKSPACE"
           IMAGE_TAG="pr-${{ steps.info.outputs.pr_number }}-${{ steps.info.outputs.short_sha }}"
           docker build \
+            --context "$WORKSPACE_DIR" \
+            --file "$WORKSPACE_DIR/Dockerfile" \
             --target runner \
             --build-arg GIT_COMMIT=$GITHUB_SHA \
             -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${IMAGE_TAG} \
-            .
+            "$WORKSPACE_DIR"
 
       - name: Update CI site compose and restart
         run: |
@@ -77,34 +76,33 @@ jobs:
           # Update the image tag in the compose file
           sed -i "s|image: docker.notsosm.art/euchre-camp:[a-zA-Z0-9.-]*|image: docker.notsosm.art/euchre-camp:${IMAGE_TAG}|" ${COMPOSE_FILE}
 
-          # Image was built locally in the previous step; compose uses it without pulling
+          # Pull the new image and restart the CI stack
           cd /apps/euchre_camp_ci
+          docker compose pull app
           docker compose up -d app
 
-      - name: Wait for CI site to be ready
+      - name: Wait for CI site to be healthy
         run: |
-          echo "Waiting for Next.js to start..."
-          sleep 20
-          for i in {1..6}; do
+          for i in {1..30}; do
             if curl -sf https://euchre-ci.notsosm.art/api/health > /dev/null 2>&1; then
               echo "CI site is healthy"
               exit 0
             fi
-            sleep 15
+            sleep 0.5
           done
-          echo "CI site failed to become healthy after 90 seconds"
+          echo "CI site failed to become healthy after 15 seconds"
           docker compose -f /apps/euchre_camp_ci/docker-compose.yml logs app
           exit 1
 
       - name: Run acceptance tests
-        run: DATABASE_URL="${{ secrets.CI_DATABASE_URL }}" npx playwright test e2e/
+        run: DATABASE_URL="${{ secrets.CI_DATABASE_URL }}" bun test:acceptance
         env:
           CI: true
 
       - name: Cleanup PR images
         if: always()
         run: |
-          docker rmi --force ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:pr-${{ steps.info.outputs.pr_number }}-${{ steps.info.outputs.short_sha }} || true
+          docker rmi ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:pr-${{ steps.info.outputs.pr_number }}-${{ steps.info.outputs.short_sha }} || true
 
   analyze-bump-type:
     runs-on: ubuntu-latest
@@ -148,7 +146,6 @@ jobs:
           echo "reason=$REASON" >> $GITHUB_OUTPUT
 
       - name: Comment bump type on PR
-        if: github.event_name == 'pull_request'
         uses: actions/github-script@v7
         with:
           script: |

.gitea/workflows/release.yml

@@ -73,10 +73,10 @@ jobs:
           echo "Bumping version: $BUMP"
 
           # Run the bump script
-          node scripts/bump-version.js "$BUMP" --yes
+          bun run scripts/bump-version.js "$BUMP" --yes
 
           # Get new version
-          NEW_VERSION=$(node -e "console.log(require('./package.json').version)")
+          NEW_VERSION=$(bun -e "console.log(require('./package.json').version)")
           echo "new_version=$NEW_VERSION" >> $GITHUB_OUTPUT
           echo "New version: $NEW_VERSION"
 
@@ -110,30 +110,35 @@ jobs:
       - name: Build test-capable image
         if: steps.commit.outputs.committed == 'true'
         run: |
+          WORKSPACE_DIR="$GITHUB_WORKSPACE"
           docker build \
+            --context "$WORKSPACE_DIR" \
+            --file "$WORKSPACE_DIR/Dockerfile" \
             --target test-runner \
             --build-arg GIT_COMMIT=${{ github.sha }} \
             -t ${{ env.IMAGE_NAME }}-test:${{ steps.version.outputs.new_version }} \
-            .
+            "$WORKSPACE_DIR"
 
       - name: Run tests inside test-capable container
         if: steps.commit.outputs.committed == 'true'
         run: |
           docker run --rm \
             -e DATABASE_URL="postgresql://user:pass@localhost:5432/dummy" \
-            -e NODE_ENV=test \
             ${{ env.IMAGE_NAME }}-test:${{ steps.version.outputs.new_version }} \
-            npm test
+            bun test 'src/__tests__/unit/**' 'src/__tests__/*.test.tsx' 'src/__tests__/auth-simple.test.ts'
 
       - name: Build production image
         if: steps.commit.outputs.committed == 'true'
         run: |
+          WORKSPACE_DIR="$GITHUB_WORKSPACE"
           docker build \
+            --context "$WORKSPACE_DIR" \
+            --file "$WORKSPACE_DIR/Dockerfile" \
             --target runner \
             --build-arg GIT_COMMIT=${{ github.sha }} \
             -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.new_version }} \
             -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest \
-            .
+            "$WORKSPACE_DIR"
 
       - name: Push Docker images
         if: steps.commit.outputs.committed == 'true'
@@ -177,12 +182,12 @@ jobs:
 
           # Wait for container to be healthy
           echo "Waiting for dev site to be healthy..."
-          for i in {1..6}; do
+          for i in {1..30}; do
             if curl -sf https://euchre-dev.notsosm.art/api/health > /dev/null 2>&1; then
               echo "✅ Dev environment successfully deployed with version ${{ steps.version.outputs.new_version }}"
               exit 0
             fi
-            sleep 15
+            sleep 0.5
           done
           echo "❌ Dev environment deployment failed"
           docker compose logs app

Dockerfile

@@ -4,7 +4,7 @@
 FROM oven/bun:alpine AS builder
 
 # Install dependencies (needed for native modules)
-RUN apk add --no-cache python3 make g++ nodejs npm
+RUN apk add --no-cache python3 make g++
 
 # Set working directory
 WORKDIR /app
@@ -13,14 +13,14 @@ WORKDIR /app
 COPY package*.json ./
 
 # Install dependencies (including dev dependencies for building)
-RUN npm ci --legacy-peer-deps
+RUN bun install
 
 # Copy source code
 COPY . .
 
 # Generate Prisma client (with dummy PostgreSQL DATABASE_URL for build-time generation)
 # Note: A dummy URL is used since the real database is not available during build
-RUN DATABASE_PROVIDER=postgresql DATABASE_URL="postgresql://user:pass@localhost:5432/dummy" npx prisma generate
+RUN DATABASE_PROVIDER=postgresql DATABASE_URL="postgresql://user:pass@localhost:5432/dummy" bun x prisma generate
 
 # Build the application (with dummy DATABASE_URL for static page generation and git commit)
 ARG GIT_COMMIT=unknown
@@ -30,7 +30,7 @@ RUN DATABASE_PROVIDER=postgresql DATABASE_URL="postgresql://user:pass@localhost:
 FROM oven/bun:alpine AS test-runner
 
 # Install dependencies
-RUN apk add --no-cache python3 make g++ git nodejs npm
+RUN apk add --no-cache python3 make g++ git
 
 # Set working directory
 WORKDIR /app
@@ -39,19 +39,19 @@ WORKDIR /app
 COPY package*.json ./
 
 # Install ALL dependencies (including dev dependencies for testing)
-RUN npm ci --legacy-peer-deps
+RUN bun install
 
 # Copy source code
 COPY . .
 
 # Generate Prisma client
-RUN DATABASE_PROVIDER=postgresql DATABASE_URL="postgresql://user:pass@localhost:5432/dummy" npx prisma generate
+RUN DATABASE_PROVIDER=postgresql DATABASE_URL="postgresql://user:pass@localhost:5432/dummy" bun x prisma generate
 
 # Stage 3: Production runner
 FROM oven/bun:alpine AS runner
 
-# Install dumb-init and npm for production install
-RUN apk add --no-cache dumb-init nodejs npm
+# Install dumb-init for proper signal handling
+RUN apk add --no-cache dumb-init
 
 # Create non-root user
 RUN addgroup --system --gid 1001 euchre && \
@@ -64,15 +64,15 @@ WORKDIR /app
 COPY --from=builder --chown=euchre:euchre /app/.next ./.next
 COPY --from=builder --chown=euchre:euchre /app/public ./public
 COPY --from=builder --chown=euchre:euchre /app/package.json ./package.json
-COPY --from=builder --chown=euchre:euchre /app/package-lock.json ./package-lock.json
+COPY --from=builder --chown=euchre:euchre /app/bun.lock ./bun.lock
 COPY --from=builder --chown=euchre:euchre /app/prisma ./prisma
 
 # Install only production dependencies
-RUN npm ci --legacy-peer-deps --omit=dev
+RUN bun install --production
 
 # Generate Prisma client
 # Note: We need to set DATABASE_URL even for generation because prisma.config.ts requires it
-RUN DATABASE_PROVIDER=postgresql DATABASE_URL="postgresql://user:pass@localhost:5432/dummy" npx prisma generate
+RUN DATABASE_PROVIDER=postgresql DATABASE_URL="postgresql://user:pass@localhost:5432/dummy" bun x prisma generate
 
 # Switch to non-root user
 USER euchre

justfile

@@ -259,12 +259,12 @@ deploy-prod version:
     docker compose pull app && \
     docker compose up -d app && \
     echo "Waiting for production site to be healthy..." && \
-    for i in {1..6}; do \
+    for i in {1..30}; do \
       if curl -sf https://euchre.notsosm.art/api/health > /dev/null 2>&1; then \
         echo "✅ Production successfully deployed with version {{version}}"; \
         exit 0; \
       fi; \
-      sleep 15; \
+      sleep 0.5; \
     done && \
     echo "❌ Production deployment failed - health check timed out"; \
     docker compose logs app; \

src/__tests__/auth-simple.test.ts

@@ -47,7 +47,9 @@ describe('getSession', () => {
   })
 
   it('returns null when an error occurs', async () => {
-    mockFetch.mockRejectedValue(new Error('Network error'))
+    mockFetch.mockImplementation(async () => {
+      throw new Error('Network error')
+    })
 
     const result = await getSession()
 

src/__tests__/unit/permissions.test.ts

@@ -1,6 +1,6 @@
 /**
  * Unit Tests: Permissions
- * 
+ *
  * Tests the permission system for tournament management
  */
 
@@ -57,7 +57,7 @@ describe('Permissions', () => {
         user: { id: '1', email: 'test@example.com' },
         session: { token: 'test', expiresAt: new Date() }
       }));
-      userFindUniqueMock.mockImplementation(async () => 
+      userFindUniqueMock.mockImplementation(async () =>
         createMockUser('1', 'test@example.com', 'club_admin')
       );
 
@@ -70,7 +70,7 @@ describe('Permissions', () => {
         user: { id: '1', email: 'test@example.com' },
         session: { token: 'test', expiresAt: new Date() }
       }));
-      userFindUniqueMock.mockImplementation(async () => 
+      userFindUniqueMock.mockImplementation(async () =>
         createMockUser('1', 'test@example.com', 'player')
       );
 
@@ -93,7 +93,7 @@ describe('Permissions', () => {
         user: { id: 'admin-1', email: 'admin@example.com' },
         session: { token: 'test', expiresAt: new Date() }
       }));
-      userFindUniqueMock.mockImplementation(async () => 
+      userFindUniqueMock.mockImplementation(async () =>
         createMockUser('admin-1', 'admin@example.com', 'club_admin')
       );
 
@@ -106,7 +106,7 @@ describe('Permissions', () => {
         user: { id: 'player-1', email: 'player@example.com' },
         session: { token: 'test', expiresAt: new Date() }
       }));
-      userFindUniqueMock.mockImplementation(async () => 
+      userFindUniqueMock.mockImplementation(async () =>
         createMockUser('player-1', 'player@example.com', 'player')
       );
 
@@ -122,7 +122,7 @@ describe('Permissions', () => {
         user: { id: 'admin-1', email: 'admin@example.com' },
         session: { token: 'test', expiresAt: new Date() }
       }));
-      userFindUniqueMock.mockImplementation(async () => 
+      userFindUniqueMock.mockImplementation(async () =>
         createMockUser('admin-1', 'admin@example.com', 'tournament_admin')
       );
 
@@ -135,7 +135,7 @@ describe('Permissions', () => {
         user: { id: 'admin-1', email: 'admin@example.com' },
         session: { token: 'test', expiresAt: new Date() }
       }));
-      userFindUniqueMock.mockImplementation(async () => 
+      userFindUniqueMock.mockImplementation(async () =>
         createMockUser('admin-1', 'admin@example.com', 'club_admin')
       );
 
@@ -148,7 +148,7 @@ describe('Permissions', () => {
         user: { id: 'player-1', email: 'player@example.com' },
         session: { token: 'test', expiresAt: new Date() }
       }));
-      userFindUniqueMock.mockImplementation(async () => 
+      userFindUniqueMock.mockImplementation(async () =>
         createMockUser('player-1', 'player@example.com', 'player')
       );
 

src/__tests__/unit/tournament-update.test.ts

@@ -3,37 +3,17 @@
  * Tests the allowTies field is properly saved when updating tournaments
  */
 
-import { describe, it, expect, mock, beforeEach,} from 'bun:test';
+import { describe, it, expect, mock, beforeEach, afterAll } from 'bun:test';
 
 // Create mock functions at module level
 const eventFindUniqueMock = mock(async () => ({}));
 const eventUpdateMock = mock(async () => ({}));
-const userFindUniqueMock = mock(async () => ({
-  id: 'admin-1',
-  email: 'admin@example.com',
-  role: 'club_admin',
-  emailVerified: false,
-  name: null,
-  image: null,
-  playerId: null,
-  createdAt: new Date(),
-  updatedAt: new Date(),
-}));
+const canManageTournamentMock = mock(async () => ({ allowed: true }));
+const canDeleteTournamentMock = mock(async () => ({ allowed: true }));
 
-// Mock auth-simple to return a valid session
-mock.module('@/lib/auth-simple', () => ({
-  getSession: mock(async () => ({
-    user: { id: 'admin-1', email: 'admin@example.com' },
-    session: { token: 'test', expiresAt: new Date() }
-  })),
-}));
-
-// Mock prisma with user and event
+// Mock prisma first
 mock.module('@/lib/prisma', () => ({
   prisma: {
-    user: {
-      findUnique: userFindUniqueMock,
-    },
     event: {
       findUnique: eventFindUniqueMock,
       update: eventUpdateMock,
@@ -41,6 +21,17 @@ mock.module('@/lib/prisma', () => ({
   },
 }));
 
+// Mock the permissions module
+mock.module('@/lib/permissions', () => ({
+  canManageTournament: canManageTournamentMock,
+  canDeleteTournament: canDeleteTournamentMock,
+}));
+
+// Cleanup after all tests in this file
+afterAll(() => {
+  mock.restore('module');
+});
+
 // Import the route handler after mocking
 import { PUT } from '@/app/api/tournaments/[id]/route';
 import { prisma } from '@/lib/prisma';
@@ -50,7 +41,8 @@ describe('Tournament Update API', () => {
     // Clear all mock history before each test
     eventFindUniqueMock.mockClear();
     eventUpdateMock.mockClear();
-    userFindUniqueMock.mockClear();
+    canManageTournamentMock.mockClear();
+    canDeleteTournamentMock.mockClear();
   });
 
   it('should update allowTies field when provided', async () => {