use buildx/inline cache

.github/workflows/testing.yml

@@ -20,7 +20,7 @@ jobs:
 
  - name: Run build
  run: |
- make up push
+ make up
 
  - name: Run tests
  run: |

Makefile

@@ -1,20 +1,35 @@
 .DEFAULT_GOAL := help
 
+CACHE_IMG = "ghcr.io/adfinis/pyaptly/cache:latest"
+
 # 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 cached container
+ @docker pull $(CACHE_IMG)
+
+.PHONY: build
+build: pull ## build the container if needed (cached)
+ docker buildx build \
+ --cache-to type=inline --cache-from type=registry,ref=$(CACHE_IMG) \
+ -t $(CACHE_IMG) compose
+
+.PHONY: build
+build-force: ## build the container (not cached)
+ @docker buildx build --cache-to type=inline -t $(CACHE_IMG) compose
+
 .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
+ @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"]

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