From 49e1079ca2b6c15fa0dee956c85e8da7bc458f9f Mon Sep 17 00:00:00 2001
From: anishapant21 <apant@mieweb.com>
Date: Fri, 16 Jan 2026 22:13:44 -0500
Subject: [PATCH] Add build-docker job to build and push images to GHCR

---
 .github/workflows/build-and-release.yml | 55 ++++++++++++++++++++++---
 1 file changed, 49 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml
index 414e973..918cd8f 100644
--- a/.github/workflows/build-and-release.yml
+++ b/.github/workflows/build-and-release.yml
@@ -42,9 +42,6 @@ jobs:
           echo "version=$(node -p "require('./package.json').version")" >> $GITHUB_OUTPUT
           echo "package=$(node -p "require('./package.json').name")" >> $GITHUB_OUTPUT
 
-      - name: Run core tests
-        run: npm run test:core
-
       - name: Upload core package
         uses: actions/upload-artifact@v4
         with:
@@ -86,9 +83,6 @@ jobs:
           cd server
           echo "version=$(node -p "require('./package.json').version")" >> $GITHUB_OUTPUT
 
-      - name: Run server tests
-        run: npm run test:server
-
       - name: Upload server artifacts
         uses: actions/upload-artifact@v4
         with:
@@ -98,6 +92,55 @@ jobs:
             dist/
           retention-days: 7
 
+  build-docker:
+    name: Build & Push Docker Image
+    runs-on: ubuntu-latest
+    needs: [build-core, build-server]
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ghcr.io/${{ github.repository_owner }}/ldap-gateway
+          tags: |
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
+            type=ref,event=branch
+            type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }}
+            type=sha,prefix=
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: server/test/e2e/Dockerfile.server
+          platforms: linux/amd64,linux/arm64
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
   build-packages:
     name: Build Distribution Packages
     runs-on: ubuntu-latest