Merge pull request #2595 from hlohaus/25Jan

Enable armv7 build, add timeout for installing packages
xtekky · Jan 24, 2025 · 439e70e · 439e70e
2 parents e634f82 + 39255fc
commit 439e70e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/.github/workflows/publish-workflow.yaml b/.github/workflows/publish-workflow.yaml
@@ -57,19 +57,19 @@ jobs:
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GHCR_PAT }}
 
-      # - name: Build and push armv7 image
-      #   uses: docker/build-push-action@v5
-      #   with:
-      #       context: .
-      #       file: docker/Dockerfile-armv7
-      #       platforms: linux/arm/v7
-      #       push: true
-      #       tags: |
-      #         hlohaus789/g4f:latest-armv7
-      #         hlohaus789/g4f:${{ github.ref_name }}-armv7
-      #       labels: ${{ steps.metadata.outputs.labels }}
-      #       build-args: |
-      #         G4F_VERSION=${{ github.ref_name }}
+      - name: Build and push armv7 image
+        uses: docker/build-push-action@v5
+        with:
+            context: .
+            file: docker/Dockerfile-armv7
+            platforms: linux/arm/v7
+            push: true
+            tags: |
+              hlohaus789/g4f:latest-armv7
+              hlohaus789/g4f:${{ github.ref_name }}-armv7
+            labels: ${{ steps.metadata.outputs.labels }}
+            build-args: |
+              G4F_VERSION=${{ github.ref_name }}
 
       - name: Build and push small images
         uses: docker/build-push-action@v5

diff --git a/docker/Dockerfile-armv7 b/docker/Dockerfile-armv7
@@ -49,7 +49,7 @@ RUN pip install --no-cache-dir -r requirements-min.txt \
     --global-option=build_ext \
     --global-option=-j8 \
     pydantic==${PYDANTIC_VERSION}
-RUN cat requirements-slim.txt | xargs -n 1 pip install --no-cache-dir || true 
+RUN cat requirements-slim.txt | xargs -n 1 timeout 5m pip install --no-cache-dir || true 
 
 # Remove build packages
 RUN pip uninstall --yes \