Merge 72b86ca6ad into 46c78a0540

.github/workflows/deploy-beta.yml

@@ -21,6 +21,8 @@ jobs:
 
       - name: Install pnpm
         uses: pnpm/action-setup@v4
+        with:
+          version: 10
 
       - uses: actions/setup-node@v4
         with:

.github/workflows/deploy.yml

@@ -19,6 +19,8 @@ jobs:
 
       - name: Install pnpm
         uses: pnpm/action-setup@v4
+        with:
+          version: 10
 
       - uses: actions/setup-node@v4
         with:

.github/workflows/github-pages.yml

@@ -37,6 +37,8 @@ jobs:
 
       - name: Install pnpm
         uses: pnpm/action-setup@v4
+        with:
+          version: 10
 
       - name: Setup Node 22.14.1
         uses: actions/setup-node@v4

.github/workflows/linting.yml

@@ -25,6 +25,8 @@ jobs:
 
       - name: Install pnpm
         uses: pnpm/action-setup@v4
+        with:
+          version: 10
 
       - name: Set up Node.js
         uses: actions/setup-node@v4

.github/workflows/test-shard-template.yml

@@ -31,6 +31,8 @@ jobs:
 
       - name: Install pnpm
         uses: pnpm/action-setup@v4
+        with:
+          version: 10
 
       - name: Set up Node.js
         uses: actions/setup-node@v4

Dockerfile

@@ -21,7 +21,7 @@ COPY . .
 # Copy package files
 COPY package.json pnpm-lock.yaml ./
 
-# Install all dependencies
+# Install all dependencies, skipping postinstall
 RUN --mount=type=cache,target=/home/appuser/.pnpm-store \
     pnpm install --frozen-lockfile && \
     rm -rf /home/appuser/.pnpm-store/*
@@ -44,4 +44,4 @@ ENV VITE_BYPASS_LOGIN=1 \
 EXPOSE $PORT
 
 # Start the app in development mode
-CMD ["pnpm", "run", "start:podman"]
+CMD ["pnpm", "run", "start:podman"]

docs/podman.md

@@ -9,19 +9,13 @@
 1. `podman build -t pokerogue -f Dockerfile .`
 2. `podman create --name temp-pokerogue localhost/pokerogue`
 3. `podman cp temp-pokerogue:/app/node_modules ./`
-4. `podman cp temp-pokerogue:/app/public/locales ./public/`
+4. `podman rm temp-pokerogue`
-5. `podman rm temp-pokerogue`
+5. `podman run --rm -p 8000:8000 -v $(pwd):/app:Z --userns=keep-id -u $(id -u):$(id -g) localhost/pokerogue`
-6. `podman run --rm -p 8000:8000 -v $(pwd):/app:Z --userns=keep-id -u $(id -u):$(id -g) localhost/pokerogue`
+6. Visit `http://localhost:8000/`
-7. Visit `http://localhost:8000/`
 
 Note: 
 
 1. Steps 2,3,4 are required because mounting working directory without installed `node_modules/` locally will be empty,
 this way we prevent it by copying them from the container itself to local directory
 
-2. `podman run` may take a couple of minutes to mount the working directory
+2. `podman run` may take a couple of minutes to mount the working directory
-
-### Running tests inside container
-
-1. `podman run --rm -p 8000:8000 -v $(pwd):/app:Z --userns=keep-id -u $(id -u):$(id -g) localhost/pokerogue2 pnpm test:silent
-`