Merge pull request #253 from AngellusMortis/docker-arm

Build multi-platform images

.github/workflows/docker-release.yml

@@ -26,12 +26,16 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
       - name: Build and push Docker image
         uses: docker/build-push-action@v4
         with:
+          platforms: linux/amd64,linux/arm64
           push: true
           build-args: |
             VERSION=${{ github.ref_name }}

.github/workflows/test.yml

@@ -110,12 +110,16 @@ jobs:
     permissions:
       contents: read
     steps:
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
       - name: Build and push Docker image
         uses: docker/build-push-action@v4
         with:
+          platforms: linux/amd64,linux/arm64
           push: false
           build-args: |
             VERSION=${{ github.ref_name }}

Dockerfile

@@ -1,8 +1,6 @@
-FROM python:3.10-alpine3.17 AS base
+FROM python:3.10-slim-bullseye AS base
 LABEL org.opencontainers.image.source="https://github.com/DataDog/guarddog/"
 
-RUN --mount=type=cache,mode=0755,id=apk,target=/var/cache/apk \
-    apk add --update libgit2 libffi
 RUN addgroup --system --gid 1000 app \
     && adduser --system --shell /bin/bash --uid 1000 --ingroup app app
 
@@ -14,8 +12,6 @@ FROM base as builder
 # only copy source for build
 COPY . /app
 # install any build time deps + Python deps
-RUN --mount=type=cache,mode=0755,id=apk,target=/var/cache/apk \
-    apk add --update gcc musl-dev g++ libgit2-dev libffi-dev
 RUN --mount=type=cache,mode=0755,id=pip,target=/root/.cache/pip \
     # install python deps
     pip install --root-user-action=ignore -r requirements.txt \