Fix docker build issue on arm64

icgood · Apr 27, 2024 · 33828ce · 33828ce
1 parent 3be6011
commit 33828ce
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 22 deletions.
diff --git a/.github/workflows/docker-publish.yml → .github/workflows/docker-build.yml b/.github/workflows/docker-publish.yml → .github/workflows/docker-build.yml
@@ -1,6 +1,8 @@
-name: docker-publish
+name: docker
 
 on:
+  pull_request:
+    branches: [ main ]
   push:
     branches: [ main ]
   release:
@@ -18,6 +20,7 @@ jobs:
         uses: docker/setup-buildx-action@v3
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
+        if: github.event_name != 'pull_request'
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -39,6 +42,6 @@ jobs:
           context: .
           file: ./docker/Dockerfile
           platforms: linux/amd64,linux/arm64
-          push: true
+          push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
diff --git a/.github/workflows/docker-check.yml b/.github/workflows/docker-check.yml
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -3,10 +3,10 @@ FROM python:3.11-alpine
 WORKDIR /pymap
 COPY . .
 
-RUN pip install -U pip hatch typing-extensions
+RUN apk add --no-cache py3-cffi py3-hatchling
 
-RUN apk --update add --virtual build-dependencies \
-    build-base python3-dev libffi-dev \
+RUN apk --update add --virtual build-dependencies python3-dev build-base \
+  && pip install hatch \
   && hatch env create docker \
   && apk del build-dependencies