use buildx/inline cache

.github/workflows/main.yml

@@ -0,0 +1,27 @@
+name: Tests
+
+on:
+ push:
+ branches:
+ - main
+ schedule:
+ - cron: "0 0 * * 0"
+
+jobs:
+ build:
+ runs-on: ubuntu-latest
+
+ steps:
+ - name: Checkout code
+ uses: actions/checkout@v4
+
+ - name: Login to GitHub Container Registry
+ uses: docker/login-action@v3
+ with:
+ registry: ghcr.io
+ username: ${{ github.actor }}
+ password: ${{ secrets.GITHUB_TOKEN }}
+
+ - name: Run build
+ run: |
+ make build push

.github/workflows/pull-request.yml

@@ -0,0 +1,36 @@
+name: Tests
+
+on:
+ pull_request:
+ branches:
+ - main
+
+jobs:
+ build:
+ runs-on: ubuntu-latest
+
+ steps:
+ - name: Checkout code
+ uses: actions/checkout@v2
+
+ - name: Login to GitHub Container Registry
+ uses: docker/login-action@v3
+ with:
+ registry: ghcr.io
+ username: ${{ github.actor }}
+ password: ${{ secrets.GITHUB_TOKEN }}
+
+ - name: Set up Docker Buildx
+ uses: docker/setup-buildx-action@v3
+ with:
+ buildkitd-flags: --debug
+
+ - name: Build container
+ uses: docker/build-push-action@v5
+ with:
+ context: compose
+ push: false
+ tags: ghcr.io/adfinis/pyaptly/cache:latest
+ cache-from: type=gha
+ cache-to: type=gha,mode=max
+ build-args: BUILDKIT_INLINE_CACHE=1

Makefile

@@ -1,20 +1,41 @@
 .DEFAULT_GOAL := help
 
+CACHE_IMG = ghcr.io/adfinis/pyaptly/cache:latest
+
+BUILDER = d25260b82a6972131f7a2dd705b9383d417f457
+DOCKER_BUILDKIT = 1
+export DOCKER_BUILDKIT
+
 # Help target extracts the double-hash comments from the targets and shows them
 # in a convenient way. This allows us to easily document the user-facing Make
 # targets
 .PHONY: help
 help:
  @grep -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort -k 1,1 | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
 
+.PHONY: pull
+pull: ## pull docker build cache from registry
+ @docker pull $(CACHE_IMG)
+
+
+.PHONY: build
+build: ## build image using buildx
+ docker buildx create --name $(BUILDER) --use
+ docker buildx build \
+ --cache-from type=registry,ref=ghcr.io/adfinis/pyaptly/cache:latest \
+ --cache-to type=registry,ref=ghcr.io/adfinis/pyaptly/cache:latest,mode=max \
+ --load -t $(CACHE_IMG) compose
+ docker buildx stop $(BUILDER)
+ docker buildx rm $(BUILDER)
+
+
 .PHONY: up
-up: ## start and build container if needed
- #@docker pull ghcr.io/adfinis/pyaptly/cache:latest
- @DOCKER_BUILDKIT=1 docker compose up -d --build
+up: build ## start the container (cached)
+ @docker compose up -d
 
 .PHONY: push
 push: ## push docker build cache to registry
- @docker push ghcr.io/adfinis/pyaptly/cache:latest
+ @docker push $(CACHE_IMG)
 
 .PHONY: down
 down: ## stop and remove container 

compose/Dockerfile

@@ -1,5 +1,4 @@
-ARG DOCKER_IMAGE
-FROM $DOCKER_IMAGE
+FROM debian:bookworm-slim
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
  python3-toml \
@@ -32,4 +31,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 ADD setup /setup
 RUN /setup/setup
 ADD run /setup/run
-ENTRYPOINT ["/usr/bin/tini", "--"]
+WORKDIR /source
+ENTRYPOINT ["/usr/bin/tini", "--"]
+CMD ["bash", "/setup/run"]

compose/setup/version

@@ -0,0 +1 @@
+2

docker-compose.yml

@@ -2,14 +2,5 @@
 services:
  testing:
  image: ghcr.io/adfinis/pyaptly/cache:latest
- build:
- cache_from:
- - ghcr.io/adfinis/pyaptly/cache:latest
- context: compose
- args:
- BUILDKIT_INLINE_CACHE: 1
- DOCKER_IMAGE: debian:bookworm-slim
- working_dir: /source
- command: ["bash", "/setup/run"]
  volumes:
  - ./:/source