From 3bff41ac8e125cd91e4f854565c42bf967ce43e7 Mon Sep 17 00:00:00 2001 From: Karl Mutch Date: Tue, 8 Jun 2021 20:27:09 -0700 Subject: [PATCH] Fixes #401 Stack refresh --- Dockerfile_developer | 9 ++++----- Dockerfile_stack | 14 ++++++-------- cmd/runner/Dockerfile.stock | 20 +++++++------------- internal/runner/pythonenv.go | 6 +++--- licenses.manifest | 17 ++++++++++------- 5 files changed, 30 insertions(+), 36 deletions(-) diff --git a/Dockerfile_developer b/Dockerfile_developer index 8ddfa7355..b2781784c 100644 --- a/Dockerfile_developer +++ b/Dockerfile_developer @@ -30,12 +30,11 @@ ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/nvidia:/usr/lib/nvidia-${NVIDIA_VE RUN \ curl https://pyenv.run | /bin/bash && \ - export PATH=$HOME/.pyenv/bin:$PATH && \ + echo "eval \"\$(pyenv init --path)\"" >> $HOME/.bashrc && \ echo "eval \"\$(pyenv init -)\"" >> $HOME/.bashrc && \ - echo "export PATH=\"$(pyenv root)/shims:$HOME/.pyenv/bin:$PATH\"" >> $HOME/.bashrc && \ echo "eval \"\$(pyenv virtualenv-init -)\"" >> $HOME/.bashrc && \ + eval "$(pyenv init --path)" && \ eval "$(pyenv init -)" && \ - export PATH=$(pyenv root)/shims:$PATH && \ eval "$(pyenv virtualenv-init -)" && \ pyenv install --list | grep " 3\.[89]" && \ pyenv install 3.8.10 && \ @@ -43,11 +42,11 @@ RUN \ pyenv global 3.8.10 RUN \ + eval "$(pyenv init --path)" && \ eval "$(pyenv init -)" && \ - export PATH=$(pyenv root)/shims:$PATH && \ eval "$(pyenv virtualenv-init -)" && \ curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && \ - python3 get-pip.py pip==20.1 setuptools==44.0.0 wheel==0.33.6 && \ + python3 get-pip.py pip==20.1 setuptools==44.0.0 wheel==0.35.1 && \ pip3 install pyopenssl cryptography --upgrade ENV GO_VERSION 1.16.5 diff --git a/Dockerfile_stack b/Dockerfile_stack index 01beb66db..f19a6e949 100644 --- a/Dockerfile_stack +++ b/Dockerfile_stack @@ -29,36 +29,34 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ RUN \ curl https://pyenv.run | /bin/bash && \ - export PATH=$HOME/.pyenv/bin:$PATH && \ - echo "export PATH=\"$HOME/.pyenv/bin:$PATH\"" >> $HOME/.bashrc && \ echo "eval \"\$(pyenv init --path)\"" >> $HOME/.bashrc && \ + echo "eval \"\$(pyenv init -)\"" >> $HOME/.bashrc && \ echo "eval \"\$(pyenv virtualenv-init -)\"" >> $HOME/.bashrc && \ eval "$(pyenv init --path)" && \ + eval "$(pyenv init -)" && \ eval "$(pyenv virtualenv-init -)" && \ pyenv install --list | grep " 3\.[56789]" && \ pyenv install 3.9.5 && \ pyenv install 3.8.10 && \ pyenv install 3.7.9 && \ - pyenv install 3.6.13 && \ - pyenv install 3.5.9 && \ pyenv global 3.8.10 -ENV PATH /root/.pyenv/bin:$PATH - RUN \ eval "$(pyenv init --path)" && \ + eval "$(pyenv init -)" && \ eval "$(pyenv virtualenv-init -)" && \ which python3 && \ which pip3 && \ curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && \ - python3 get-pip.py pip==21.1.2 setuptools==44.0.0 wheel==0.33.6 && \ + python3 get-pip.py pip==20.1 setuptools==44.0.0 wheel==0.35.1 && \ pip3 install pyopenssl cryptography --upgrade RUN apt-get -y install libssl-dev libcurl4-openssl-dev libsm6 libxrender-dev libxext-dev libopenblas-base libopenblas-dev && \ eval "$(pyenv init --path)" && \ + eval "$(pyenv init -)" && \ eval "$(pyenv virtualenv-init -)" && \ python3 -m pip install tensorflow-gpu==2.3.0 && \ - python3 -m pip install tensorflow-gpu==2.4.0 && \ + python3 -m pip install tensorflow-gpu==2.4.1 && \ python3 -m pip install tensorflow-gpu==2.5.0 && \ apt-get clean diff --git a/cmd/runner/Dockerfile.stock b/cmd/runner/Dockerfile.stock index 093ba5c4f..c8fd61c36 100644 --- a/cmd/runner/Dockerfile.stock +++ b/cmd/runner/Dockerfile.stock @@ -50,39 +50,33 @@ ENV PATH $HOME/.pyenv/bin:$PATH RUN apt-get install -y --no-install-recommends git && \ curl https://pyenv.run | /bin/bash && \ - export PATH=$HOME/.pyenv/bin:$PATH && \ - echo "export PATH=\"$HOME/.pyenv/bin:$PATH\"" >> $HOME/.bashrc && \ + echo "eval \"\$(pyenv init --path)\"" >> $HOME/.bashrc && \ echo "eval \"\$(pyenv init -)\"" >> $HOME/.bashrc && \ echo "eval \"\$(pyenv virtualenv-init -)\"" >> $HOME/.bashrc && \ + eval "$(pyenv init --path)" && \ eval "$(pyenv init -)" && \ - export PATH=$(pyenv root)/shims:$PATH && \ - which python3 && \ eval "$(pyenv virtualenv-init -)" && \ pyenv install --list | grep " 3\.[56789]" && \ pyenv install 3.9.5 && \ pyenv install 3.8.10 && \ pyenv install 3.7.9 && \ - pyenv install 3.6.13 && \ - pyenv install 3.5.9 && \ pyenv global 3.8.10 RUN \ + eval "$(pyenv init --path)" && \ eval "$(pyenv init -)" && \ - export PATH=$(pyenv root)/shims:$PATH && \ - which python3 && \ eval "$(pyenv virtualenv-init -)" && \ curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && \ - python3 get-pip.py pip==21.1.1 setuptools wheel + python3 get-pip.py pip==20.1 setuptools==44.0.0 wheel==0.35.1 RUN \ + eval "$(pyenv init --path)" && \ eval "$(pyenv init -)" && \ - export PATH=$(pyenv root)/shims:$PATH && \ - which python3 && \ eval "$(pyenv virtualenv-init -)" && \ + python3 -m pip install virtualenv && \ python3 -m pip install tensorflow-gpu==2.3.0 && \ - python3 -m pip install tensorflow-gpu==2.4.0 && \ + python3 -m pip install tensorflow-gpu==2.4.1 && \ python3 -m pip install tensorflow-gpu==2.5.0 && \ - python3 -m pip install virtualenv==15.2.0 --force-reinstall && \ python3 -m pip install opencv-python-headless && \ apt-get clean diff --git a/internal/runner/pythonenv.go b/internal/runner/pythonenv.go index fd38b58fb..a8825a1c3 100644 --- a/internal/runner/pythonenv.go +++ b/internal/runner/pythonenv.go @@ -248,7 +248,7 @@ function fail { trap 'fail "The execution was aborted because a command exited with an error status code."' ERR function retry { - local n=1 + local n=0 local max=3 local delay=10 while true; do @@ -293,15 +293,15 @@ for i in ${arr[@]} ; do echo $PYENV_VERSION fi done -eval "$(pyenv init -)" eval "$(pyenv init --path)" +eval "$(pyenv init -)" eval "$(pyenv virtualenv-init -)" pyenv doctor pyenv virtualenv-delete -f studioml-{{.E.ExprSubDir}} || true pyenv virtualenv $PYENV_VERSION studioml-{{.E.ExprSubDir}} pyenv activate studioml-{{.E.ExprSubDir}} set +e -retry python3 -m pip install "pip==21.1.1" +retry python3 -m pip install "pip==20.1" "setuptools==44.0.0" "wheel==0.35.1" python3 -m pip freeze --all {{if .StudioPIP}} retry python3 -m pip install -I {{.StudioPIP}} diff --git a/licenses.manifest b/licenses.manifest index 397fd562c..bc87450ba 100644 --- a/licenses.manifest +++ b/licenses.manifest @@ -1,12 +1,12 @@ .,ECL-2.0,0.7848921 docs/slides,MIT-0,0.8050314 -docs/slides/lib/font/source-sans-pro,OFL-1.0,0.757377 +docs/slides/lib/font/source-sans-pro,OFL-1.0-no-RFN,0.757377 examples/aws/aws,OpenSSL,0.7797131 examples/aws/aws/dist/cryptography-2.8-py3.7.egg-info,BSD-3-Clause-Clear,0.83412325 -examples/aws/cpu,deprecated_GPL-2.0-with-bison-exception,0.33333334 -examples/docker,deprecated_GPL-2.0-with-autoconf-exception,0.33333334 +examples/aws/cpu,deprecated_GPL-2.0-with-classpath-exception,0.33333334 +examples/docker,CC-BY-NC-SA-2.0,0.33333334 examples/local,deprecated_GPL-2.0-with-font-exception,0.33333334 -tools/serving-bridge,MPL-2.0-no-copyleft-exception,0.33333334 +tools/serving-bridge,CC-BY-NC-SA-2.0,0.33333334 vendor/cloud.google.com/go,SHL-0.5,0.85278857 vendor/github.com/Azure/go-autorest,ECL-2.0,0.83882034 vendor/github.com/Azure/go-autorest/autorest,ECL-2.0,0.83882034 @@ -110,7 +110,7 @@ vendor/github.com/mholt/archiver/v3,MIT-0,0.8148148 vendor/github.com/michaelklishin/rabbit-hole/v2,BSD-2-Clause-NetBSD,0.9076087 vendor/github.com/minio/madmin-go,SHL-0.5,0.85278857 vendor/github.com/minio/md5-simd,SHL-0.5,0.85278857 -vendor/github.com/minio/minio,AGPL-3.0-or-later,0.98848265 +vendor/github.com/minio/minio,AGPL-3.0-only,0.98848265 vendor/github.com/minio/minio-go/v7,SHL-0.5,0.85278857 vendor/github.com/minio/sha256-simd,SHL-0.5,0.85278857 vendor/github.com/mitchellh/copystructure,MIT-0,0.81595093 @@ -131,7 +131,7 @@ vendor/github.com/pkg/errors,BSD-2-Clause-NetBSD,0.9076087 vendor/github.com/prometheus/client_golang,SHL-0.5,0.85278857 vendor/github.com/prometheus/client_model,SHL-0.5,0.85278857 vendor/github.com/prometheus/common,SHL-0.5,0.85278857 -vendor/github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg,Nokia,0.33333334 +vendor/github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg,OSL-1.1,0.33333334 vendor/github.com/prometheus/procfs,SHL-0.5,0.85278857 vendor/github.com/prometheus/prom2json,SHL-0.5,0.85278857 vendor/github.com/rs/xid,MIT-0,0.8125 @@ -186,7 +186,10 @@ vendor/k8s.io/client-go,SHL-0.5,0.85278857 vendor/k8s.io/klog/v2,SHL-0.5,0.8657289 vendor/k8s.io/utils,SHL-0.5,0.85278857 vendor/sigs.k8s.io/structured-merge-diff/v4,SHL-0.5,0.85214007 -D-3-Clause,0.9306931 +,SHL-0.5,0.85214007 +214007 +.5,0.85214007 +e,0.9306931 src/github.com/golang/dep/vendor/github.com/pelletier/go-toml,MIT-0,0.81595093 vendor/github.com/Masterminds/sprig,MIT-0,0.8136646 vendor/github.com/awnumar/memcall,SHL-0.5,0.85214007