Skip to content

Commit

Permalink
use buildx/inline cache
Browse files Browse the repository at this point in the history
  • Loading branch information
Jean-Louis Fuchs committed Dec 25, 2023
1 parent a45c18c commit 3ed840b
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:

- name: Run build
run: |
make up push
make up
- name: Run tests
run: |
Expand Down
17 changes: 13 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,20 +1,29 @@
.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: 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: pull ## start and build container if needed
@docker buildx build \
--cache-to type=inline --cache-from type=registry,ref=$(CACHE_IMG) \
--build-arg BUILDKIT_INLINE_CACHE=1 \
-t $(CACHE_IMG) compose
@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
Expand Down
7 changes: 4 additions & 3 deletions compose/Dockerfile
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down Expand Up @@ -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"]
9 changes: 0 additions & 9 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 3ed840b

Please sign in to comment.