Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[TIKA-3420] Set tesseract ocr langauges as docker build args #2

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
Open

[TIKA-3420] Set tesseract ocr langauges as docker build args #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
02ea014
feat: set tesseract ocr langauges as docker build args
mhf-ir Dec 15, 2020
106b0e3
fix: docker-tools.sh
mhf-ir Dec 15, 2020
5781824
fix: pR
mhf-ir Jan 1, 2021
b3e1b75
Merge branch 'master' into master
mhf-ir May 24, 2021
6a902d6
Update README.md
mhf-ir May 24, 2021
12cf44e
change for solve PR
mhf-ir May 26, 2021
93ca3e9
fix conflict
mhf-ir May 26, 2021
a18d572
Update docker-tool.sh
mhf-ir May 26, 2021
79bdbe6
Merge branch 'master' into master
mhf-ir May 26, 2021
4f703de
Merge branch 'master' of github.com:apache/tika-docker
mhf-ir May 26, 2021
d6c3e68
Merge branch 'master' of github.com:mhf-ir/tika-docker
mhf-ir May 26, 2021
5ffc62f
fix: bash args
mhf-ir Jun 7, 2021
bcff5c9
fix: test
mhf-ir Jun 8, 2021
b0003df
fix: no-cache
mhf-ir Jun 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@ There is a minimal version, which contains only Apache Tika and it's core depend
* Italian
* Spanish.

To install more languages simply update the apt-get command to include the package containing the language you required, or include your own custom packs using an ADD command.
To install more languages simply use `docker-build.sh` or manually using [docker --build-arg](https://docs.docker.com/engine/reference/commandline/build/#set-build-time-variables---build-arg)

Obtain a list of official Tesseract packages by executing (on Linux):

apt-cache search --names-only '^tesseract-ocr-[a-z]{3}$'

## Available Tags

Expand Down
23 changes: 15 additions & 8 deletions docker-tool.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,14 @@ while getopts ":h" opt; do
case ${opt} in
h )
echo "Usage:"
echo " docker-tool.sh -h Display this help message."
echo " docker-tool.sh build <TIKA_VERSION> Builds images for <TIKA_VERSION>."
echo " docker-tool.sh test <TIKA_VERSION> Tests images for <TIKA_VERSION>."
echo " docker-tool.sh publish <TIKA_VERSION> Publishes images for <TIKA_VERSION> to Docker Hub."
echo " docker-tool.sh latest <TIKA_VERSION> Tags images for <TIKA_VERSION> as latest on Docker Hub."
echo " docker-tool.sh -h Display this help message."
echo " docker-tool.sh build <TIKA_VERSION> [<TIKA_JAR_NAME>] [<TESSERACT_LANGUAGES>] Builds images for <TIKA_VERSION>, apply [<TIKA_JAR_NAME>], via special [<TESSERACT_LANGUAGES>]."
echo " docker-tool.sh test <TIKA_VERSION> Tests images for <TIKA_VERSION>."
echo " docker-tool.sh publish <TIKA_VERSION> Publishes images for <TIKA_VERSION> to Docker Hub."
echo " docker-tool.sh latest <TIKA_VERSION> Tags images for <TIKA_VERSION> as latest on Docker Hub."
echo ""
echo "Note: [<TESSERACT_LANGUAGES>] is optional for full image,"
echo " to customize various tesseract-ocr packages. Otherwise the default packages are installed."
exit 0
;;
\? )
Expand Down Expand Up @@ -59,19 +62,23 @@ shift $((OPTIND -1))
subcommand=$1; shift
version=$1; shift
jar=$1; shift
tesseract_languages=$@

if [ -z "$jar" ]
then
jar="tika-server"
fi


case "$subcommand" in
build)
build_args="--build-arg TIKA_VERSION=${version} --build-arg TIKA_JAR_NAME=${jar}"
if [[ ! -z "$tesseract_languages" ]]; then
build_args="$build_args --build-arg TESSERACT_LANGUAGES='${tesseract_languages}'"
fi
# Build slim version with minimal dependencies
docker build -t apache/tika:${version} --build-arg TIKA_VERSION=${version} --build-arg TIKA_JAR_NAME=${jar} - < minimal/Dockerfile --no-cache
eval "docker build -t apache/tika:${version} ${build_args} - < minimal/Dockerfile --no-cache"
# Build full version with OCR, Fonts and GDAL
docker build -t apache/tika:${version}-full --build-arg TIKA_VERSION=${version} --build-arg TIKA_JAR_NAME=${jar} - < full/Dockerfile --no-cache
eval "docker build -t apache/tika:${version}-full ${build_args} - < full/Dockerfile --no-cache"
;;

test)
Expand Down
4 changes: 2 additions & 2 deletions full/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ RUN apt-get update

FROM base as dependencies
ARG JRE='openjdk-14-jre-headless'
ARG TESSERACT_LANGUAGES='tesseract-ocr-eng tesseract-ocr-ita tesseract-ocr-fra tesseract-ocr-spa tesseract-ocr-deu'

RUN DEBIAN_FRONTEND=noninteractive apt-get -y install $JRE gdal-bin tesseract-ocr \
tesseract-ocr-eng tesseract-ocr-ita tesseract-ocr-fra tesseract-ocr-spa tesseract-ocr-deu
RUN DEBIAN_FRONTEND=noninteractive apt-get -y install $JRE gdal-bin tesseract-ocr $TESSERACT_LANGUAGES

RUN echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | debconf-set-selections \
&& DEBIAN_FRONTEND=noninteractive apt-get install -y xfonts-utils fonts-freefont-ttf fonts-liberation ttf-mscorefonts-installer wget cabextract
Expand Down