Merge branch 'master' of https://github.com/tjprescott/azure-cli into FinishOutBlobCommandGroup

Dockerfile

@@ -1,32 +1,8 @@
-FROM ubuntu:15.10
-
-#install *-dev packages below so cryptography package can install
-RUN apt-get update -qq && \
-    apt-get install -qqy --no-install-recommends\
-      python3-pip \
-      vim \
-      jq \
-      build-essential \
-      libssl-dev \
-      libffi-dev \
-      python3-dev && \
-    rm -rf /var/lib/apt/lists/*
-
-ENV AZURECLITEMP /opt/azure-cli
-ENV PYTHONPATH $PYTHONPATH:$AZURECLITEMP/src
-ENV PATH $PATH:$AZURECLITEMP
-
-RUN mkdir -p $AZURECLITEMP
-COPY src $AZURECLITEMP/src
-COPY az.completion.sh $AZURECLITEMP/
-COPY requirements.txt $AZURECLITEMP/
-COPY az $AZURECLITEMP/
-
-RUN pip3 install -r $AZURECLITEMP/requirements.txt
-
-RUN chmod +x $AZURECLITEMP/az
+FROM ubuntu:14.04
+RUN apt-get update -qq
+# install *-dev packages below so cryptography package can install
+RUN apt-get install -qqy curl libssl-dev libffi-dev python3-dev
 RUN ln /usr/bin/python3 /usr/bin/python
-RUN echo "source $AZURECLITEMP/az.completion.sh" >> ~/.bashrc
-RUN az
-
-ENV EDITOR vim
+ENV AZURE_CLI_DISABLE_PROMPTS 1
+RUN curl http://azure-cli-nightly.cloudapp.net/install | bash
+CMD az

Dockerfile-2.7

@@ -1,35 +1,7 @@
 FROM ubuntu:14.04
-
-RUN apt-get update -qq && \
-    apt-get install -qqy --no-install-recommends\
-      build-essential \
-      curl \
-      ca-certificates \
-      python-pip \
-      libffi-dev \
-      libssl-dev \
-      python-dev \
-      vim \
-      jq && \
-    rm -rf /var/lib/apt/lists/* && \
-    pip install --upgrade requests && \
-    pip install cryptography && \
-    pip install pyopenssl ndg-httpsclient pyasn1
-
-ENV AZURECLITEMP /opt/azure-cli
-ENV PYTHONPATH $PYTHONPATH:$AZURECLITEMP/src
-ENV PATH $PATH:$AZURECLITEMP
-
-RUN mkdir -p $AZURECLITEMP
-COPY src $AZURECLITEMP/src
-COPY az.completion.sh $AZURECLITEMP/
-COPY requirements.txt $AZURECLITEMP/
-COPY az $AZURECLITEMP/
-
-RUN pip install -r $AZURECLITEMP/requirements.txt
-
-RUN chmod +x $AZURECLITEMP/az
-RUN echo "source $AZURECLITEMP/az.completion.sh" >> ~/.bashrc
-RUN az
-
-ENV EDITOR vim
+RUN apt-get update -qq
+# install *-dev packages below so cryptography package can install
+RUN apt-get install -qqy python-pip curl libssl-dev libffi-dev python-dev
+ENV AZURE_CLI_DISABLE_PROMPTS 1
+RUN curl http://azure-cli-nightly.cloudapp.net/install | bash
+CMD az

README.rst

@@ -20,7 +20,16 @@ To install via cURL on Linux, Unix and OS X, type:
 
 Note: This will install the latest nightly builds.
 
-If you get errors on install with cffi or cryptography such as the examples below,
+**Errors on install with cffi or cryptography:**
+
+If you get errors on install on **OS X**, upgrade pip by typing:
+
+.. code:: shell
+
+    pip install --upgrade --force-reinstall pip
+
+
+If you get errors on install on **Debian or Ubuntu** such as the examples below,
 install libssl-dev, libffi-dev and python3-dev by typing:
 
 .. code:: shell
@@ -34,7 +43,7 @@ install libssl-dev, libffi-dev and python3-dev by typing:
 .. code:: shell
 
     Downloading cffi-1.5.2.tar.gz (388kB)
-      100% |################################| 389kB 3.9MB/s 
+      100% |################################| 389kB 3.9MB/s
       Complete output from command python setup.py egg_info:
     
           No working compiler found, or bogus compiler options
@@ -55,6 +64,8 @@ install libssl-dev, libffi-dev and python3-dev by typing:
     
     Failed building wheel for cryptography
 
+`See Stack Overflow question - Failed to install Python Cryptography package with PIP and setup.py <http://stackoverflow.com/questions/22073516/failed-to-install-python-cryptography-package-with-pip-and-setup-py>`__
+
 
 Download Package
 ----------------