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
This commit is contained in:
parent
f9f0a31904
commit
d8df01ca5e
@ -1,4 +1,4 @@
|
||||
FROM debian
|
||||
FROM debian:9
|
||||
|
||||
RUN apt-get update && apt-get install --no-install-recommends -y \
|
||||
avr-libc \
|
||||
|
4
Vagrantfile
vendored
4
Vagrantfile
vendored
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user