diff options
| author | Zach White <skullydazed@gmail.com> | 2021-08-29 16:41:56 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-29 16:41:56 -0700 |
| commit | b705020dafd0aa7531d03cd8fa64260684a3fb79 (patch) | |
| tree | 81957f7a08a583e39f80ae4c49b61e68e7a18fb7 /util | |
| parent | 13a2da973f182f238d1e27bd9da6f98173dad026 (diff) | |
| download | qmk_firmware-b705020dafd0aa7531d03cd8fa64260684a3fb79.tar.gz qmk_firmware-b705020dafd0aa7531d03cd8fa64260684a3fb79.zip | |
move everything from qmkfm/base_container to qmkfm/qmk_cli (#14230)
Diffstat (limited to 'util')
| -rwxr-xr-x | util/docker_build.sh | 2 | ||||
| -rw-r--r-- | util/vagrant/Dockerfile | 2 | ||||
| -rw-r--r-- | util/vagrant/readme.md | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/util/docker_build.sh b/util/docker_build.sh index 2b109be76d..8a6b2d0565 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/base_container \ + qmkfm/qmk_cli \ make "$keyboard${keymap:+:$keymap}${target:+:$target}" diff --git a/util/vagrant/Dockerfile b/util/vagrant/Dockerfile index 1936ee023a..951d4fc40d 100644 --- a/util/vagrant/Dockerfile +++ b/util/vagrant/Dockerfile @@ -1,4 +1,4 @@ -FROM qmkfm/base_container +FROM qmkfm/qmk_cli # Basic upgrades; install sudo and SSH. RUN apt-get update && apt-get install --no-install-recommends -y \ diff --git a/util/vagrant/readme.md b/util/vagrant/readme.md index e4b870a642..a8396007ee 100644 --- a/util/vagrant/readme.md +++ b/util/vagrant/readme.md @@ -1,7 +1,7 @@ # QMK Vagrant Utilities ## Dockerfile -Vagrant-friendly `qmkfm/base_container`. +Vagrant-friendly `qmkfm/qmk_cli`. In order for the Docker provider and `vagrant ssh` to function the container has a few extra requirements. |