From f9efabe8a4f3fda6d58505c7c8d14324d4c44d86 Mon Sep 17 00:00:00 2001
From: tripdubroot <ian.philpot@microsoft.com>
Date: Wed, 5 Apr 2017 14:36:35 -0400
Subject: [PATCH] Moved into original files per PR comments

---
 Dockerfile            |  2 +-
 Dockerfile.mac        | 33 ---------------------------------
 docs/acsengine.md     |  1 -
 scripts/devenv.sh     |  1 -
 scripts/devenv_mac.sh | 13 -------------
 5 files changed, 1 insertion(+), 49 deletions(-)
 delete mode 100644 Dockerfile.mac
 delete mode 100755 scripts/devenv_mac.sh

diff --git a/Dockerfile b/Dockerfile
index e8fe96dd4..740428213 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@ ENV AZURE_CLI_VERSION 0.1.2rc1
 
 RUN apt-get update \
     && apt-get -y upgrade \
-    && apt-get -y install python-pip make build-essential curl openssl vim jq \
+    && apt-get -y install python-pip make build-essential curl openssl vim jq docker.io \
     && rm -rf /var/lib/apt/lists/*
 
 RUN mkdir /tmp/godeb \
diff --git a/Dockerfile.mac b/Dockerfile.mac
deleted file mode 100644
index 740428213..000000000
--- a/Dockerfile.mac
+++ /dev/null
@@ -1,33 +0,0 @@
-FROM buildpack-deps:xenial
-
-ENV GO_VERSION 1.8
-ENV KUBECTL_VERSION 1.5.3
-ENV AZURE_CLI_VERSION 0.1.2rc1
-
-RUN apt-get update \
-    && apt-get -y upgrade \
-    && apt-get -y install python-pip make build-essential curl openssl vim jq docker.io \
-    && rm -rf /var/lib/apt/lists/*
-
-RUN mkdir /tmp/godeb \
-    && curl "https://godeb.s3.amazonaws.com/godeb-amd64.tar.gz" > /tmp/godeb/godeb.tar.gz \
-    && (cd /tmp/godeb; tar zvxf godeb.tar.gz; ./godeb install "${GO_VERSION}") \
-    && rm -rf /tmp/godeb
-
-RUN pip install "azure-cli==${AZURE_CLI_VERSION}"
-
-RUN curl "https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl" > /usr/local/bin/kubectl \
-    && chmod +x /usr/local/bin/kubectl
-
-ENV GOPATH /gopath
-ENV PATH "${PATH}:${GOPATH}/bin"
-
-RUN git clone https://github.com/akesterson/cmdarg.git /tmp/cmdarg \
-    && cd /tmp/cmdarg && make install && rm -rf /tmp/cmdarg
-RUN git clone https://github.com/akesterson/shunit.git /tmp/shunit \
-    && cd /tmp/shunit && make install && rm -rf /tmp/shunit
-
-# Used by some CI jobs
-ADD ./test/bootstrap/checkout-pr.sh /tmp/checkout-pr.sh
-
-WORKDIR /gopath/src/github.com/Azure/acs-engine
diff --git a/docs/acsengine.md b/docs/acsengine.md
index 12172f3b5..4699653d0 100644
--- a/docs/acsengine.md
+++ b/docs/acsengine.md
@@ -7,7 +7,6 @@ The Azure Container Service Engine (`acs-engine`) generates ARM (Azure Resource
 The easiest way to get started developing on `acs-engine` is to use Docker. If you already have Docker or "Docker for {Windows,Mac}" then you can get started without needing to install anything extra.
 
 * Windows (PowerShell): `.\scripts\devenv.ps1`
-* OSX (bash): `./scripts/devenv.mac.sh`
 * Linux (bash): `./scripts/devenv.sh`
 
 This setup mounts the `acs-engine` source directory as a volume into the Docker container.
diff --git a/scripts/devenv.sh b/scripts/devenv.sh
index 1549b6322..8d3ae7038 100755
--- a/scripts/devenv.sh
+++ b/scripts/devenv.sh
@@ -8,7 +8,6 @@ docker build --pull -t acs-engine .
 docker run -it \
 	--privileged \
 	-v /var/run/docker.sock:/var/run/docker.sock \
-	-v $(which docker):/usr/bin/docker:ro \
 	-v `pwd`:/gopath/src/github.com/Azure/acs-engine \
 	-w /gopath/src/github.com/Azure/acs-engine \
 		acs-engine /bin/bash
diff --git a/scripts/devenv_mac.sh b/scripts/devenv_mac.sh
deleted file mode 100755
index f58c72135..000000000
--- a/scripts/devenv_mac.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-
-set -eu -o pipefail
-set -x
-
-docker build --pull -t acs-engine -f Dockerfile.mac
-
-docker run -it \
-	--privileged \
-	-v /var/run/docker.sock:/var/run/docker.sock \
-	-v `pwd`:/gopath/src/github.com/Azure/acs-engine \
-	-w /gopath/src/github.com/Azure/acs-engine \
-		acs-engine /bin/bash