From 11e12ea8d5c367dac64fecf46393a61a7af2414d Mon Sep 17 00:00:00 2001 From: Dave Vigil Date: Tue, 15 Jul 2025 00:19:21 -0500 Subject: [PATCH] Fixing git workflow build --- .github/workflows/docker-build.yml | 2 +- .github/workflows/lint_and_compile.yml | 2 +- DOCKER_README.md | 4 +++- build.sh | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index e45ed64..6352423 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -26,7 +26,7 @@ jobs: submodules: recursive - name: Build Docker image - run: docker build -t qmk-builder . + run: docker build --load -t qmk-builder . - name: Build firmware run: | diff --git a/.github/workflows/lint_and_compile.yml b/.github/workflows/lint_and_compile.yml index a9b24ae..07d32de 100644 --- a/.github/workflows/lint_and_compile.yml +++ b/.github/workflows/lint_and_compile.yml @@ -4,7 +4,7 @@ jobs: lint-and-compile: runs-on: local container: - image: registry.home.dgvigil.dev/qmk-builder:latest + image: registry.home.dgvigil.dev/qmk-builder:v0.1 steps: - name: Check out repository code uses: actions/checkout@v4 diff --git a/DOCKER_README.md b/DOCKER_README.md index d2078b8..38807fe 100644 --- a/DOCKER_README.md +++ b/DOCKER_README.md @@ -22,9 +22,11 @@ This repository includes a custom Docker setup for building QMK firmware in CI/C ### Building the Docker Image ```bash -docker build -t qmk-builder . +docker build --load -t qmk-builder . ``` +**Note:** The `--load` flag is required to make the image available locally with newer Docker versions. + ### Building Firmware #### Using the build script: diff --git a/build.sh b/build.sh index fbddf3a..a6d6ced 100755 --- a/build.sh +++ b/build.sh @@ -12,7 +12,7 @@ echo "Building QMK firmware for user: $USER" # Build the Docker image if it doesn't exist if [[ "$(docker images -q qmk-builder 2> /dev/null)" == "" ]]; then echo "Building Docker image..." - docker build -t qmk-builder . + docker build --load -t qmk-builder . fi # Function to build a specific keyboard