diff options
| -rw-r--r-- | .github/workflows/api.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/ci_builds.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/cli.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/docs.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/format.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/format_push.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/lint.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/regen.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/regen_push.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/unit_test.yml | 2 | ||||
| -rw-r--r-- | Dockerfile | 6 | ||||
| -rw-r--r-- | docs/newbs_building_firmware_workflow.md | 2 | ||||
| -rwxr-xr-x | util/docker_build.sh | 2 | ||||
| -rwxr-xr-x | util/docker_cmd.sh | 2 |
14 files changed, 13 insertions, 19 deletions
diff --git a/.github/workflows/api.yml b/.github/workflows/api.yml index 2abfe696fd..38c1cfe506 100644 --- a/.github/workflows/api.yml +++ b/.github/workflows/api.yml @@ -19,7 +19,7 @@ on: jobs: api_data: runs-on: ubuntu-latest - container: qmkfm/qmk_cli + container: ghcr.io/qmk/qmk_cli # protect against those who work in their fork on 'important' branches if: github.repository == 'qmk/qmk_firmware' diff --git a/.github/workflows/ci_builds.yml b/.github/workflows/ci_builds.yml index e2bbd93497..787a73a808 100644 --- a/.github/workflows/ci_builds.yml +++ b/.github/workflows/ci_builds.yml @@ -22,7 +22,7 @@ jobs: keymap: [default, via] keyboard_folder: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z] - container: qmkfm/qmk_cli + container: ghcr.io/qmk/qmk_cli steps: - name: Disable safe.directory check diff --git a/.github/workflows/cli.yml b/.github/workflows/cli.yml index d98692e6d9..27bdcc562b 100644 --- a/.github/workflows/cli.yml +++ b/.github/workflows/cli.yml @@ -18,7 +18,7 @@ jobs: test: runs-on: ubuntu-latest - container: qmkfm/qmk_cli + container: ghcr.io/qmk/qmk_cli steps: - name: Disable safe.directory check diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 841573cf30..923dfc1c1b 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -17,7 +17,7 @@ on: jobs: generate: runs-on: ubuntu-latest - container: qmkfm/qmk_cli + container: ghcr.io/qmk/qmk_cli # protect against those who develop with their fork on master if: github.repository == 'qmk/qmk_firmware' diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml index 78aaae8a0e..8ecdf82059 100644 --- a/.github/workflows/format.yml +++ b/.github/workflows/format.yml @@ -19,7 +19,7 @@ jobs: lint: runs-on: ubuntu-latest - container: qmkfm/qmk_cli + container: ghcr.io/qmk/qmk_cli steps: - name: Disable safe.directory check diff --git a/.github/workflows/format_push.yml b/.github/workflows/format_push.yml index 26e9f4edfb..25655f33b7 100644 --- a/.github/workflows/format_push.yml +++ b/.github/workflows/format_push.yml @@ -13,7 +13,7 @@ jobs: lint: runs-on: ubuntu-latest - container: qmkfm/qmk_cli + container: ghcr.io/qmk/qmk_cli steps: - name: Disable safe.directory check diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 6b4e266bde..91932b323a 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -12,7 +12,7 @@ jobs: lint: runs-on: ubuntu-latest - container: qmkfm/qmk_cli + container: ghcr.io/qmk/qmk_cli steps: - name: Disable safe.directory check diff --git a/.github/workflows/regen.yml b/.github/workflows/regen.yml index f301000d55..a2b4ef2b93 100644 --- a/.github/workflows/regen.yml +++ b/.github/workflows/regen.yml @@ -13,7 +13,7 @@ jobs: regen: runs-on: ubuntu-latest - container: qmkfm/qmk_cli + container: ghcr.io/qmk/qmk_cli steps: - name: Disable safe.directory check diff --git a/.github/workflows/regen_push.yml b/.github/workflows/regen_push.yml index c56bc48a69..b8197263a6 100644 --- a/.github/workflows/regen_push.yml +++ b/.github/workflows/regen_push.yml @@ -13,7 +13,7 @@ jobs: regen: runs-on: ubuntu-latest - container: qmkfm/qmk_cli + container: ghcr.io/qmk/qmk_cli steps: - name: Disable safe.directory check diff --git a/.github/workflows/unit_test.yml b/.github/workflows/unit_test.yml index 75ed84177b..fb538d4f84 100644 --- a/.github/workflows/unit_test.yml +++ b/.github/workflows/unit_test.yml @@ -23,7 +23,7 @@ jobs: test: runs-on: ubuntu-latest - container: qmkfm/qmk_cli + container: ghcr.io/qmk/qmk_cli steps: - uses: actions/checkout@v3 diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index e283c8f98a..0000000000 --- a/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM qmkfm/qmk_cli - -VOLUME /qmk_firmware -WORKDIR /qmk_firmware - -CMD qmk compile -kb all -km default diff --git a/docs/newbs_building_firmware_workflow.md b/docs/newbs_building_firmware_workflow.md index e6895252aa..51ce304901 100644 --- a/docs/newbs_building_firmware_workflow.md +++ b/docs/newbs_building_firmware_workflow.md @@ -95,7 +95,7 @@ on: [push, workflow_dispatch] jobs: build: runs-on: ubuntu-latest - container: qmkfm/qmk_cli + container: ghcr.io/qmk/qmk_cli strategy: fail-fast: false matrix: diff --git a/util/docker_build.sh b/util/docker_build.sh index 8dce387320..828b5751af 100755 --- a/util/docker_build.sh +++ b/util/docker_build.sh @@ -81,5 +81,5 @@ fi -e ALT_GET_KEYBOARDS=true \ -e SKIP_GIT="$SKIP_GIT" \ -e MAKEFLAGS="$MAKEFLAGS" \ - qmkfm/qmk_cli \ + ghcr.io/qmk/qmk_cli \ make "$keyboard${keymap:+:$keymap}${target:+:$target}" diff --git a/util/docker_cmd.sh b/util/docker_cmd.sh index a179cef732..4a82890603 100755 --- a/util/docker_cmd.sh +++ b/util/docker_cmd.sh @@ -55,5 +55,5 @@ fi $uid_arg \ -w /qmk_firmware \ -v "$dir":/qmk_firmware \ - qmkfm/qmk_cli \ + ghcr.io/qmk/qmk_cli \ "$@" |