Adapt to anaconda image updates

microsoft · Jul 30, 2019 · 1a4e873 · 1a4e873
1 parent 294ba01
commit 1a4e873
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/containers/azure-machine-learning-python-3/.devcontainer/Dockerfile b/containers/azure-machine-learning-python-3/.devcontainer/Dockerfile
@@ -19,6 +19,7 @@ RUN apt-get update \
         git \
         curl \
         procps \
+        iproute2 \
         apt-transport-https \
         ca-certificates \
         gnupg-agent \
@@ -33,7 +34,7 @@ RUN apt-get update \
     && apt-get install -y docker-ce-cli \
     #
     # Install pylint and Azure ML SDK
-    && pip install pylint azureml-sdk[notebooks,automl] 2>&1 \
+    && /opt/conda/bin/pip install pylint azureml-sdk[notebooks,automl] 2>&1 \
     #
     # Clean up
     && apt-get autoremove -y \

diff --git a/containers/python-3-anaconda/.devcontainer/Dockerfile b/containers/python-3-anaconda/.devcontainer/Dockerfile
@@ -17,13 +17,13 @@ RUN apt-get update \
     && apt-get -y install --no-install-recommends apt-utils 2>&1 \
     #
     # Verify git, process tools, lsb-release (common in install instructions for CLIs) installed
-    && apt-get -y install git procps lsb-release \
+    && apt-get -y install git procps iproute2 lsb-release \
     #
     # Install pylint
-    && pip install pylint \
+    && /opt/conda/bin/pip install pylint \
     #
     # Update Python environment based on environment.yml (if presenet)
-    && if [ -f "/tmp/conda-tmp/environment.yml" ]; then conda env update -n base -f /tmp/conda-tmp/environment.yml; fi \
+    && if [ -f "/tmp/conda-tmp/environment.yml" ]; then /opt/conda/bin/conda env update -n base -f /tmp/conda-tmp/environment.yml; fi \
     && rm -rf /tmp/conda-tmp \
     #
     # Clean up

diff --git a/containers/python-3-miniconda/.devcontainer/Dockerfile b/containers/python-3-miniconda/.devcontainer/Dockerfile
@@ -17,13 +17,13 @@ RUN apt-get update \
     && apt-get -y install --no-install-recommends apt-utils 2>&1 \
     #
     # Verify git, process tools, lsb-release (common in install instructions for CLIs) installed
-    && apt-get -y install git procps lsb-release \
+    && apt-get -y install git procps iproute2 lsb-release \
     #
     # Install pylint
-    && pip install pylint \
+    && /opt/conda/bin/pip install pylint \
     #
     # Update Python environment based on environment.yml (if presenet)
-    && if [ -f "/tmp/conda-tmp/environment.yml" ]; then conda env update -n base -f /tmp/conda-tmp/environment.yml; fi \
+    && if [ -f "/tmp/conda-tmp/environment.yml" ]; then /opt/conda/bin/conda env update -n base -f /tmp/conda-tmp/environment.yml; fi \
     && rm -rf /tmp/conda-tmp \
     #
     # Clean up