Skip to content

Commit

Permalink
Align docker and vagrant base images (qmk#4905)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
zvecr authored and drashna committed Mar 17, 2019
1 parent f9f0a31 commit d8df01c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian
FROM debian:9

RUN apt-get update && apt-get install --no-install-recommends -y \
avr-libc \
Expand Down
4 changes: 2 additions & 2 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down

0 comments on commit d8df01c

Please sign in to comment.