Revert to using Circleci's docker version, upgrade docker-compose, fixes

 #471 (#473)

* Revert to using Circleci's docker version, upgrade docker-compose, fixes #471

* Stop getting the new mysql signing key

* See what go version they're using

.circleci/circle_vm_setup.sh

@@ -1,30 +1,21 @@
 #!/usr/bin/env bash
 
 set -o errexit
+set -x
 
 # Basic tools
 
-# mysql - old key is expired, so get the new one
-sudo apt-key adv --keyserver pgp.mit.edu --recv-keys 5072E1F5 >/dev/null 2>&1
 sudo apt-get update -qq
 sudo apt-get install -qq mysql-client realpath zip
 
+go version
+
 # golang of the version we want
 sudo apt-get remove -qq golang &&
 wget -q -O /tmp/golang.tgz https://storage.googleapis.com/golang/go1.9.linux-amd64.tar.gz &&
 cd /tmp && tar -xf golang.tgz &&
 sudo rm -rf /usr/local/go && sudo mv go /usr/local
 
-# Docker setup
-sudo apt-get remove -qq docker docker-engine
-sudo apt-get update -qq
-sudo apt-get install -qq apt-transport-https ca-certificates  curl software-properties-common
-curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
-# Per docker docs, you always need the stable repository, even if you want to install edge builds as well.
-sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
-sudo apt-get update -qq
-sudo apt-get install -qq docker-ce=17.06.0~ce-0~ubuntu
-
 # docker-compose
-sudo curl -s -L "https://github.com/docker/compose/releases/download/1.14.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
+sudo curl -s -L "https://github.com/docker/compose/releases/download/1.16.1/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
 sudo chmod +x /usr/local/bin/docker-compose

.circleci/config.yml

@@ -2,7 +2,8 @@ version: 2
 jobs:
   # 'build' is the default build, the only one triggered automatically by github or anything else.
   normal_build_and_test:
-    machine: true
+    machine:
+      image: circleci/classic:201708-01
     working_directory: ~/go/src/github.com/drud/ddev
     environment:
       GOPATH: /home/circleci/go
@@ -47,7 +48,8 @@ jobs:
 
   # nightly is triggered only with nightly_build_trigger.sh
   nightly_build:
-    machine: true
+    machine:
+      image: circleci/classic:201708-01
     working_directory: ~/go/src/github.com/drud/ddev
     environment:
       DRUD_DEBUG: "true"
@@ -118,7 +120,8 @@ jobs:
 
   # 'tag_build' is used to build a tag for release.
   tag_build:
-    machine: true
+    machine:
+      image: circleci/classic:201708-01
     working_directory: ~/go/src/github.com/drud/ddev
     environment:
       DRUD_DEBUG: "true"