fix: cleanup client/server docker

Author: Wolftousen

.github/workflows/release.yml

@@ -73,9 +73,9 @@ jobs:
       - name: Build client
         run: npm run build --workspace=client
 
-  # Build and push Docker images
+  # Build and push Docker image
   docker:
-    name: Build and Push Docker Images
+    name: Build and Push Docker Image
     runs-on: ubuntu-latest
     needs: [build]
     if: github.event_name == 'push' && github.ref == 'refs/heads/main'
@@ -104,7 +104,7 @@ jobs:
           VERSION=$(node -p "require('./package.json').version")
           echo "version=$VERSION" >> $GITHUB_OUTPUT
 
-      - name: Extract metadata for Docker (combined image)
+      - name: Extract metadata for Docker
         id: meta
         uses: docker/metadata-action@v5
         with:
@@ -117,7 +117,7 @@ jobs:
             type=semver,pattern={{major}},value=${{ steps.package_version.outputs.version }}
             type=raw,value=latest,enable={{is_default_branch}}
 
-      - name: Build and push combined Docker image
+      - name: Build and push Docker image
         uses: docker/build-push-action@v5
         with:
           context: .
@@ -129,71 +129,10 @@ jobs:
           cache-to: type=gha,mode=max
           platforms: linux/amd64,linux/arm64
 
-      - name: Extract metadata for Server
-        id: meta_server
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-server
-          tags: |
-            type=ref,event=branch
-            type=sha,prefix={{branch}}-
-            type=semver,pattern={{version}},value=${{ steps.package_version.outputs.version }}
-            type=semver,pattern={{major}}.{{minor}},value=${{ steps.package_version.outputs.version }}
-            type=semver,pattern={{major}},value=${{ steps.package_version.outputs.version }}
-            type=raw,value=latest,enable={{is_default_branch}}
-
-      - name: Build and push Server Docker image
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: ./Dockerfile.server
-          push: true
-          tags: ${{ steps.meta_server.outputs.tags }}
-          labels: ${{ steps.meta_server.outputs.labels }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-          platforms: linux/amd64,linux/arm64
-
-      - name: Extract metadata for Client
-        id: meta_client
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-client
-          tags: |
-            type=ref,event=branch
-            type=sha,prefix={{branch}}-
-            type=semver,pattern={{version}},value=${{ steps.package_version.outputs.version }}
-            type=semver,pattern={{major}}.{{minor}},value=${{ steps.package_version.outputs.version }}
-            type=semver,pattern={{major}},value=${{ steps.package_version.outputs.version }}
-            type=raw,value=latest,enable={{is_default_branch}}
-
-      - name: Build and push Client Docker image
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: ./Dockerfile.client
-          push: true
-          tags: ${{ steps.meta_client.outputs.tags }}
-          labels: ${{ steps.meta_client.outputs.labels }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-          platforms: linux/amd64,linux/arm64
-
       - name: Generate image summary
         run: |
-          echo "## Docker Images Published 🚀" >> $GITHUB_STEP_SUMMARY
+          echo "## Docker Image Published 🚀" >> $GITHUB_STEP_SUMMARY
           echo "" >> $GITHUB_STEP_SUMMARY
-          echo "### Combined Image" >> $GITHUB_STEP_SUMMARY
           echo '```' >> $GITHUB_STEP_SUMMARY
           echo "${{ steps.meta.outputs.tags }}" >> $GITHUB_STEP_SUMMARY
           echo '```' >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-          echo "### Server Image" >> $GITHUB_STEP_SUMMARY
-          echo '```' >> $GITHUB_STEP_SUMMARY
-          echo "${{ steps.meta_server.outputs.tags }}" >> $GITHUB_STEP_SUMMARY
-          echo '```' >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-          echo "### Client Image" >> $GITHUB_STEP_SUMMARY
-          echo '```' >> $GITHUB_STEP_SUMMARY
-          echo "${{ steps.meta_client.outputs.tags }}" >> $GITHUB_STEP_SUMMARY
-          echo '```' >> $GITHUB_STEP_SUMMARY

CONTRIBUTING.md

@@ -177,7 +177,7 @@ Common scopes include:
 7. **Merge**
    - Once approved and CI passes, the PR will be merged
    - Semantic versioning will automatically determine the version bump
-   - Docker images will be built and published
+   - Docker image will be built and published
 
 ---
 
@@ -231,11 +231,9 @@ Versions are automatically determined from commit messages:
 
 ## Docker Images
 
-Docker images are automatically built and published to GitHub Container Registry on every merge to `main`:
+A Docker image is automatically built and published to GitHub Container Registry on every merge to `main`:
 
-- `ghcr.io/liatrio/planning-poker:latest` - Combined client + server
-- `ghcr.io/liatrio/planning-poker-server:latest` - Server only
-- `ghcr.io/liatrio/planning-poker-client:latest` - Client only
+- `ghcr.io/liatrio/planning-poker:latest`
 
 Images are tagged with:
 - `latest` - Most recent main build

Dockerfile

@@ -3,6 +3,9 @@
 
 FROM node:20-alpine AS builder
 
+# Install OpenSSL for Prisma
+RUN apk add --no-cache openssl
+
 WORKDIR /app
 
 # Copy package files including lockfile
@@ -28,19 +31,23 @@ RUN npm run build
 # Production stage
 FROM node:20-alpine
 
-# Install nginx
-RUN apk add --no-cache nginx
+# Install nginx and OpenSSL for Prisma
+RUN apk add --no-cache nginx openssl
 
 WORKDIR /app
 
 # Copy server package files and built code
 COPY --from=builder /app/server/package.json ./server/
 COPY --from=builder /app/server/dist ./server/dist
+COPY --from=builder /app/server/prisma ./server/prisma
 
 # Install only production dependencies for server
 WORKDIR /app/server
 RUN npm install --production
 
+# Generate Prisma client
+RUN npx prisma generate
+
 # Copy built client files to nginx html directory
 COPY --from=builder /app/client/dist /usr/share/nginx/html
 

Dockerfile.client

@@ -296,23 +296,17 @@ docker run -p 80:80 -e DATABASE_URL="..." ghcr.io/liatrio/planning-poker:latest
 
 Pre-built Docker images are available from GitHub Container Registry:
 
-**Combined (Client + Server)**
 ```bash
 docker pull ghcr.io/liatrio/planning-poker:latest
 docker pull ghcr.io/liatrio/planning-poker:1.0.0
 ```
 
-**Server Only**
-```bash
-docker pull ghcr.io/liatrio/planning-poker-server:latest
-docker pull ghcr.io/liatrio/planning-poker-server:1.0.0
-```
-
-**Client Only**
-```bash
-docker pull ghcr.io/liatrio/planning-poker-client:latest
-docker pull ghcr.io/liatrio/planning-poker-client:1.0.0
-```
+Images are tagged with:
+- `latest` - Most recent main build
+- `<version>` - Semantic version (e.g., `1.2.3`)
+- `<major>.<minor>` - Major + minor version (e.g., `1.2`)
+- `<major>` - Major version only (e.g., `1`)
+- `main-<sha>` - Git commit SHA
 
 Images are tagged with:
 - `latest` - Most recent build from main branch