From d8359de840df5ddf93ac9f74408ca112e752fcbf Mon Sep 17 00:00:00 2001 From: Alex Parsons Date: Thu, 1 Sep 2022 07:51:04 +0000 Subject: [PATCH] Simplify poetry install poetry 1.2 has a new install script --- Dockerfile | 3 +-- bin/packages_setup.bash | 7 ++----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index be74384..92fab0f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,5 +9,4 @@ RUN cd /setup/ \ && chmod +x packages_setup.bash \ && ./packages_setup.bash \ && mkdir --parents /setup/src/data_common && touch /setup/src/data_common/__init__.py \ - && export PATH="$HOME/.poetry/bin:$PATH" \ - && cd /setup/ && poetry install \ No newline at end of file + && cd /setup/ && ~/.local/share/pypoetry/bin/poetry install \ No newline at end of file diff --git a/bin/packages_setup.bash b/bin/packages_setup.bash index ce6a4ec..4408f04 100755 --- a/bin/packages_setup.bash +++ b/bin/packages_setup.bash @@ -1,10 +1,7 @@ #!/bin/bash -curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python - -echo "export PATH=\"$HOME/.poetry/bin:$PATH\"" > ~/.bashrc -export PATH="$HOME/.poetry/bin:$PATH" -poetry config virtualenvs.create false - +curl -sSL https://install.python-poetry.org | python - +~/.local/share/pypoetry/bin/poetry config virtualenvs.create false curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \ && echo 'deb https://deb.nodesource.com/node_14.x buster main' > /etc/apt/sources.list.d/nodesource.list