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) | |
download | qmk_firmware-d8df01ca5e43b6322ba2ef5c7613a871ce69282c.tar.gz qmk_firmware-d8df01ca5e43b6322ba2ef5c7613a871ce69282c.zip |
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 8f78dc2bf..6bd5acb33 100644 --- a/Dockerfile +++ b/Dockerfile | |||
@@ -1,4 +1,4 @@ | |||
1 | FROM debian | 1 | FROM debian:9 |
2 | 2 | ||
3 | RUN apt-get update && apt-get install --no-install-recommends -y \ | 3 | RUN apt-get update && apt-get install --no-install-recommends -y \ |
4 | avr-libc \ | 4 | avr-libc \ |
diff --git a/Vagrantfile b/Vagrantfile index 5aa56bf2a..2235d9c2e 100644 --- a/Vagrantfile +++ b/Vagrantfile | |||
@@ -6,7 +6,7 @@ Vagrant.configure(2) do |config| | |||
6 | config.vm.define "qmk_firmware" | 6 | config.vm.define "qmk_firmware" |
7 | 7 | ||
8 | # VMware/Virtualbox ( and also Hyperv/Parallels) 64 bit | 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 | # This section allows you to customize the Virtualbox VM | 11 | # This section allows you to customize the Virtualbox VM |
12 | # settings, ie showing the GUI or upping the memory | 12 | # settings, ie showing the GUI or upping the memory |
@@ -55,7 +55,7 @@ Vagrant.configure(2) do |config| | |||
55 | # image, you'll need to: chmod -R a+rw . | 55 | # image, you'll need to: chmod -R a+rw . |
56 | config.vm.provider "docker" do |docker, override| | 56 | config.vm.provider "docker" do |docker, override| |
57 | override.vm.box = nil | 57 | override.vm.box = nil |
58 | docker.image = "jesselang/debian-vagrant:jessie" | 58 | docker.image = "jesselang/debian-vagrant:stretch" |
59 | docker.has_ssh = true | 59 | docker.has_ssh = true |
60 | end | 60 | end |
61 | 61 | ||