From dee2ab55eb8086a41e0f76931f804a319f7744c8 Mon Sep 17 00:00:00 2001
From: Ian Rodney <ian.rodney@gmail.com>
Date: Thu, 3 Sep 2020 09:30:03 -0700
Subject: [PATCH] [docker] Use sh syntax and pull ray-deps (#10517)

---
 ci/travis/build-docker-images.sh | 3 +++
 docker/base-deps/Dockerfile      | 4 ++--
 docker/ray-deps/Dockerfile       | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ci/travis/build-docker-images.sh b/ci/travis/build-docker-images.sh
index 74c48a125..19a7368ec 100755
--- a/ci/travis/build-docker-images.sh
+++ b/ci/travis/build-docker-images.sh
@@ -52,6 +52,9 @@ build_or_pull_base_images() {
         done
 
     else
+        docker pull rayproject/ray-deps:latest
+        docker pull rayproject/ray-deps:latest-gpu
+        docker pull rayproject/base-deps:latest-gpu
         echo "Just pulling images"
     fi
 
diff --git a/docker/base-deps/Dockerfile b/docker/base-deps/Dockerfile
index 6d51be90b..67aa2ebe3 100644
--- a/docker/base-deps/Dockerfile
+++ b/docker/base-deps/Dockerfile
@@ -14,7 +14,7 @@ RUN apt-get update -y && apt-get upgrade -y \
         git \
         wget \
         cmake \
-        $(if [ "$AUTOSCALER" == "autoscaler" ]; then echo \
+        $(if [ "$AUTOSCALER" = "autoscaler" ]; then echo \
         tmux \
         screen \
         rsync \
@@ -43,7 +43,7 @@ RUN apt-get update -y && apt-get upgrade -y \
     # We install cmake temporarily to get psutil
     && apt-get autoremove -y cmake \
     # Either install kubectl or remove wget 
-    && (if [ "$AUTOSCALER" == "autoscaler" ]; \
+    && (if [ "$AUTOSCALER" = "autoscaler" ]; \
         then wget -O - -q https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - \
         && touch /etc/apt/sources.list.d/kubernetes.list \
         && echo "deb http://apt.kubernetes.io/ kubernetes-xenial main" | tee -a /etc/apt/sources.list.d/kubernetes.list \
diff --git a/docker/ray-deps/Dockerfile b/docker/ray-deps/Dockerfile
index da4596954..eaa9a04a1 100644
--- a/docker/ray-deps/Dockerfile
+++ b/docker/ray-deps/Dockerfile
@@ -8,7 +8,7 @@ ENV LC_ALL=C.UTF-8
 ENV LANG=C.UTF-8
 COPY $WHEEL_PATH .
 RUN $HOME/anaconda3/bin/pip --no-cache-dir install $(basename $WHEEL_PATH)[all] \
-    $(if [ "$AUTOSCALER" != "autoscaler" ]; then echo \
+    $(if [ "$AUTOSCALER" = "autoscaler" ]; then echo \
         "boto3==1.4.8" \
         "google-api-python-client==1.7.8" \
         "google-oauth" \