Merge pull request #25 from deadsnakes/buildx-cache

try out buildx cache

.github/workflows/main.yml

@@ -1,18 +1,18 @@
 on:
   pull_request:
-    paths: [dockerfiles/*]
+    paths: [dockerfiles/*, .github/workflows/main.yml]
   push:
     branches: [main]
-    paths: [dockerfiles/*]
+    paths: [dockerfiles/*, .github/workflows/main.yml]
 
 jobs:
   main:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    - run: bin/docker-build
-    - run: bin/docker-push
+    - run: docker login --user '${{ github.actor }}' --password-stdin ghcr.io <<< "$GHCR_TOKEN"
       env:
-        GHCR_USER: ${{ github.actor }}
         GHCR_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       if: github.event_name != 'pull_request'
+    - run: docker buildx create --driver docker-container --use
+    - run: python3 -uS bin/docker-build --event ${{ github.event_name }}

bin/docker-build

@@ -1,25 +1,34 @@
 #!/usr/bin/env python3
 from __future__ import annotations
 
+import argparse
 import os.path
 import subprocess
 
 
 def main() -> int:
+    parser = argparse.ArgumentParser()
+    parser.add_argument('--event', default='pull_request')
+    args = parser.parse_args()
+
     for filename in os.listdir('dockerfiles'):
         _, name = filename.split('.')
         tag = f'ghcr.io/deadsnakes/{name}:latest'
+        tag_cache = f'{tag}-cache'
         print(f' {tag} '.center(79, '='), flush=True)
 
-        # allow pre-pull to fail
-        pre_pull_ret = subprocess.call(('docker', 'pull', tag))
+        if args.event == 'push':
+            extra: tuple[str, ...] = ('--cache-to', tag_cache, '--push')
+        else:
+            extra = ()
 
         with open(os.path.join('dockerfiles', filename), 'rb') as f:
             cmd = (
-                'docker', 'build',
+                'docker', 'buildx', 'build',
                 '--pull',
-                *(('--cache-from', tag) if pre_pull_ret == 0 else ()),
+                '--cache-from', tag_cache,
                 '--tag', tag,
+                *extra,
                 '-',
             )
             subprocess.check_call(cmd, stdin=f)