From 0446263935e418537966bc64bfd1c1cdb5206583 Mon Sep 17 00:00:00 2001
From: Erik Dasque <erik@frenchguys.com>
Date: Fri, 15 Jul 2016 12:55:40 -0400
Subject: [PATCH 1/2] Adding Docker build system & documentation

---
 Dockerfile | 28 ++++++++++++++++++++++++++++
 readme.md  | 19 +++++++++++++++++++
 2 files changed, 47 insertions(+)
 create mode 100644 Dockerfile

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000000..96ace4ec6b
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,28 @@
+FROM debian:jessie
+MAINTAINER Erik Dasque <erik@frenchguys.com>
+
+RUN apt-get update
+RUN apt-get install --no-install-recommends -y build-essential \
+    gcc \
+    unzip \
+    wget \
+    zip \
+    gcc-avr \
+    binutils-avr \
+    avr-libc \
+    dfu-programmer \
+    dfu-util \
+    gcc-arm-none-eabi \
+    binutils-arm-none-eabi \
+    libnewlib-arm-none-eabi \
+    git
+
+RUN apt-get clean
+RUN rm -rf /var/lib/apt/lists/*
+
+ENV keyboard=ergodox_ez
+ENV keymap=default
+
+VOLUME /qmk
+WORKDIR /qmk
+CMD make clean ; make keyboard=${keyboard} keymap=${keymap}
\ No newline at end of file
diff --git a/readme.md b/readme.md
index e0dcd56088..7a970eea02 100644
--- a/readme.md
+++ b/readme.md
@@ -75,6 +75,25 @@ Debian/Ubuntu example:
     sudo apt-get update
     sudo apt-get install gcc-avr avr-libc dfu-programmer
 
+### Docker
+
+If this is a bit complex for you, Docker might be the turn-key solution you need. After installing [Docker](https://www.docker.com/products/docker), run the following commands at the root of the QMK folder:
+
+```bash
+# You only need to run this once, it'll take a little while
+
+docker build -t qmk .
+
+# and you'll run this every time you want to build a keymap
+# modify the keymap and keyboard assigment to compile what you want
+# defaults are ergodox_ez/default
+
+docker run -e keymap=gwen -e keyboard=ergodox_ez --rm -v $('pwd'):/qmk:rw qmk
+
+```
+
+This will compile the targetted keyboard/keymap and leave it in your QMK directory for you to flash.
+
 ### Vagrant
 If you have any problems building the firmware, you can try using a tool called Vagrant. It will set up a virtual computer with a known configuration that's ready-to-go for firmware building. OLKB does NOT host the files for this virtual computer. Details on how to set up Vagrant are in the [VAGRANT_GUIDE file](VAGRANT_GUIDE.md).
 

From aa2a79bbfa5e5134fc83daf5732ca4774edf2dc2 Mon Sep 17 00:00:00 2001
From: Erik Dasque <erik@frenchguys.com>
Date: Fri, 15 Jul 2016 13:26:34 -0400
Subject: [PATCH 2/2] Further simplyfying the docker usage

We'll be able to change the image user name if we set up the initial repo to trigger Docker images rebuilds on hub.docker.com
---
 readme.md | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/readme.md b/readme.md
index 7a970eea02..ecad173fa0 100644
--- a/readme.md
+++ b/readme.md
@@ -77,18 +77,14 @@ Debian/Ubuntu example:
 
 ### Docker
 
-If this is a bit complex for you, Docker might be the turn-key solution you need. After installing [Docker](https://www.docker.com/products/docker), run the following commands at the root of the QMK folder:
+If this is a bit complex for you, Docker might be the turn-key solution you need. After installing [Docker](https://www.docker.com/products/docker), run the following command at the root of the QMK folder to build a keyboard/keymap:
 
 ```bash
-# You only need to run this once, it'll take a little while
-
-docker build -t qmk .
-
-# and you'll run this every time you want to build a keymap
+# You'll run this every time you want to build a keymap
 # modify the keymap and keyboard assigment to compile what you want
 # defaults are ergodox_ez/default
 
-docker run -e keymap=gwen -e keyboard=ergodox_ez --rm -v $('pwd'):/qmk:rw qmk
+docker run -e keymap=gwen -e keyboard=ergodox_ez --rm -v $('pwd'):/qmk:rw edasque/qmk_firmware
 
 ```