From 2dccb8e7702c9fba763f1312c00fd20b36adaa3f Mon Sep 17 00:00:00 2001 From: Ondrej Date: Tue, 11 May 2021 14:11:32 +0200 Subject: [PATCH] corrected 3rd party bins --- Dockerfile | 9 +-------- pyproject.toml | 6 +++--- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index b4241fbb83..2309585a1b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -47,10 +47,9 @@ RUN curl https://pyenv.run | bash ENV PYTHON_CONFIGURE_OPTS --enable-shared RUN echo 'export PATH="$HOME/.pyenv/bin:$PATH"'>> $HOME/.bashrc \ - && echo "alias pyhon3='python'" >> $HOME/.bashrc \ && echo 'eval "$(pyenv init -)"' >> $HOME/.bashrc \ && echo 'eval "$(pyenv virtualenv-init -)"' >> $HOME/.bashrc \ - && echo -e "eval \"$(pyenv init --path)\"\n$(cat $HOME/.profile)" > $HOME/.profile + && echo 'eval "$(pyenv init --path)"' >> $HOME/.bashrc RUN source $HOME/.bashrc && pyenv install ${OPENPYPE_PYTHON_VERSION} COPY . /opt/openpype/ @@ -67,18 +66,12 @@ RUN cd /opt/openpype \ && pyenv local ${OPENPYPE_PYTHON_VERSION} RUN source $HOME/.bashrc \ - cd /opt/openpype \ - && pyenv local ${OPENPYPE_PYTHON_VERSION} \ && ./tools/create_env.sh RUN source $HOME/.bashrc \ - cd /opt/openpype \ - && pyenv local ${OPENPYPE_PYTHON_VERSION} \ && ./tools/fetch_thirdparty_libs.sh RUN source $HOME/.bashrc \ - cd /opt/openpype \ - && pyenv local ${OPENPYPE_PYTHON_VERSION} \ && bash ./tools/build.sh RUN cd /opt/openpype \ diff --git a/pyproject.toml b/pyproject.toml index c874db34f8..1f78fe1fc3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -97,9 +97,9 @@ url = "https://distribute.openpype.io/thirdparty/oiio_tools-2.2.0-windows.zip" hash = "fd2e00278e01e85dcee7b4a6969d1a16f13016ec16700fb0366dbb1b1f3c37ad" [openpype.thirdparty.oiio.linux] -url = "https://distribute.openpype.io/thirdparty/oiio-2.2.0-linux.tgz" -hash = "sha256:..." +url = "https://distribute.openpype.io/thirdparty/oiio_tools-2.2.12-linux.tgz" +hash = "53dea3e5b1acbe899268de39dd43685acd702f0f187ff37f65aa6349d22676a3" [openpype.thirdparty.oiio.darwin] url = "https://distribute.openpype.io/thirdparty/oiio-2.2.0-darwin.tgz" -hash = "sha256:..." \ No newline at end of file +hash = "sha256:..."