masq
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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:
zvecr 2019-03-17 17:36:59 +00:00 committed by Drashna Jaelre
parent f9f0a31904
commit d8df01ca5e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -1,4 +1,4 @@
FROM debian FROM debian:9
RUN apt-get update && apt-get install --no-install-recommends -y \ RUN apt-get update && apt-get install --no-install-recommends -y \
avr-libc \ avr-libc \

4
Vagrantfile vendored
View File

@ -6,7 +6,7 @@ Vagrant.configure(2) do |config|
config.vm.define "qmk_firmware" config.vm.define "qmk_firmware"
# VMware/Virtualbox ( and also Hyperv/Parallels) 64 bit # 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 # This section allows you to customize the Virtualbox VM
# settings, ie showing the GUI or upping the memory # 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 . # image, you'll need to: chmod -R a+rw .
config.vm.provider "docker" do |docker, override| config.vm.provider "docker" do |docker, override|
override.vm.box = nil override.vm.box = nil
docker.image = "jesselang/debian-vagrant:jessie" docker.image = "jesselang/debian-vagrant:stretch"
docker.has_ssh = true docker.has_ssh = true
end end