From e608fdae1d397b0b489143253dc79e27a6f00d3f Mon Sep 17 00:00:00 2001 From: "Gerber, Mike" Date: Wed, 8 Feb 2023 14:18:30 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=A7=20Install=20pyenv?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile-core | 19 ++++++++++++++++--- build | 2 +- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/Dockerfile-core b/Dockerfile-core index 9b35ec2..65ac56a 100644 --- a/Dockerfile-core +++ b/Dockerfile-core @@ -20,6 +20,17 @@ RUN echo "APT::Acquire::Retries \"3\";" > /etc/apt/apt.conf.d/80-retries && \ xmlstarlet \ # OCR-D uses ImageMagick for pixel density estimation imagemagick \ +# pyenv builds +# TODO: builder container? + libz-dev \ + libssl-dev \ + libbz2-dev \ + liblzma-dev \ + libncurses-dev \ + libffi-dev \ + libreadline-dev \ + libsqlite3-dev \ + libmagic-dev \ && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* @@ -33,13 +44,15 @@ RUN echo "setOverrideLogLevel(os.getenv('LOG_LEVEL', 'INFO'))" >/etc/ocrd_loggin # TODO: do not run as root # TODO: does just saying "3.7" work as intended? ENV HOME=/root -ENV PYENV_ROOT=$HOME/.pyenv +ENV PYENV_ROOT=/usr/local/share/pyenv ENV PATH=$PYENV_ROOT/shims:$PYENV_ROOT/bin:$PATH RUN \ - git clone --depth=1 https://github.com/yyuu/pyenv.git $HOME/.pyenv && \ + git clone --depth=1 https://github.com/yyuu/pyenv.git $PYENV_ROOT && \ pyenv install 3.7 && \ pyenv global 3.7 && \ - pyenv rehash + pyenv rehash && \ + pip install -U pip && \ + pip install setuptools # Install pip installable-stuff RUN ${PIP_INSTALL} \ diff --git a/build b/build index 3c713e5..0262066 100755 --- a/build +++ b/build @@ -45,7 +45,7 @@ get_from_web() { download_to --strip-components 1 'https://qurator-data.de/eynollah/models_eynollah.tar.gz' 'eynollah' } . $self_dir/qurator_data_lib.sh -handle_data +#handle_data