Merge remote-tracking branch 'origin/master'
diff --git a/.env b/.env
index 936c272..1e40c19 100644
--- a/.env
+++ b/.env
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-TAG=2.5.0.3
\ No newline at end of file
+TAG=2.6.0.1
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index e884745..ad59c24 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@
env:
matrix:
- - TIKA_DOCKER_VERSION=2.5.0.3 TIKA_VERSION=2.5.0
+ - TIKA_DOCKER_VERSION=2.6.0.1 TIKA_VERSION=2.6.0
script:
- ./docker-tool.sh build $TIKA_DOCKER_VERSION $TIKA_VERSION
diff --git a/README.md b/README.md
index f690bb9..a002220 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,8 @@
## Available Tags
Below are the most recent 2.x series tags:
+- `latest`, `2.6.0.0`: Apache Tika Server 2.5.0.2 (Minimal)
+- `latest-full`, `2.6.0.0-full`: Apache Tika Server 2.5.0.2 (Full)
- `latest`, `2.5.0.2`: Apache Tika Server 2.5.0.2 (Minimal)
- `latest-full`, `2.5.0.2-full`: Apache Tika Server 2.5.0.2 (Full)
- `2.5.0.1`: Apache Tika Server 2.5.0.1 (Minimal)
