mirror of
				https://github.com/qurator-spk/ocrd-galley.git
				synced 2025-10-29 18:24:13 +01:00 
			
		
		
		
	🐛 Consistently use pip install --use-feature=2020-resolver
This commit is contained in:
		
							parent
							
								
									8fc5449fbf
								
							
						
					
					
						commit
						311e3eab88
					
				
					 6 changed files with 14 additions and 9 deletions
				
			
		|  | @ -1,5 +1,6 @@ | |||
| FROM ubuntu:18.04 | ||||
| 
 | ||||
| ARG PIP_INSTALL="pip3 install --no-cache-dir --use-feature=2020-resolver" | ||||
| ENV LC_ALL=C.UTF-8 LANG=C.UTF-8 | ||||
| ENV PIP_DEFAULT_TIMEOUT=120 | ||||
| 
 | ||||
|  | @ -35,7 +36,7 @@ RUN curl -sSL https://bootstrap.pypa.io/get-pip.py -o get-pip.py && \ | |||
| 
 | ||||
| 
 | ||||
| # Install pip installable-stuff | ||||
| RUN pip3 install --no-cache-dir \ | ||||
| RUN ${PIP_INSTALL} \ | ||||
|         'ocrd >= 2.13.1' | ||||
| 
 | ||||
| 
 | ||||
|  |  | |||
|  | @ -1,11 +1,11 @@ | |||
| FROM my_ocrd_workflow-core | ||||
| 
 | ||||
| 
 | ||||
| ARG PIP_INSTALL="pip3 install --no-cache-dir --use-feature=2020-resolver" | ||||
| ENV DINGLEHOPPER_COMMIT 2b98f69 | ||||
| 
 | ||||
| 
 | ||||
| # Build pip installable stuff | ||||
| RUN pip3 install --no-cache-dir \ | ||||
| RUN ${PIP_INSTALL} \ | ||||
| # Now the real stuff: | ||||
|     https://github.com/qurator-spk/dinglehopper/archive/$DINGLEHOPPER_COMMIT.tar.gz | ||||
| 
 | ||||
|  |  | |||
|  | @ -1,8 +1,10 @@ | |||
| FROM my_ocrd_workflow-core | ||||
| 
 | ||||
| ARG PIP_INSTALL="pip3 install --no-cache-dir --use-feature=2020-resolver" | ||||
| 
 | ||||
| 
 | ||||
| # Build pip installable stuff | ||||
| RUN pip3 install --no-cache-dir \ | ||||
| RUN ${PIP_INSTALL} \ | ||||
| # Resolve conflicts early: | ||||
|         'tensorflow-gpu == 1.15.*' \ | ||||
|         'calamari-ocr == 0.3.5' \ | ||||
|  |  | |||
|  | @ -1,7 +1,9 @@ | |||
| FROM my_ocrd_workflow-core | ||||
| 
 | ||||
| ARG PIP_INSTALL="pip3 install --no-cache-dir --use-feature=2020-resolver" | ||||
| ENV OCRD_OLENA_VERSION 1.2.0 | ||||
| 
 | ||||
| 
 | ||||
| # Build ocrd_olena | ||||
| RUN apt-get update && \ | ||||
|     apt-get install -y \ | ||||
|  | @ -19,7 +21,7 @@ RUN curl -sSL --retry 3 -o ocrd_olena.tar.gz https://github.com/OCR-D/ocrd_olena | |||
|    tar xvz -C ocrd_olena --strip-components=1 -f ocrd_olena.tar.gz && \ | ||||
|    cd ocrd_olena && \ | ||||
|    sed -i 's/^install: deps$/install:/' Makefile && \ | ||||
|    pip3 install --no-cache-dir --use-feature=2020-resolver ocrd && \ | ||||
|    ${PIP_INSTALL} ocrd && \ | ||||
|    make install PREFIX=/usr/local && \ | ||||
|    cd .. && rm -rf ocrd_olena ocrd_olena.tar.gz | ||||
| 
 | ||||
|  |  | |||
|  | @ -1,6 +1,6 @@ | |||
| FROM my_ocrd_workflow-core | ||||
| 
 | ||||
| 
 | ||||
| ARG PIP_INSTALL="pip3 install --no-cache-dir --use-feature=2020-resolver" | ||||
| ENV TESSDATA_BEST_VERSION 4.0.0 | ||||
| ENV TESSDATA_PREFIX /usr/local/share/tessdata | ||||
| 
 | ||||
|  | @ -22,7 +22,7 @@ COPY data/tesseract-models/GT4HistOCR/GT4HistOCR_2000000.traineddata $TESSDATA_P | |||
| 
 | ||||
| 
 | ||||
| # Build pip installable stuff | ||||
| RUN pip3 install --no-cache-dir \ | ||||
| RUN ${PIP_INSTALL} \ | ||||
| # Now the real stuff: | ||||
|     'ocrd_tesserocr >= 0.9.0' | ||||
| 
 | ||||
|  |  | |||
|  | @ -1,11 +1,11 @@ | |||
| FROM my_ocrd_workflow-core | ||||
| 
 | ||||
| 
 | ||||
| ARG PIP_INSTALL="pip3 install --no-cache-dir --use-feature=2020-resolver" | ||||
| ENV SBB_TEXTLINE_DETECTOR_COMMIT 0f09f4a | ||||
| 
 | ||||
| 
 | ||||
| # Build pip installable stuff | ||||
| RUN pip3 install --no-cache-dir \ | ||||
| RUN ${PIP_INSTALL} \ | ||||
| # Now the real stuff: | ||||
|     https://github.com/qurator-spk/sbb_textline_detector/archive/$SBB_TEXTLINE_DETECTOR_COMMIT.tar.gz | ||||
| 
 | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue