You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by dm...@apache.org on 2020/11/30 21:50:39 UTC
[tika-docker] branch master updated (5e73c49 -> 1350d8c)
This is an automated email from the ASF dual-hosted git repository.
dmeikle pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tika-docker.git.
from 5e73c49 Added no-cache to avoid stale APT archives
new f5e6a2c changed entrypoint to exec format
new 6f88260 corrected entrypoint in minimal dockerfile
new 0ca6027 expand shell
new f153bf0 expand shell minimal
new 1350d8c Merge pull request #1 from schmitch/schmitch-entrypoint
The 28 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
full/Dockerfile | 2 +-
minimal/Dockerfile | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
[tika-docker] 02/28: Fixed file name
Posted by dm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dmeikle pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika-docker.git
commit 9f0e54e2241f4a7080bd9c6c4fc20e762368591c
Author: David Meikle <dm...@apache.org>
AuthorDate: Thu Jan 9 02:12:41 2020 +0000
Fixed file name
---
.travis.ci.yml => .travis.yml | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/.travis.ci.yml b/.travis.yml
similarity index 100%
rename from .travis.ci.yml
rename to .travis.yml
[tika-docker] 16/28: Added 1.24 release to CI
Posted by dm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dmeikle pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika-docker.git
commit 1573ed8cee7a04dde159cdafc0eea1dc0153c749
Author: David Meikle <dm...@apache.org>
AuthorDate: Thu Mar 19 08:01:33 2020 +0000
Added 1.24 release to CI
---
.travis.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.travis.yml b/.travis.yml
index c257e1a..edfaa1e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,7 @@ language: bash
services: docker
env:
matrix:
+ - VERSION=1.24
- VERSION=1.23
- VERSION=1.22
script:
[tika-docker] 21/28: Update README.md
Posted by dm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dmeikle pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika-docker.git
commit 798ed1ad9c97642beba18690d38f480c648a52b3
Author: Dave Meikle <dm...@apache.org>
AuthorDate: Fri May 8 18:50:55 2020 +0100
Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index fd30fa8..71ea6fb 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
This repo is used to create convenience Docker images for Apache Tika Server published as [apache/tika](https://hub.docker.com/r/apache/tika) on DockerHub by the [Apache Tika](http://tika.apache.org) Dev team
-The images create a functional Apache Tika Server instance that contains the latest Ubuntu running the appropriate version's server on Port 9998 using Java 8 (until version 1.20) and then Java 11 (1.21 and above).
+The images create a functional Apache Tika Server instance that contains the latest Ubuntu running the appropriate version's server on Port 9998 using Java 8 (until version 1.20), Java 11 (1.21 and 1.24.1) and Java 14 for newer versions.
There is a minimal version, which contains only Apache Tika and it's core dependencies, and a full version, which also includes dependencies for the GDAL and Tesseract OCR parsers. To balance showing functionality versus the size of the full image, this file currently installs the language packs for the following languages:
* English
[tika-docker] 03/28: Removed redundant output
Posted by dm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dmeikle pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika-docker.git
commit 1a69fd9ec79787a90580677090783dbae29778f7
Author: David Meikle <dm...@apache.org>
AuthorDate: Thu Jan 9 02:39:25 2020 +0000
Removed redundant output
---
full/Dockerfile | 1 -
minimal/Dockerfile | 1 -
2 files changed, 2 deletions(-)
diff --git a/full/Dockerfile b/full/Dockerfile
index a9ad964..ef43a4a 100644
--- a/full/Dockerfile
+++ b/full/Dockerfile
@@ -31,7 +31,6 @@ ENV NEAREST_TIKA_SERVER_URL="https://www.apache.org/dyn/closer.cgi/tika/tika-ser
RUN DEBIAN_FRONTEND=noninteractive apt-get -y install gnupg2 curl wget \
&& curl -sSL https://www.apache.org/dist/tika/KEYS | gpg --import \
- && echo "Nearest mirror: $NEAREST_TIKA_SERVER_URL" \
&& wget $NEAREST_TIKA_SERVER_URL -O /tika-server-${TIKA_VERSION}.jar || rm /tika-server-${TIKA_VERSION}.jar \
&& sh -c "[ -f /tika-server-${TIKA_VERSION}.jar ]" || wget $ARCHIVE_TIKA_SERVER_URL -O /tika-server-${TIKA_VERSION}.jar || rm /tika-server-${TIKA_VERSION}.jar \
&& wget $DEFAULT_TIKA_SERVER_ASC_URL -O /tika-server-${TIKA_VERSION}.jar.asc || rm /tika-server-${TIKA_VERSION}.jar.asc \
diff --git a/minimal/Dockerfile b/minimal/Dockerfile
index 917ef38..6554be9 100644
--- a/minimal/Dockerfile
+++ b/minimal/Dockerfile
@@ -26,7 +26,6 @@ ENV NEAREST_TIKA_SERVER_URL="https://www.apache.org/dyn/closer.cgi/tika/tika-ser
RUN DEBIAN_FRONTEND=noninteractive apt-get -y install gnupg2 curl wget \
&& curl -sSL https://www.apache.org/dist/tika/KEYS | gpg --import \
- && echo "Nearest mirror: $NEAREST_TIKA_SERVER_URL" \
&& wget $NEAREST_TIKA_SERVER_URL -O /tika-server-${TIKA_VERSION}.jar || rm /tika-server-${TIKA_VERSION}.jar \
&& sh -c "[ -f /tika-server-${TIKA_VERSION}.jar ]" || wget $ARCHIVE_TIKA_SERVER_URL -O /tika-server-${TIKA_VERSION}.jar || rm /tika-server-${TIKA_VERSION}.jar \
&& wget $DEFAULT_TIKA_SERVER_ASC_URL -O /tika-server-${TIKA_VERSION}.jar.asc || rm /tika-server-${TIKA_VERSION}.jar.asc \
[tika-docker] 20/28: Upgrade JDK to 14 and Based Image to Focal
(20.04 LTS)
Posted by dm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dmeikle pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika-docker.git
commit 256b20fedbfdec9921d2a4a3150678f7afd50046
Author: David Meikle <da...@meikle.io>
AuthorDate: Fri May 8 18:49:30 2020 +0100
Upgrade JDK to 14 and Based Image to Focal (20.04 LTS)
---
full/Dockerfile | 4 ++--
minimal/Dockerfile | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/full/Dockerfile b/full/Dockerfile
index ce640f0..0d93c72 100644
--- a/full/Dockerfile
+++ b/full/Dockerfile
@@ -9,11 +9,11 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations under
# the License.
-FROM ubuntu:bionic as base
+FROM ubuntu:focal as base
RUN apt-get update
FROM base as dependencies
-ARG JRE='openjdk-11-jre-headless'
+ARG JRE='openjdk-14-jre-headless'
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
diff --git a/minimal/Dockerfile b/minimal/Dockerfile
index e8fa563..28b2f8d 100644
--- a/minimal/Dockerfile
+++ b/minimal/Dockerfile
@@ -9,11 +9,11 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations under
# the License.
-FROM ubuntu:bionic as base
+FROM ubuntu:focal as base
RUN apt-get update
FROM base as dependencies
-ARG JRE='openjdk-11-jre-headless'
+ARG JRE='openjdk-14-jre-headless'
RUN DEBIAN_FRONTEND=noninteractive apt-get -y install $JRE
[tika-docker] 23/28: corrected entrypoint in minimal dockerfile
Posted by dm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dmeikle pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika-docker.git
commit 6f88260e8a03881418f4022197769ba7656aae6b
Author: Schmitt Christian <c....@briefdomain.de>
AuthorDate: Tue Sep 1 18:23:31 2020 +0200
corrected entrypoint in minimal dockerfile
---
minimal/Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/minimal/Dockerfile b/minimal/Dockerfile
index 28b2f8d..674ffde 100644
--- a/minimal/Dockerfile
+++ b/minimal/Dockerfile
@@ -45,6 +45,6 @@ ENV TIKA_VERSION=$TIKA_VERSION
COPY --from=fetch_tika /tika-server-${TIKA_VERSION}.jar /tika-server-${TIKA_VERSION}.jar
EXPOSE 9998
-ENTRYPOINT java -jar /tika-server-${TIKA_VERSION}.jar -h 0.0.0.0
+ENTRYPOINT ["java", "-jar", "/tika-server-${TIKA_VERSION}.jar", "-h", "0.0.0.0"]
LABEL maintainer="Apache Tika Developers dev@tika.apache.org"
[tika-docker] 19/28: Updated for Apache Tika 1.24.1 release
Posted by dm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dmeikle pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika-docker.git
commit 3938393781b62ca50f989f50c935c5cd0de6809e
Author: David Meikle <dm...@apache.org>
AuthorDate: Fri Apr 24 04:53:19 2020 +0100
Updated for Apache Tika 1.24.1 release
---
.travis.yml | 2 +-
README.md | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index edfaa1e..b46c6ff 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,9 +2,9 @@ language: bash
services: docker
env:
matrix:
+ - VERSION=1.24.1
- VERSION=1.24
- VERSION=1.23
- - VERSION=1.22
script:
- ./docker-tool.sh build $VERSION
- ./docker-tool.sh test $VERSION
diff --git a/README.md b/README.md
index 35cd6bf..fd30fa8 100644
--- a/README.md
+++ b/README.md
@@ -17,8 +17,10 @@ To install more languages simply update the apt-get command to include the packa
Below are the most recent tags:
-- `latest`, `1.24`: Apache Tika Server 1.24 (Minimal)
-- `latest-full`, `1.24-full`: Apache Tika Server 1.24 (Full)
+- `latest`, `1.24.1`: Apache Tika Server 1.24.1 (Minimal)
+- `latest-full`, `1.24.1-full`: Apache Tika Server 1.24.1 (Full)
+- `1.24`: Apache Tika Server 1.24 (Minimal)
+- `1.24-full`: Apache Tika Server 1.24 (Full)
- `1.23`: Apache Tika Server 1.23 (Minimal)
- `1.23-full`: Apache Tika Server 1.23 (Full)
- `1.22`: Apache Tika Server 1.22 (Minimal)
[tika-docker] 15/28: Updated with more details on tags
Posted by dm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dmeikle pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika-docker.git
commit 9a86f5ae5529a601ae4dcb57a14565d603d57455
Author: Dave Meikle <dm...@apache.org>
AuthorDate: Thu Feb 6 05:11:39 2020 +0000
Updated with more details on tags
---
README.md | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/README.md b/README.md
index 44acd3c..b84e435 100644
--- a/README.md
+++ b/README.md
@@ -13,17 +13,28 @@ There is a minimal version, which contains only Apache Tika and it's core depend
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.
+## Available Tags
+
+Below are the most recent tags:
+
+- `latest`, `1.23`: Apache Tika Server 1.23 (Minimal)
+- `latest-full`, `1.23-full`: Apache Tika Server 1.23 (Full)
+- `1.22`: Apache Tika Server 1.22 (Minimal)
+- `1.22-full`: Apache Tika Server 1.22 (Full)
+
+You can see a full set of tags for historical versions [here](https://hub.docker.com/r/apache/tika/tags?page=1&ordering=last_updated).
+
## Usage
You can pull down the version you would like using:
- docker pull apache/tika:<version>
+ docker pull apache/tika:<tag>
Then to run the container, execute the following command:
- docker run -d -p 9998:9998 apache/tika:<version>
+ docker run -d -p 9998:9998 apache/tika:<tag>
-Where <version> is the Apache Tika Server version - e.g. 1.23, 1.22, 1.23-full, 1.22-full.
+Where <tag> is the DockerHub tag corresponding to the Apache Tika Server version - e.g. 1.23, 1.22, 1.23-full, 1.22-full.
NOTE: The latest and latest-full tags are explicitly set to the latest released version when they are published.
[tika-docker] 17/28: Added 1.24 release information to README
Posted by dm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dmeikle pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika-docker.git
commit 0b82cbf4dd501e3bbe704d4a04aa8e29654250e4
Author: David Meikle <dm...@apache.org>
AuthorDate: Thu Mar 19 08:04:22 2020 +0000
Added 1.24 release information to README
---
README.md | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index b84e435..35cd6bf 100644
--- a/README.md
+++ b/README.md
@@ -17,8 +17,10 @@ To install more languages simply update the apt-get command to include the packa
Below are the most recent tags:
-- `latest`, `1.23`: Apache Tika Server 1.23 (Minimal)
-- `latest-full`, `1.23-full`: Apache Tika Server 1.23 (Full)
+- `latest`, `1.24`: Apache Tika Server 1.24 (Minimal)
+- `latest-full`, `1.24-full`: Apache Tika Server 1.24 (Full)
+- `1.23`: Apache Tika Server 1.23 (Minimal)
+- `1.23-full`: Apache Tika Server 1.23 (Full)
- `1.22`: Apache Tika Server 1.22 (Minimal)
- `1.22-full`: Apache Tika Server 1.22 (Full)
[tika-docker] 11/28: Updated README
Posted by dm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dmeikle pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika-docker.git
commit e6c1c2380a263370998c8bec9c6fdcf2ad87842c
Author: Dave Meikle <dm...@apache.org>
AuthorDate: Thu Feb 6 04:44:01 2020 +0000
Updated README
---
README.md | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 63 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 773b484..34eafa5 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,64 @@
-# tika-docker
+# tika-docker [](https://travis-ci.org/apache/tika-docker)
-Work in Progress
\ No newline at end of file
+This repo is used to create convenience Docker images published on [DockerHub](https://hub.docker.com/r/apache/tika) by the [Apache Tika](http://tika.apache.org) Dev team for Apache Tika Server.
+
+The images create a functional Apache Tika Server instance that contains the latest Ubuntu running the appropriate version's server on Port 9998 using Java 8 (until version 1.20) and then Java 11 (1.21 and above).
+
+There is a minimal version, which contains only Apache Tika and it's core dependencies, and a full version, which also includes dependencies for the GDAL and Tesseract OCR parsers. To balance showing functionality versus the size of the full image, this file currently installs the language packs for the following languages:
+* English
+* French
+* German
+* 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.
+
+## Usage
+
+You can pull down the version you would like using:
+
+ docker pull apache/tika:<version>
+
+Then to run the container, execute the following command:
+
+ docker run -d -p 9998:9998 apache/tika:<version>
+
+Where <version> is the Apache Tika Server version - e.g. 1.23, 1.22, 1.23-full, 1.22-full.
+
+NOTE: The latest and latest-full tags are explicitly set to the latest released version when they are published.
+
+## Building
+
+To build the image from scratch, simply invoke:
+
+ docker build -t 'apache/tika' github.com/apache/tika-docker
+
+You can then use the following command (using the name you allocated in the build command as part of -t option):
+
+ docker run -d -p 9998:9998 apache/tika
+
+## More Information
+
+For more infomation on Apache Tika Server, go to the [Apache Tika Server documentation](http://wiki.apache.org/tika/TikaJAXRS).
+
+For more information on Apache Tika, go to the official [Apache Tika](http://tika.apache.org) project website.
+
+For more information on the Apache Software Foundation, go to the [Apache Software Foundation](http://apache.org) website.
+
+## Authors
+
+Apache Tika Dev Team (dev@tika.apache.org)
+
+## Contributors
+
+There have been a range of [contributors](https://github.com/apache/tika-docker/graphs/contributors) on GitHub and via suggestions, including:
+
+- [@grossws](https://github.com/grossws)
+- [@arjunyel](https://github.com/arjunyel)
+- [@mpdude](https://github.com/mpdude)
+- [@laszlocsontosuw](https://github.com/laszlocsontosuw)
+
+
+## Disclaimer
+
+It is worth noting that whilst these Docker images download the binary JARs published by the Apache Tika Team on the Apache Software Foundation distribution sites, only the source release of an Apache Software Foundation project is an official release artefact. See [Release Distribution Policy](https://www.apache.org/dev/release-distribution.html) for more details.
[tika-docker] 25/28: expand shell minimal
Posted by dm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dmeikle pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika-docker.git
commit f153bf0baf4e69bf675d2d469ea7c85bffa2e207
Author: Schmitt Christian <c....@briefdomain.de>
AuthorDate: Tue Sep 1 20:06:35 2020 +0200
expand shell minimal
---
minimal/Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/minimal/Dockerfile b/minimal/Dockerfile
index 674ffde..b864390 100644
--- a/minimal/Dockerfile
+++ b/minimal/Dockerfile
@@ -45,6 +45,6 @@ ENV TIKA_VERSION=$TIKA_VERSION
COPY --from=fetch_tika /tika-server-${TIKA_VERSION}.jar /tika-server-${TIKA_VERSION}.jar
EXPOSE 9998
-ENTRYPOINT ["java", "-jar", "/tika-server-${TIKA_VERSION}.jar", "-h", "0.0.0.0"]
+ENTRYPOINT [ "/bin/sh", "-c", "exec java -jar /tika-server-${TIKA_VERSION}.jar -h 0.0.0.0 $0 $@"]
LABEL maintainer="Apache Tika Developers dev@tika.apache.org"
[tika-docker] 24/28: expand shell
Posted by dm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dmeikle pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika-docker.git
commit 0ca602700c350760a127d2eaa1f781a354fe04e9
Author: Schmitt Christian <c....@briefdomain.de>
AuthorDate: Tue Sep 1 20:06:10 2020 +0200
expand shell
---
full/Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/full/Dockerfile b/full/Dockerfile
index e88aade..f3ccd83 100644
--- a/full/Dockerfile
+++ b/full/Dockerfile
@@ -49,7 +49,7 @@ ENV TIKA_VERSION=$TIKA_VERSION
COPY --from=fetch_tika /tika-server-${TIKA_VERSION}.jar /tika-server-${TIKA_VERSION}.jar
EXPOSE 9998
-ENTRYPOINT ["java", "-jar", "/tika-server-${TIKA_VERSION}.jar", "-h", "0.0.0.0"]
+ENTRYPOINT [ "/bin/sh", "-c", "exec java -jar /tika-server-${TIKA_VERSION}.jar -h 0.0.0.0 $0 $@"]
LABEL maintainer="Apache Tika Developers dev@tika.apache.org"
[tika-docker] 13/28: Create LICENSE
Posted by dm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dmeikle pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika-docker.git
commit 0a0a38ed45a905373dd54f753b74dcfb8051d866
Author: Dave Meikle <dm...@apache.org>
AuthorDate: Thu Feb 6 04:51:42 2020 +0000
Create LICENSE
---
LICENSE | 201 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 201 insertions(+)
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..261eeb9
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,201 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
[tika-docker] 18/28: Updated to use new
https://downloads.apache.org service instead of https://www.apache.org/dist
Posted by dm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dmeikle pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika-docker.git
commit 869248eefccbf0e7dbb4b2c55399bf69199ae5b4
Author: David Meikle <dm...@apache.org>
AuthorDate: Tue Mar 24 22:03:57 2020 +0000
Updated to use new https://downloads.apache.org service instead of https://www.apache.org/dist
---
full/Dockerfile | 4 ++--
minimal/Dockerfile | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/full/Dockerfile b/full/Dockerfile
index c3ca154..ce640f0 100644
--- a/full/Dockerfile
+++ b/full/Dockerfile
@@ -27,12 +27,12 @@ ARG CHECK_SIG=true
ENV NEAREST_TIKA_SERVER_URL="https://www.apache.org/dyn/closer.cgi/tika/tika-server-${TIKA_VERSION}.jar?filename=tika/tika-server-${TIKA_VERSION}.jar&action=download" \
ARCHIVE_TIKA_SERVER_URL="https://archive.apache.org/dist/tika/tika-server-${TIKA_VERSION}.jar" \
- DEFAULT_TIKA_SERVER_ASC_URL="https://www.apache.org/dist/tika/tika-server-${TIKA_VERSION}.jar.asc" \
+ DEFAULT_TIKA_SERVER_ASC_URL="https://downloads.apache.org/tika/tika-server-${TIKA_VERSION}.jar.asc" \
ARCHIVE_TIKA_SERVER_ASC_URL="https://archive.apache.org/dist/tika/tika-server-${TIKA_VERSION}.jar.asc" \
TIKA_VERSION=$TIKA_VERSION
RUN DEBIAN_FRONTEND=noninteractive apt-get -y install gnupg2 wget \
- && wget -t 10 --max-redirect 1 --retry-connrefused -qO- https://www.apache.org/dist/tika/KEYS | gpg --import \
+ && wget -t 10 --max-redirect 1 --retry-connrefused -qO- https://downloads.apache.org/tika/KEYS | gpg --import \
&& wget -t 10 --max-redirect 1 --retry-connrefused $NEAREST_TIKA_SERVER_URL -O /tika-server-${TIKA_VERSION}.jar || rm /tika-server-${TIKA_VERSION}.jar \
&& sh -c "[ -f /tika-server-${TIKA_VERSION}.jar ]" || wget $ARCHIVE_TIKA_SERVER_URL -O /tika-server-${TIKA_VERSION}.jar || rm /tika-server-${TIKA_VERSION}.jar \
&& sh -c "[ -f /tika-server-${TIKA_VERSION}.jar ]" || exit 1 \
diff --git a/minimal/Dockerfile b/minimal/Dockerfile
index 11fc925..e8fa563 100644
--- a/minimal/Dockerfile
+++ b/minimal/Dockerfile
@@ -23,12 +23,12 @@ ARG CHECK_SIG=true
ENV NEAREST_TIKA_SERVER_URL="https://www.apache.org/dyn/closer.cgi/tika/tika-server-${TIKA_VERSION}.jar?filename=tika/tika-server-${TIKA_VERSION}.jar&action=download" \
ARCHIVE_TIKA_SERVER_URL="https://archive.apache.org/dist/tika/tika-server-${TIKA_VERSION}.jar" \
- DEFAULT_TIKA_SERVER_ASC_URL="https://www.apache.org/dist/tika/tika-server-${TIKA_VERSION}.jar.asc" \
+ DEFAULT_TIKA_SERVER_ASC_URL="https://downloads.apache.org/tika/tika-server-${TIKA_VERSION}.jar.asc" \
ARCHIVE_TIKA_SERVER_ASC_URL="https://archive.apache.org/dist/tika/tika-server-${TIKA_VERSION}.jar.asc" \
TIKA_VERSION=$TIKA_VERSION
RUN DEBIAN_FRONTEND=noninteractive apt-get -y install gnupg2 wget \
- && wget -t 10 --max-redirect 1 --retry-connrefused -qO- https://www.apache.org/dist/tika/KEYS | gpg --import \
+ && wget -t 10 --max-redirect 1 --retry-connrefused -qO- https://downloads.apache.org/tika/KEYS | gpg --import \
&& wget -t 10 --max-redirect 1 --retry-connrefused $NEAREST_TIKA_SERVER_URL -O /tika-server-${TIKA_VERSION}.jar || rm /tika-server-${TIKA_VERSION}.jar \
&& sh -c "[ -f /tika-server-${TIKA_VERSION}.jar ]" || wget $ARCHIVE_TIKA_SERVER_URL -O /tika-server-${TIKA_VERSION}.jar || rm /tika-server-${TIKA_VERSION}.jar \
&& sh -c "[ -f /tika-server-${TIKA_VERSION}.jar ]" || exit 1 \
[tika-docker] 01/28: Initial version for testing
Posted by dm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dmeikle pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika-docker.git
commit 18bb384b14f3232b58c0b3d7e00e32abb377cb63
Author: David Meikle <dm...@apache.org>
AuthorDate: Thu Jan 9 02:10:24 2020 +0000
Initial version for testing
---
.gitignore | 27 ++++++++++++++++++++++
.travis.ci.yml | 9 ++++++++
README.md | 3 +++
docker-tool.sh | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
full/Dockerfile | 50 +++++++++++++++++++++++++++++++++++++++
minimal/Dockerfile | 45 ++++++++++++++++++++++++++++++++++++
6 files changed, 202 insertions(+)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..dda6180
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,27 @@
+.svn
+target
+dependency-reduced-pom.xml
+.idea
+.classpath
+.project
+.settings
+*.iml
+*.ipr
+*.iws
+*.bin
+nbactions.xml
+nb-configuration.xml
+*.DS_Store
+*.tmp-inception
+*.snap
+.*.swp
+tika-deployment/tika-snap-app/parts/
+tika-deployment/tika-snap-app/prime/
+tika-deployment/tika-snap-app/snap/
+tika-deployment/tika-snap-app/stage/
+tika-deployment/tika-snap-app/test/
+tika-deployment/tika-snap-server/parts/
+tika-deployment/tika-snap-server/prime/
+tika-deployment/tika-snap-server/snap/
+tika-deployment/tika-snap-server/stage/
+
diff --git a/.travis.ci.yml b/.travis.ci.yml
new file mode 100644
index 0000000..913a0bc
--- /dev/null
+++ b/.travis.ci.yml
@@ -0,0 +1,9 @@
+language: bash
+services: docker
+env:
+ matrix:
+ - VERSION=1.23
+ - VERSION=1.22
+script:
+ - docker-tool.sh build $VERSION
+ - docker-tool.sh test $VERSION
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..773b484
--- /dev/null
+++ b/README.md
@@ -0,0 +1,3 @@
+# tika-docker
+
+Work in Progress
\ No newline at end of file
diff --git a/docker-tool.sh b/docker-tool.sh
new file mode 100755
index 0000000..39e02c3
--- /dev/null
+++ b/docker-tool.sh
@@ -0,0 +1,68 @@
+#!/usr/bin/env bash
+
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+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 image(s) for <TIKA_VERSION>."
+ echo " docker-tool.sh test <TIKA_VERSION> Tests image(s) for <TIKA_VERSION>."
+ echo " docker-tool.sh publish <TIKA_VERSION> Publishes image(s) for <TIKA_VERSION> to Docker Hub."
+ exit 0
+ ;;
+ \? )
+ echo "Invalid Option: -$OPTARG" 1>&2
+ exit 1
+ ;;
+ esac
+done
+
+test_docker_image() {
+ docker run -d --name "$1" -p 9998:9998 apache/tika:"$1"
+ sleep 10
+ curl http://localhost:9998/version
+ docker kill "$1"
+ docker rm "$1"
+}
+
+shift $((OPTIND -1))
+subcommand=$1; shift
+version=$1; shift
+
+case "$subcommand" in
+ build)
+ # Build slim version with minimal dependencies
+ docker build -t apache/tika:${version} --build-arg TIKA_VERSION=${version} - < minimal/Dockerfile
+ # Build full version with OCR, Fonts and GDAL
+ docker build -t apache/tika:${version}-full --build-arg TIKA_VERSION=${version} - < full/Dockerfile
+ ;;
+
+ test)
+ # Test minimal image
+ test_docker_image ${version}
+ # Test full image
+ test_docker_image "${version}-full"
+ ;;
+
+ publish)
+ echo "Does nothing until we get Docker Hub access setup under Apache Organisation"
+ ;;
+
+esac
diff --git a/full/Dockerfile b/full/Dockerfile
new file mode 100644
index 0000000..a9ad964
--- /dev/null
+++ b/full/Dockerfile
@@ -0,0 +1,50 @@
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+FROM ubuntu:bionic as base
+RUN apt-get update
+
+FROM base as dependencies
+
+RUN DEBIAN_FRONTEND=noninteractive apt-get -y install openjdk-11-jre-headless gdal-bin tesseract-ocr \
+ tesseract-ocr-eng tesseract-ocr-ita tesseract-ocr-fra tesseract-ocr-spa tesseract-ocr-deu
+
+RUN echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | debconf-set-selections \
+ && DEBIAN_FRONTEND=noninteractive apt-get install -y curl xfonts-utils fonts-freefont-ttf fonts-liberation ttf-mscorefonts-installer wget cabextract
+
+FROM dependencies as fetch_tika
+ARG TIKA_VERSION
+
+ENV NEAREST_TIKA_SERVER_URL="https://www.apache.org/dyn/closer.cgi/tika/tika-server-${TIKA_VERSION}.jar?filename=tika/tika-server-${TIKA_VERSION}.jar&action=download" \
+ ARCHIVE_TIKA_SERVER_URL="https://archive.apache.org/dist/tika/tika-server-${TIKA_VERSION}.jar" \
+ DEFAULT_TIKA_SERVER_ASC_URL="https://www.apache.org/dist/tika/tika-server-${TIKA_VERSION}.jar.asc" \
+ ARCHIVE_TIKA_SERVER_ASC_URL="https://archive.apache.org/dist/tika/tika-server-${TIKA_VERSION}.jar.asc" \
+ TIKA_VERSION=$TIKA_VERSION
+
+RUN DEBIAN_FRONTEND=noninteractive apt-get -y install gnupg2 curl wget \
+ && curl -sSL https://www.apache.org/dist/tika/KEYS | gpg --import \
+ && echo "Nearest mirror: $NEAREST_TIKA_SERVER_URL" \
+ && wget $NEAREST_TIKA_SERVER_URL -O /tika-server-${TIKA_VERSION}.jar || rm /tika-server-${TIKA_VERSION}.jar \
+ && sh -c "[ -f /tika-server-${TIKA_VERSION}.jar ]" || wget $ARCHIVE_TIKA_SERVER_URL -O /tika-server-${TIKA_VERSION}.jar || rm /tika-server-${TIKA_VERSION}.jar \
+ && wget $DEFAULT_TIKA_SERVER_ASC_URL -O /tika-server-${TIKA_VERSION}.jar.asc || rm /tika-server-${TIKA_VERSION}.jar.asc \
+ && sh -c "[ -f /tika-server-${TIKA_VERSION}.jar.asc ]" || wget $ARCHIVE_TIKA_SERVER_ASC_URL -O /tika-server-${TIKA_VERSION}.jar.asc || rm /tika-server-${TIKA_VERSION}.jar.asc \
+ && gpg --verify /tika-server-${TIKA_VERSION}.jar.asc /tika-server-${TIKA_VERSION}.jar
+
+FROM dependencies as runtime
+RUN apt-get clean -y && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+ARG TIKA_VERSION
+ENV TIKA_VERSION=$TIKA_VERSION
+COPY --from=fetch_tika /tika-server-${TIKA_VERSION}.jar /tika-server-${TIKA_VERSION}.jar
+
+EXPOSE 9998
+ENTRYPOINT java -jar /tika-server-${TIKA_VERSION}.jar -h 0.0.0.0
+
+LABEL maintainer="Apache Tika Developers dev@tika.apache.org"
diff --git a/minimal/Dockerfile b/minimal/Dockerfile
new file mode 100644
index 0000000..917ef38
--- /dev/null
+++ b/minimal/Dockerfile
@@ -0,0 +1,45 @@
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+FROM ubuntu:bionic as base
+RUN apt-get update
+
+FROM base as dependencies
+RUN DEBIAN_FRONTEND=noninteractive apt-get -y install openjdk-11-jre-headless
+
+FROM dependencies as fetch_tika
+ARG TIKA_VERSION
+
+ENV NEAREST_TIKA_SERVER_URL="https://www.apache.org/dyn/closer.cgi/tika/tika-server-${TIKA_VERSION}.jar?filename=tika/tika-server-${TIKA_VERSION}.jar&action=download" \
+ ARCHIVE_TIKA_SERVER_URL="https://archive.apache.org/dist/tika/tika-server-${TIKA_VERSION}.jar" \
+ DEFAULT_TIKA_SERVER_ASC_URL="https://www.apache.org/dist/tika/tika-server-${TIKA_VERSION}.jar.asc" \
+ ARCHIVE_TIKA_SERVER_ASC_URL="https://archive.apache.org/dist/tika/tika-server-${TIKA_VERSION}.jar.asc" \
+ TIKA_VERSION=$TIKA_VERSION
+
+RUN DEBIAN_FRONTEND=noninteractive apt-get -y install gnupg2 curl wget \
+ && curl -sSL https://www.apache.org/dist/tika/KEYS | gpg --import \
+ && echo "Nearest mirror: $NEAREST_TIKA_SERVER_URL" \
+ && wget $NEAREST_TIKA_SERVER_URL -O /tika-server-${TIKA_VERSION}.jar || rm /tika-server-${TIKA_VERSION}.jar \
+ && sh -c "[ -f /tika-server-${TIKA_VERSION}.jar ]" || wget $ARCHIVE_TIKA_SERVER_URL -O /tika-server-${TIKA_VERSION}.jar || rm /tika-server-${TIKA_VERSION}.jar \
+ && wget $DEFAULT_TIKA_SERVER_ASC_URL -O /tika-server-${TIKA_VERSION}.jar.asc || rm /tika-server-${TIKA_VERSION}.jar.asc \
+ && sh -c "[ -f /tika-server-${TIKA_VERSION}.jar.asc ]" || wget $ARCHIVE_TIKA_SERVER_ASC_URL -O /tika-server-${TIKA_VERSION}.jar.asc || rm /tika-server-${TIKA_VERSION}.jar.asc \
+ && gpg --verify /tika-server-${TIKA_VERSION}.jar.asc /tika-server-${TIKA_VERSION}.jar
+
+FROM dependencies as runtime
+RUN apt-get clean -y && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+ARG TIKA_VERSION
+ENV TIKA_VERSION=$TIKA_VERSION
+COPY --from=fetch_tika /tika-server-${TIKA_VERSION}.jar /tika-server-${TIKA_VERSION}.jar
+
+EXPOSE 9998
+ENTRYPOINT java -jar /tika-server-${TIKA_VERSION}.jar -h 0.0.0.0
+
+LABEL maintainer="Apache Tika Developers dev@tika.apache.org"
[tika-docker] 05/28: Updated download commands to configure retries
and exit if downloads fail
Posted by dm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dmeikle pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika-docker.git
commit 887c9b4ef607d3f3c5e2790552bfab7fac78d817
Author: David Meikle <dm...@apache.org>
AuthorDate: Sat Jan 11 01:38:59 2020 +0000
Updated download commands to configure retries and exit if downloads fail
---
full/Dockerfile | 12 +++++++-----
minimal/Dockerfile | 10 ++++++----
2 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/full/Dockerfile b/full/Dockerfile
index ef43a4a..6d63e76 100644
--- a/full/Dockerfile
+++ b/full/Dockerfile
@@ -18,7 +18,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install openjdk-11-jre-headless gd
tesseract-ocr-eng tesseract-ocr-ita tesseract-ocr-fra tesseract-ocr-spa tesseract-ocr-deu
RUN echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | debconf-set-selections \
- && DEBIAN_FRONTEND=noninteractive apt-get install -y curl xfonts-utils fonts-freefont-ttf fonts-liberation ttf-mscorefonts-installer wget cabextract
+ && DEBIAN_FRONTEND=noninteractive apt-get install -y xfonts-utils fonts-freefont-ttf fonts-liberation ttf-mscorefonts-installer wget cabextract
FROM dependencies as fetch_tika
ARG TIKA_VERSION
@@ -29,12 +29,14 @@ ENV NEAREST_TIKA_SERVER_URL="https://www.apache.org/dyn/closer.cgi/tika/tika-ser
ARCHIVE_TIKA_SERVER_ASC_URL="https://archive.apache.org/dist/tika/tika-server-${TIKA_VERSION}.jar.asc" \
TIKA_VERSION=$TIKA_VERSION
-RUN DEBIAN_FRONTEND=noninteractive apt-get -y install gnupg2 curl wget \
- && curl -sSL https://www.apache.org/dist/tika/KEYS | gpg --import \
- && wget $NEAREST_TIKA_SERVER_URL -O /tika-server-${TIKA_VERSION}.jar || rm /tika-server-${TIKA_VERSION}.jar \
+RUN DEBIAN_FRONTEND=noninteractive apt-get -y install gnupg2 \
+ && wget -t 10 --max-redirect 1 --retry-connrefused -qO- https://www.apache.org/dist/tika/KEYS | gpg --import \
+ && wget -t 10 --max-redirect 1 --retry-connrefused $NEAREST_TIKA_SERVER_URL -O /tika-server-${TIKA_VERSION}.jar || rm /tika-server-${TIKA_VERSION}.jar \
&& sh -c "[ -f /tika-server-${TIKA_VERSION}.jar ]" || wget $ARCHIVE_TIKA_SERVER_URL -O /tika-server-${TIKA_VERSION}.jar || rm /tika-server-${TIKA_VERSION}.jar \
- && wget $DEFAULT_TIKA_SERVER_ASC_URL -O /tika-server-${TIKA_VERSION}.jar.asc || rm /tika-server-${TIKA_VERSION}.jar.asc \
+ && sh -c "[ -f /tika-server-${TIKA_VERSION}.jar ]" || exit 1 \
+ && wget -t 10 --max-redirect 1 --retry-connrefused $DEFAULT_TIKA_SERVER_ASC_URL -O /tika-server-${TIKA_VERSION}.jar.asc || rm /tika-server-${TIKA_VERSION}.jar.asc \
&& sh -c "[ -f /tika-server-${TIKA_VERSION}.jar.asc ]" || wget $ARCHIVE_TIKA_SERVER_ASC_URL -O /tika-server-${TIKA_VERSION}.jar.asc || rm /tika-server-${TIKA_VERSION}.jar.asc \
+ && sh -c "[ -f /tika-server-${TIKA_VERSION}.jar.asc ]" || exit 1 \
&& gpg --verify /tika-server-${TIKA_VERSION}.jar.asc /tika-server-${TIKA_VERSION}.jar
FROM dependencies as runtime
diff --git a/minimal/Dockerfile b/minimal/Dockerfile
index 6554be9..80da206 100644
--- a/minimal/Dockerfile
+++ b/minimal/Dockerfile
@@ -24,12 +24,14 @@ ENV NEAREST_TIKA_SERVER_URL="https://www.apache.org/dyn/closer.cgi/tika/tika-ser
ARCHIVE_TIKA_SERVER_ASC_URL="https://archive.apache.org/dist/tika/tika-server-${TIKA_VERSION}.jar.asc" \
TIKA_VERSION=$TIKA_VERSION
-RUN DEBIAN_FRONTEND=noninteractive apt-get -y install gnupg2 curl wget \
- && curl -sSL https://www.apache.org/dist/tika/KEYS | gpg --import \
- && wget $NEAREST_TIKA_SERVER_URL -O /tika-server-${TIKA_VERSION}.jar || rm /tika-server-${TIKA_VERSION}.jar \
+RUN DEBIAN_FRONTEND=noninteractive apt-get -y install gnupg2 wget \
+ && wget -t 10 --max-redirect 1 --retry-connrefused -qO- https://www.apache.org/dist/tika/KEYS | gpg --import \
+ && wget -t 10 --max-redirect 1 --retry-connrefused $NEAREST_TIKA_SERVER_URL -O /tika-server-${TIKA_VERSION}.jar || rm /tika-server-${TIKA_VERSION}.jar \
&& sh -c "[ -f /tika-server-${TIKA_VERSION}.jar ]" || wget $ARCHIVE_TIKA_SERVER_URL -O /tika-server-${TIKA_VERSION}.jar || rm /tika-server-${TIKA_VERSION}.jar \
- && wget $DEFAULT_TIKA_SERVER_ASC_URL -O /tika-server-${TIKA_VERSION}.jar.asc || rm /tika-server-${TIKA_VERSION}.jar.asc \
+ && sh -c "[ -f /tika-server-${TIKA_VERSION}.jar ]" || exit 1 \
+ && wget -t 10 --max-redirect 1 --retry-connrefused $DEFAULT_TIKA_SERVER_ASC_URL -O /tika-server-${TIKA_VERSION}.jar.asc || rm /tika-server-${TIKA_VERSION}.jar.asc \
&& sh -c "[ -f /tika-server-${TIKA_VERSION}.jar.asc ]" || wget $ARCHIVE_TIKA_SERVER_ASC_URL -O /tika-server-${TIKA_VERSION}.jar.asc || rm /tika-server-${TIKA_VERSION}.jar.asc \
+ && sh -c "[ -f /tika-server-${TIKA_VERSION}.jar.asc ]" || exit 1 \
&& gpg --verify /tika-server-${TIKA_VERSION}.jar.asc /tika-server-${TIKA_VERSION}.jar
FROM dependencies as runtime
[tika-docker] 06/28: Updated to support publish and error on failed
test
Posted by dm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dmeikle pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika-docker.git
commit 12432453246979dd8ffabac8563ac9b4f1f914c9
Author: David Meikle <da...@meikle.io>
AuthorDate: Mon Feb 3 17:56:39 2020 +0000
Updated to support publish and error on failed test
---
docker-tool.sh | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/docker-tool.sh b/docker-tool.sh
index 39e02c3..9386b83 100755
--- a/docker-tool.sh
+++ b/docker-tool.sh
@@ -38,8 +38,15 @@ test_docker_image() {
docker run -d --name "$1" -p 9998:9998 apache/tika:"$1"
sleep 10
curl http://localhost:9998/version
- docker kill "$1"
- docker rm "$1"
+ if [ $? -eq 0 ]
+ then
+ docker kill "$1"
+ docker rm "$1"
+ else
+ docker kill "$1"
+ docker rm "$1"
+ exit 1
+ fi
}
shift $((OPTIND -1))
@@ -55,14 +62,15 @@ case "$subcommand" in
;;
test)
- # Test minimal image
+ # Test the images
test_docker_image ${version}
- # Test full image
test_docker_image "${version}-full"
;;
publish)
- echo "Does nothing until we get Docker Hub access setup under Apache Organisation"
+ # Push the build images
+ docker push apache/tika:${version}
+ docker push apache/tika:${version}-full
;;
esac
[tika-docker] 27/28: Added no-cache to avoid stale APT archives
Posted by dm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dmeikle pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika-docker.git
commit 5e73c49d24ca822cce4ba2edb275693bada2fdea
Author: Dave Meikle <dm...@apache.org>
AuthorDate: Mon Nov 30 21:43:09 2020 +0000
Added no-cache to avoid stale APT archives
---
docker-tool.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/docker-tool.sh b/docker-tool.sh
index ab6c4fe..99a13a2 100755
--- a/docker-tool.sh
+++ b/docker-tool.sh
@@ -62,9 +62,9 @@ version=$1; shift
case "$subcommand" in
build)
# Build slim version with minimal dependencies
- docker build -t apache/tika:${version} --build-arg TIKA_VERSION=${version} - < minimal/Dockerfile
+ docker build -t apache/tika:${version} --build-arg TIKA_VERSION=${version} - < minimal/Dockerfile --no-cache
# Build full version with OCR, Fonts and GDAL
- docker build -t apache/tika:${version}-full --build-arg TIKA_VERSION=${version} - < full/Dockerfile
+ docker build -t apache/tika:${version}-full --build-arg TIKA_VERSION=${version} - < full/Dockerfile --no-cache
;;
test)
[tika-docker] 04/28: Updated CI config
Posted by dm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dmeikle pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika-docker.git
commit aad614956d5b1fa032122209b45a8949abb5c944
Author: David Meikle <dm...@apache.org>
AuthorDate: Thu Jan 9 03:23:36 2020 +0000
Updated CI config
---
.travis.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 913a0bc..c257e1a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,5 +5,5 @@ env:
- VERSION=1.23
- VERSION=1.22
script:
- - docker-tool.sh build $VERSION
- - docker-tool.sh test $VERSION
+ - ./docker-tool.sh build $VERSION
+ - ./docker-tool.sh test $VERSION
[tika-docker] 26/28: Updated for Apache Tika 1.25 release
Posted by dm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dmeikle pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika-docker.git
commit e96b937ae6b66b2b288f49ee2c8b951c50438c58
Author: David Meikle <dm...@apache.org>
AuthorDate: Mon Nov 30 21:28:56 2020 +0000
Updated for Apache Tika 1.25 release
---
.travis.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index b46c6ff..3cfdec8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,9 +2,9 @@ language: bash
services: docker
env:
matrix:
+ - VERSION=1.25
- VERSION=1.24.1
- VERSION=1.24
- - VERSION=1.23
script:
- ./docker-tool.sh build $VERSION
- ./docker-tool.sh test $VERSION
[tika-docker] 07/28: Updated docker-tool with improved test and
publish command
Posted by dm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dmeikle pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika-docker.git
commit f0d76ac92b4c7e2ea92f5c25a9709b13ec8e575c
Author: David Meikle <dm...@apache.org>
AuthorDate: Thu Feb 6 04:28:42 2020 +0000
Updated docker-tool with improved test and publish command
---
docker-tool.sh | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/docker-tool.sh b/docker-tool.sh
index 9386b83..c414d25 100755
--- a/docker-tool.sh
+++ b/docker-tool.sh
@@ -34,15 +34,20 @@ while getopts ":h" opt; do
esac
done
+
test_docker_image() {
docker run -d --name "$1" -p 9998:9998 apache/tika:"$1"
sleep 10
- curl http://localhost:9998/version
- if [ $? -eq 0 ]
+ url=http://localhost:9998/version
+ status=$(curl --head --location --connect-timeout 5 --write-out %{http_code} --silent --output /dev/null ${url})
+
+ if [[ $status == '200' ]]
then
+ echo "$(tput setaf 2)Image: apache/tika:${1} - Passed$(tput sgr0)"
docker kill "$1"
docker rm "$1"
else
+ echo "$(tput setaf 1)Image: apache/tika:${1} - Failed$(tput sgr0)"
docker kill "$1"
docker rm "$1"
exit 1
[tika-docker] 22/28: changed entrypoint to exec format
Posted by dm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dmeikle pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika-docker.git
commit f5e6a2ced02f93e83aa97dde4a41458eeaca35e4
Author: Schmitt Christian <c....@briefdomain.de>
AuthorDate: Tue Sep 1 18:22:56 2020 +0200
changed entrypoint to exec format
this also enables people to specify additional params, which is not possible in the current form:
https://docs.docker.com/engine/reference/builder/#entrypoint
> The shell form prevents any CMD or run command line arguments from being used, but has the disadvantage that your ENTRYPOINT will be started as a subcommand of /bin/sh -c, which does not pass signals. This means that the executable will not be the container’s PID 1 - and will not receive Unix signals - so your executable will not receive a SIGTERM from docker stop <container>.
---
full/Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/full/Dockerfile b/full/Dockerfile
index 0d93c72..e88aade 100644
--- a/full/Dockerfile
+++ b/full/Dockerfile
@@ -49,7 +49,7 @@ ENV TIKA_VERSION=$TIKA_VERSION
COPY --from=fetch_tika /tika-server-${TIKA_VERSION}.jar /tika-server-${TIKA_VERSION}.jar
EXPOSE 9998
-ENTRYPOINT java -jar /tika-server-${TIKA_VERSION}.jar -h 0.0.0.0
+ENTRYPOINT ["java", "-jar", "/tika-server-${TIKA_VERSION}.jar", "-h", "0.0.0.0"]
LABEL maintainer="Apache Tika Developers dev@tika.apache.org"
[tika-docker] 09/28: Added script to republish old images for
migration
Posted by dm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dmeikle pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika-docker.git
commit dede6372b5ffff2c5a47d20888b7cd79a89eb9d8
Author: David Meikle <dm...@apache.org>
AuthorDate: Thu Feb 6 04:32:42 2020 +0000
Added script to republish old images for migration
---
republish-images.sh | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 71 insertions(+)
diff --git a/republish-images.sh b/republish-images.sh
new file mode 100755
index 0000000..9c5499d
--- /dev/null
+++ b/republish-images.sh
@@ -0,0 +1,71 @@
+#!/usr/bin/env bash
+
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+
+##
+## Helper script to allow a republish of all versions released so far.
+## This was used to support the original seeding of the DockerHub repo
+##
+
+# Early releases on JRE 8
+for i in {6..13};
+do
+ docker build -t apache/tika:"1.$i" --build-arg TIKA_VERSION="1.$i" --build-arg JRE=openjdk-8-jre-headless - < minimal/Dockerfile
+ docker build -t apache/tika:"1.$i"-full --build-arg TIKA_VERSION="1.$i" --build-arg JRE=openjdk-8-jre-headless - < full/Dockerfile
+ ./docker-tool.sh test "1.$i"
+ if [ $? -eq 0 ]
+ then
+ ./docker-tool.sh publish "1.$i"
+ else
+ echo "Failed to test and publish version ${1.$i}"
+ echo "$(tput setaf 1)Failed to test and publish image : apache/tika:${1.$i}$(tput sgr0)"
+ exit 1
+ fi
+done;
+
+# Signing issues on these release where public key is not available
+for i in {14..19};
+do
+ docker build -t apache/tika:"1.$i" --build-arg TIKA_VERSION="1.$i" --build-arg JRE=openjdk-8-jre-headless --build-arg CHECK_SIG=false - < minimal/Dockerfile
+ docker build -t apache/tika:"1.$i"-full --build-arg TIKA_VERSION="1.$i" --build-arg JRE=openjdk-8-jre-headless --build-arg CHECK_SIG=false - < full/Dockerfile
+ ./docker-tool.sh test "1.$i"
+ if [ $? -eq 0 ]
+ then
+ ./docker-tool.sh publish "1.$i"
+ else
+ echo "Failed to test and publish version ${1.$i}"
+ echo "$(tput setaf 1)Failed to test and publish image : apache/tika:${1.$i}$(tput sgr0)"
+ exit 1
+ fi
+done;
+
+# Moved to JRE 11 by default
+for i in {20..23};
+do
+ ./docker-tool.sh build "1.$i"
+ ./docker-tool.sh test "1.$i"
+ if [ $? -eq 0 ]
+ then
+ ./docker-tool.sh publish "1.$i"
+ else
+ echo "Failed to test and publish version ${1.$i}"
+ echo "$(tput setaf 1)Failed to test and publish image : apache/tika:${1.$i}$(tput sgr0)"
+ exit 1
+ fi
+done;
\ No newline at end of file
[tika-docker] 12/28: Updated to include LICENCE and revised wording
Posted by dm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dmeikle pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika-docker.git
commit c6317789c5e714ab7096949d9ae56e740ba0f8a5
Author: Dave Meikle <dm...@apache.org>
AuthorDate: Thu Feb 6 04:47:52 2020 +0000
Updated to include LICENCE and revised wording
---
README.md | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 34eafa5..44acd3c 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
# tika-docker [](https://travis-ci.org/apache/tika-docker)
-This repo is used to create convenience Docker images published on [DockerHub](https://hub.docker.com/r/apache/tika) by the [Apache Tika](http://tika.apache.org) Dev team for Apache Tika Server.
+This repo is used to create convenience Docker images for Apache Tika Server published as [apache/tika](https://hub.docker.com/r/apache/tika) on DockerHub by the [Apache Tika](http://tika.apache.org) Dev team
The images create a functional Apache Tika Server instance that contains the latest Ubuntu running the appropriate version's server on Port 9998 using Java 8 (until version 1.20) and then Java 11 (1.21 and above).
@@ -58,7 +58,20 @@ There have been a range of [contributors](https://github.com/apache/tika-docker/
- [@mpdude](https://github.com/mpdude)
- [@laszlocsontosuw](https://github.com/laszlocsontosuw)
+## Licence
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
## Disclaimer
It is worth noting that whilst these Docker images download the binary JARs published by the Apache Tika Team on the Apache Software Foundation distribution sites, only the source release of an Apache Software Foundation project is an official release artefact. See [Release Distribution Policy](https://www.apache.org/dev/release-distribution.html) for more details.
[tika-docker] 14/28: Updated docker-tool.sh help banner
Posted by dm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dmeikle pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika-docker.git
commit df8b7b7c93139f89d38410dccca0b7846c3a55ea
Author: Dave Meikle <dm...@apache.org>
AuthorDate: Thu Feb 6 05:06:14 2020 +0000
Updated docker-tool.sh help banner
---
docker-tool.sh | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/docker-tool.sh b/docker-tool.sh
index e60569d..ab6c4fe 100755
--- a/docker-tool.sh
+++ b/docker-tool.sh
@@ -22,9 +22,10 @@ while getopts ":h" opt; do
h )
echo "Usage:"
echo " docker-tool.sh -h Display this help message."
- echo " docker-tool.sh build <TIKA_VERSION> Builds image(s) for <TIKA_VERSION>."
- echo " docker-tool.sh test <TIKA_VERSION> Tests image(s) for <TIKA_VERSION>."
- echo " docker-tool.sh publish <TIKA_VERSION> Publishes image(s) for <TIKA_VERSION> to Docker Hub."
+ 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."
exit 0
;;
\? )
[tika-docker] 28/28: Merge pull request #1 from
schmitch/schmitch-entrypoint
Posted by dm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dmeikle pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika-docker.git
commit 1350d8c9634a4cff972d8035267e2c03f4d5a8cf
Merge: 5e73c49 f153bf0
Author: Dave Meikle <dm...@apache.org>
AuthorDate: Mon Nov 30 21:50:32 2020 +0000
Merge pull request #1 from schmitch/schmitch-entrypoint
changed entrypoint to exec format
full/Dockerfile | 2 +-
minimal/Dockerfile | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
[tika-docker] 08/28: Updated Dockerfiles to allow JRE and checking
of signatures to be parameterised
Posted by dm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dmeikle pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika-docker.git
commit 73cd4bc04e69e487d0e30624febba0a244ce5c66
Author: David Meikle <dm...@apache.org>
AuthorDate: Thu Feb 6 04:29:43 2020 +0000
Updated Dockerfiles to allow JRE and checking of signatures to be parameterised
---
full/Dockerfile | 12 ++++++++----
minimal/Dockerfile | 10 +++++++---
2 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/full/Dockerfile b/full/Dockerfile
index 6d63e76..c3ca154 100644
--- a/full/Dockerfile
+++ b/full/Dockerfile
@@ -13,8 +13,9 @@ FROM ubuntu:bionic as base
RUN apt-get update
FROM base as dependencies
+ARG JRE='openjdk-11-jre-headless'
-RUN DEBIAN_FRONTEND=noninteractive apt-get -y install openjdk-11-jre-headless gdal-bin tesseract-ocr \
+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 echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | debconf-set-selections \
@@ -22,6 +23,7 @@ RUN echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula selec
FROM dependencies as fetch_tika
ARG TIKA_VERSION
+ARG CHECK_SIG=true
ENV NEAREST_TIKA_SERVER_URL="https://www.apache.org/dyn/closer.cgi/tika/tika-server-${TIKA_VERSION}.jar?filename=tika/tika-server-${TIKA_VERSION}.jar&action=download" \
ARCHIVE_TIKA_SERVER_URL="https://archive.apache.org/dist/tika/tika-server-${TIKA_VERSION}.jar" \
@@ -29,15 +31,16 @@ ENV NEAREST_TIKA_SERVER_URL="https://www.apache.org/dyn/closer.cgi/tika/tika-ser
ARCHIVE_TIKA_SERVER_ASC_URL="https://archive.apache.org/dist/tika/tika-server-${TIKA_VERSION}.jar.asc" \
TIKA_VERSION=$TIKA_VERSION
-RUN DEBIAN_FRONTEND=noninteractive apt-get -y install gnupg2 \
+RUN DEBIAN_FRONTEND=noninteractive apt-get -y install gnupg2 wget \
&& wget -t 10 --max-redirect 1 --retry-connrefused -qO- https://www.apache.org/dist/tika/KEYS | gpg --import \
&& wget -t 10 --max-redirect 1 --retry-connrefused $NEAREST_TIKA_SERVER_URL -O /tika-server-${TIKA_VERSION}.jar || rm /tika-server-${TIKA_VERSION}.jar \
&& sh -c "[ -f /tika-server-${TIKA_VERSION}.jar ]" || wget $ARCHIVE_TIKA_SERVER_URL -O /tika-server-${TIKA_VERSION}.jar || rm /tika-server-${TIKA_VERSION}.jar \
&& sh -c "[ -f /tika-server-${TIKA_VERSION}.jar ]" || exit 1 \
&& wget -t 10 --max-redirect 1 --retry-connrefused $DEFAULT_TIKA_SERVER_ASC_URL -O /tika-server-${TIKA_VERSION}.jar.asc || rm /tika-server-${TIKA_VERSION}.jar.asc \
&& sh -c "[ -f /tika-server-${TIKA_VERSION}.jar.asc ]" || wget $ARCHIVE_TIKA_SERVER_ASC_URL -O /tika-server-${TIKA_VERSION}.jar.asc || rm /tika-server-${TIKA_VERSION}.jar.asc \
- && sh -c "[ -f /tika-server-${TIKA_VERSION}.jar.asc ]" || exit 1 \
- && gpg --verify /tika-server-${TIKA_VERSION}.jar.asc /tika-server-${TIKA_VERSION}.jar
+ && sh -c "[ -f /tika-server-${TIKA_VERSION}.jar.asc ]" || exit 1;
+
+RUN if [ "$CHECK_SIG" = "true" ] ; then gpg --verify /tika-server-${TIKA_VERSION}.jar.asc /tika-server-${TIKA_VERSION}.jar; fi
FROM dependencies as runtime
RUN apt-get clean -y && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
@@ -49,3 +52,4 @@ EXPOSE 9998
ENTRYPOINT java -jar /tika-server-${TIKA_VERSION}.jar -h 0.0.0.0
LABEL maintainer="Apache Tika Developers dev@tika.apache.org"
+
diff --git a/minimal/Dockerfile b/minimal/Dockerfile
index 80da206..11fc925 100644
--- a/minimal/Dockerfile
+++ b/minimal/Dockerfile
@@ -13,10 +13,13 @@ FROM ubuntu:bionic as base
RUN apt-get update
FROM base as dependencies
-RUN DEBIAN_FRONTEND=noninteractive apt-get -y install openjdk-11-jre-headless
+ARG JRE='openjdk-11-jre-headless'
+
+RUN DEBIAN_FRONTEND=noninteractive apt-get -y install $JRE
FROM dependencies as fetch_tika
ARG TIKA_VERSION
+ARG CHECK_SIG=true
ENV NEAREST_TIKA_SERVER_URL="https://www.apache.org/dyn/closer.cgi/tika/tika-server-${TIKA_VERSION}.jar?filename=tika/tika-server-${TIKA_VERSION}.jar&action=download" \
ARCHIVE_TIKA_SERVER_URL="https://archive.apache.org/dist/tika/tika-server-${TIKA_VERSION}.jar" \
@@ -31,8 +34,9 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install gnupg2 wget \
&& sh -c "[ -f /tika-server-${TIKA_VERSION}.jar ]" || exit 1 \
&& wget -t 10 --max-redirect 1 --retry-connrefused $DEFAULT_TIKA_SERVER_ASC_URL -O /tika-server-${TIKA_VERSION}.jar.asc || rm /tika-server-${TIKA_VERSION}.jar.asc \
&& sh -c "[ -f /tika-server-${TIKA_VERSION}.jar.asc ]" || wget $ARCHIVE_TIKA_SERVER_ASC_URL -O /tika-server-${TIKA_VERSION}.jar.asc || rm /tika-server-${TIKA_VERSION}.jar.asc \
- && sh -c "[ -f /tika-server-${TIKA_VERSION}.jar.asc ]" || exit 1 \
- && gpg --verify /tika-server-${TIKA_VERSION}.jar.asc /tika-server-${TIKA_VERSION}.jar
+ && sh -c "[ -f /tika-server-${TIKA_VERSION}.jar.asc ]" || exit 1;
+
+RUN if [ "$CHECK_SIG" = "true" ] ; then gpg --verify /tika-server-${TIKA_VERSION}.jar.asc /tika-server-${TIKA_VERSION}.jar; fi
FROM dependencies as runtime
RUN apt-get clean -y && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
[tika-docker] 10/28: Added latest command for tagging version as
latest in DockerHub
Posted by dm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dmeikle pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika-docker.git
commit 973704db717ed3f09ea05d75f1b7fe1df8e46be7
Author: David Meikle <dm...@apache.org>
AuthorDate: Thu Feb 6 04:39:33 2020 +0000
Added latest command for tagging version as latest in DockerHub
---
docker-tool.sh | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/docker-tool.sh b/docker-tool.sh
index c414d25..e60569d 100755
--- a/docker-tool.sh
+++ b/docker-tool.sh
@@ -78,4 +78,12 @@ case "$subcommand" in
docker push apache/tika:${version}-full
;;
+ latest)
+ # Update the latest tags to point to supplied version
+ docker tag apache/tika:${version} apache/tika:latest
+ docker push apache/tika:latest
+ docker tag apache/tika:${version}-full apache/tika:latest-full
+ docker push apache/tika:latest-full
+ ;;
+
esac