Update docker building (#961)

* Remove old entry and dependencies from Makefile * Update Dockerfiles to only COPY needed files for faster builds and better caching * Test the docker files getting built from the Makefile in CI
2026-03-14 22:11:33 -07:00
parent 0aea6b96ca
commit 6cc9ff7fc5
5 changed files with 41 additions and 50 deletions
@@ -130,44 +130,29 @@ jobs:
            scrutiny-web-*
            scrutiny-collector-metrics-*

-  build-docker:
+  makefile-docker-omnibus:
+    name: Build Docker Omnibus From Makefile
    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-
    steps:
-      - name: Checkout repository
+      - name: Checkout
        uses: actions/checkout@v6
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-        with:
-          platforms: 'arm64,arm'
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Build omnibus
-        uses: docker/build-push-action@v6
-        with:
-          platforms: linux/amd64,linux/arm64
-          context: .
-          file: docker/Dockerfile
-          push: false
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-      - name: Build collector
-        uses: docker/build-push-action@v6
-        with:
-          platforms: linux/amd64,linux/arm64,linux/arm/v7
-          context: .
-          file: docker/Dockerfile.collector
-          push: false
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-      - name: Build web
-        uses: docker/build-push-action@v6
-        with:
-          platforms: linux/amd64,linux/arm64,linux/arm/v7
-          context: .
-          file: docker/Dockerfile.web
-          push: false
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+      - name: Build
+        run: make docker-omnibus
+
+  makefile-docker-web:
+    name: Build Docker Web From Makefile
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+      - name: Build
+        run: make docker-web
+
+  makefile-docker-collector:
+    name: Build Docker Collector From Makefile
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+      - name: Build
+        run: make docker-collector