Merge branch 'dev'

Author: agjohnson

14.04/Dockerfile

@@ -1,6 +1,7 @@
 # Read the Docs - Environment base
 FROM ubuntu:16.04
 MAINTAINER Read the Docs <[email protected]>
+LABEL version="latest"
 
 ENV DEBIAN_FRONTEND noninteractive
 ENV APPDIR /app

16.04/Dockerfile

@@ -3,29 +3,32 @@ Read the Docs - Docker Images
 =============================
 
 These are the Docker image definitions used by the Read the Docs build
-environments to encapsulate the build process. Our supported image used for
-basic builds on our community site is ``readthedocs/build:14.04``.
+environments to encapsulate the build process.
 
-You can find these images on Docker Hub, on the `readthedocs/build`_ repository.
+You can find these images on Docker Hub, on the `readthedocs/build`_
+repositoryr:
+
+* `readthedocs/build:1.0` - Ubuntu 14.04 based image
+* `readthedocs/build:1.0-dotnet` - Ubuntu 14.04 based image, plus .NET
+* `readthedocs/build:2.0` - Ubuntu 16.04 based image
+* `readthedocs/build:latest` - Latest development image
 
 .. _readthedocs/build: https://hub.docker.com/r/readthedocs/build/
 
-Installing
-----------
+Usage
+-----
 
-To use these images, simply load them into your Docker instance::
+To use these images, you can pull from Docker Hub:
 
-    make
+    docker pull readthedocs/build:latest
 
-Or install manually::
+You can also compile these images manually:
 
-    docker build -t readthedocs/build:14.04 14.04/
-    docker build -t readthedocs/build:14.04-advanced 14.04-advanced/
-    docker build -t readthedocs/build:16.04 16.04/
+    docker build -t readthedocs/build:latest .
 
 Push to Docker Hub
 ------------------
 
 To push to Docker Hub::
 
-    make push
+    docker push readthedocs/build:latest

beta/Dockerfile renamed to Dockerfile

@@ -3,7 +3,7 @@
 # This image is for resource-intensive toolchains and and build tools with
 # special requirements
 
-FROM readthedocs/build:14.04
+FROM readthedocs/build:latest
 MAINTAINER Read the Docs <[email protected]>
 
 # .NET support - Mono, DNVM, and docfx installation