feat: add cache build and build args

ApeWorX · Aug 15, 2024 · 69e7270 · 69e7270
1 parent 963117a
commit 69e7270
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -53,6 +53,8 @@ jobs:
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}-slim
           labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=registry,ref=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:cache
+          cache-to: type=registry,ref=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:cache,mode=max
 
       - name: Build and push
         uses: docker/build-push-action@v4
@@ -62,5 +64,7 @@ jobs:
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-
-
+          cache-from: type=registry,ref=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:cache
+          cache-to: type=registry,ref=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:cache,mode=max
+          build-args: |
+            SLIM_IMAGE=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.meta.outputs.tags }}-slim
diff --git a/Dockerfile b/Dockerfile
@@ -2,8 +2,9 @@
 # See LICENSE in the project root for license information.
 #---------------------------------------------------------------------------------------------
 
+ARG SLIM_IMAGE
 ARG PYTHON_VERSION="3.11"
-FROM python:${PYTHON_VERSION} as builder
+FROM python:${PYTHON_VERSION} AS builder
 
 WORKDIR /wheels
 
@@ -16,7 +17,7 @@ COPY ./recommended-plugins.txt ./recommended-plugins.txt
 
 RUN pip wheel .[recommended-plugins] --wheel-dir=/wheels
 
-FROM ape:latest-slim
+FROM ${SLIM_IMAGE}
 
 USER root
 

diff --git a/Dockerfile.slim b/Dockerfile.slim
@@ -4,7 +4,7 @@
 
 ARG PYTHON_VERSION="3.11"
 
-FROM python:${PYTHON_VERSION} as builder
+FROM python:${PYTHON_VERSION} AS builder
 
 WORKDIR /wheels