[docker] Use sh syntax and pull ray-deps (#10517)

This commit is contained in:
Ian Rodney
2020-09-03 09:30:03 -07:00
committed by GitHub
parent 2bca5fd663
commit dee2ab55eb
3 changed files with 6 additions and 3 deletions
+3
View File
@@ -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
+2 -2
View File
@@ -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 \
+1 -1
View File
@@ -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" \