Browse Source

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
pjones-keymap
zvecr 3 months ago
parent
commit
d8df01ca5e
2 changed files with 3 additions and 3 deletions
  1. 1
    1
      Dockerfile
  2. 2
    2
      Vagrantfile

+ 1
- 1
Dockerfile View File

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

+ 2
- 2
Vagrantfile View File

@@ -6,7 +6,7 @@ Vagrant.configure(2) do |config|
6 6
   config.vm.define "qmk_firmware"
7 7
 
8 8
   # VMware/Virtualbox ( and also Hyperv/Parallels) 64 bit
9
-  config.vm.box = "bento/ubuntu-16.04"
9
+  config.vm.box = "generic/debian9"
10 10
 
11 11
   # This section allows you to customize the Virtualbox VM
12 12
   # settings, ie showing the GUI or upping the memory
@@ -55,7 +55,7 @@ Vagrant.configure(2) do |config|
55 55
   # image, you'll need to: chmod -R a+rw .
56 56
   config.vm.provider "docker" do |docker, override|
57 57
     override.vm.box = nil
58
-    docker.image = "jesselang/debian-vagrant:jessie"
58
+    docker.image = "jesselang/debian-vagrant:stretch"
59 59
     docker.has_ssh = true
60 60
   end
61 61
 

Loading…
Cancel
Save