diff options
| author | zvecr <git@zvecr.com> | 2019-03-17 17:36:59 +0000 |
|---|---|---|
| committer | Drashna Jaelre <drashna@live.com> | 2019-03-17 10:36:59 -0700 |
| commit | d8df01ca5e43b6322ba2ef5c7613a871ce69282c (patch) | |
| tree | 43bd905d786971cac2827218219d7403ba84ec3d | |
| parent | f9f0a31904d937fea625d1ee523138cb5733c800 (diff) | |
Align docker and vagrant base images (#4905)
* Align docker and vagrant base images - update box to debian 9.6
* Align docker and vagrant base images - lock docker image to debian 9
* Align docker and vagrant base images - update vagrant docker to debian 9
| -rw-r--r-- | Dockerfile | 2 | ||||
| -rw-r--r-- | Vagrantfile | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Dockerfile b/Dockerfile index 8f78dc2bfe..6bd5acb335 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM debian +FROM debian:9 RUN apt-get update && apt-get install --no-install-recommends -y \ avr-libc \ diff --git a/Vagrantfile b/Vagrantfile index 5aa56bf2a7..2235d9c2ec 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -6,7 +6,7 @@ Vagrant.configure(2) do |config| config.vm.define "qmk_firmware" # VMware/Virtualbox ( and also Hyperv/Parallels) 64 bit - config.vm.box = "bento/ubuntu-16.04" + config.vm.box = "generic/debian9" # This section allows you to customize the Virtualbox VM # settings, ie showing the GUI or upping the memory @@ -55,7 +55,7 @@ Vagrant.configure(2) do |config| # image, you'll need to: chmod -R a+rw . config.vm.provider "docker" do |docker, override| override.vm.box = nil - docker.image = "jesselang/debian-vagrant:jessie" + docker.image = "jesselang/debian-vagrant:stretch" docker.has_ssh = true end |