From 35ed8567fc7bbb9bf8b7fb87facd629047320459 Mon Sep 17 00:00:00 2001 From: Jean-Louis Fuchs Date: Mon, 25 Dec 2023 11:09:37 +0100 Subject: [PATCH] use buildx/inline cache --- .github/workflows/main.yml | 52 ++++++++++++++++++++++++++++++ .github/workflows/pull-request.yml | 32 ++++++++++++++++++ .github/workflows/testing.yml | 27 ---------------- Makefile | 16 ++++++--- compose/Dockerfile | 7 ++-- compose/setup/version | 1 + docker-compose.yml | 7 ---- 7 files changed, 101 insertions(+), 41 deletions(-) create mode 100644 .github/workflows/main.yml create mode 100644 .github/workflows/pull-request.yml delete mode 100644 .github/workflows/testing.yml create mode 100644 compose/setup/version diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000..bfe01da --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,52 @@ +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: Git clean + run: | + git clean -xdf + find compose/setup/ -type f | xargs sha1sum + + - 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 + load: true + tags: ghcr.io/adfinis/pyaptly/cache:latest + cache-from: type=registry,ref=ghcr.io/adfinis/pyaptly/cache:gha + cache-to: type=registry,ref=ghcr.io/adfinis/pyaptly/cache:gha,mode=max + + # Push and load do not work together so we push via docker + - name: Push container + run: | + docker push ghcr.io/adfinis/pyaptly/cache:latest + + - name: Run tests + run: | + echo testing diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml new file mode 100644 index 0000000..4c0f759 --- /dev/null +++ b/.github/workflows/pull-request.yml @@ -0,0 +1,32 @@ +name: Tests + +on: + pull_request: + branches: + - main + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - 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 + load: true + tags: ghcr.io/adfinis/pyaptly/cache:latest + cache-from: type=registry,ref=ghcr.io/adfinis/pyaptly/cache:gha + + - name: Run tests + run: | + echo testing diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml deleted file mode 100644 index e6e1f33..0000000 --- a/.github/workflows/testing.yml +++ /dev/null @@ -1,27 +0,0 @@ -name: Tests - -on: - push: - branches: - - main - pull_request: - branches: - - main - schedule: - - cron: "0 0 * * 0" - -jobs: - build: - runs-on: ubuntu-latest - - steps: - - name: Checkout code - uses: actions/checkout@v2 - - - name: Run build - run: | - make up push - - - name: Run tests - run: | - make test \ No newline at end of file diff --git a/Makefile b/Makefile index 592979c..740762c 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,10 @@ .DEFAULT_GOAL := help +CACHE_IMG = "ghcr.io/adfinis/pyaptly/cache:latest" + +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 @@ -7,14 +12,17 @@ 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: build +build: build ## Build the container in case you made changes + @docker compose build + .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: ## 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 diff --git a/compose/Dockerfile b/compose/Dockerfile index 9b20f4d..bf18a8d 100644 --- a/compose/Dockerfile +++ b/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", "--"] \ No newline at end of file +WORKDIR /source +ENTRYPOINT ["/usr/bin/tini", "--"] +CMD ["bash", "/setup/run"] \ No newline at end of file diff --git a/compose/setup/version b/compose/setup/version new file mode 100644 index 0000000..0cfbf08 --- /dev/null +++ b/compose/setup/version @@ -0,0 +1 @@ +2 diff --git a/docker-compose.yml b/docker-compose.yml index e90c033..dd7d501 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,13 +3,6 @@ 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