merge: ci/canonical-docker-build-1776997064

.github/workflows/build-ghcr.yaml

@@ -1,82 +1,24 @@
-name: Build and Push to GHCR
-
+name: Docker
 on:
-  push:
-    branches: [main]
-    tags: ["*"]
   workflow_dispatch:
-
-env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: hanzoai/sentry
-
+  push:
+    branches: [main, dev, test]
+    tags: ["*"]
+permissions:
+  contents: read
+  packages: write
 jobs:
-  build:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.11"
-
-      - name: Set up Node
-        uses: actions/setup-node@v4
-        with:
-          node-version: "20"
-
-      - name: Install Python build dependencies
-        run: |
-          pip install wheel setuptools
-          pip install -r requirements-base.txt
-
-      - name: Build Python wheel
-        run: |
-          python setup.py bdist_wheel
-          mkdir -p dist
-          pip freeze > dist/requirements-frozen.txt
-
-      - name: Build frontend
-        run: |
-          yarn install --frozen-lockfile
-          yarn build
-
-      - name: Log in to GHCR
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Extract metadata
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-          tags: |
-            type=ref,event=branch
-            type=semver,pattern={{version}}
-            type=sha
-            type=raw,value=latest,enable={{is_default_branch}}
-
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: self-hosted/Dockerfile
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          build-args: |
-            SOURCE_COMMIT=${{ github.sha }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+  docker:
+    uses: hanzoai/.github/.github/workflows/docker-build.yml@main
+    with:
+      image: ghcr.io/hanzoai/sentry
+      dockerfile: self-hosted/Dockerfile
+      pre-build-command: |
+        pip install wheel setuptools
+        pip install -r requirements-base.txt
+        python setup.py bdist_wheel
+        mkdir -p dist
+        pip freeze > dist/requirements-frozen.txt
+        yarn install --frozen-lockfile
+        yarn build
+    secrets: inherit

.github/workflows/docker-build.yml

@@ -1,30 +0,0 @@
-name: Docker Build
-on:
-  push:
-    branches: [main]
-  workflow_dispatch:
-
-env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: hanzoai/sentry
-
-jobs:
-  build:
-    runs-on: [self-hosted, hanzo]
-    permissions:
-      contents: read
-      packages: write
-    steps:
-      - uses: actions/checkout@v4
-      - uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - uses: docker/build-push-action@v5
-        with:
-          context: self-hosted
-          push: true
-          tags: |
-            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
-            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.sha }}

.github/workflows/workflow-sanity.yml

@@ -0,0 +1,7 @@
+name: Workflow Sanity
+on:
+  pull_request:
+    paths: ['.github/workflows/**']
+jobs:
+  sanity:
+    uses: hanzoai/.github/.github/workflows/workflow-sanity.yml@main