Merge branch 'master' of github.com:projecthorus/chasemapper

.github/workflows/container.yml

@@ -28,34 +28,20 @@ jobs:
       - name: Setup Buildx
         uses: docker/setup-buildx-action@v1
 
-      - name: Cache Layers
-        uses: actions/cache@v2
-        with:
-          path: /tmp/buildx-cache
-          key: buildx-cache-${{ github.sha }}
-          restore-keys: |
-            buildx-cache-
-
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v1
-        if: github.event_name != 'pull_request'
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and Push Images
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           context: .
           platforms: linux/amd64, linux/386, linux/arm64, linux/arm/v6, linux/arm/v7
-          cache-from: type=local,src=/tmp/buildx-cache
-          cache-to: type=local,dest=/tmp/buildx-cache-new,mode=max
+          cache-from: type=registry,ref=ghcr.io/${{ github.repository }}:buildcache
+          cache-to: type=registry,ref=ghcr.io/${{ github.repository }}:buildcache,mode=max
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-
-      - name: Move Cache
-        run: |
-          rm -rf /tmp/buildx-cache
-          mv /tmp/buildx-cache-new /tmp/buildx-cache

Dockerfile

@@ -8,15 +8,16 @@ RUN apt-get update && \
   apt-get upgrade -y && \
   apt-get install -y \
   cmake \
-  libgeos-dev && \
+  libgeos-dev \
+  libatlas-base-dev && \
   rm -rf /var/lib/apt/lists/*
 
 # Copy in requirements.txt.
 COPY requirements.txt /root/chasemapper/requirements.txt
 
 # Install Python packages.
 RUN pip3 --no-cache-dir install --user --no-warn-script-location \
-  --extra-index-url https://www.piwheels.org/simple \
+  --ignore-installed --no-binary numpy \
   -r /root/chasemapper/requirements.txt
 
 # Copy in chasemapper.