You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ma...@apache.org on 2017/11/21 17:15:26 UTC

[tika] branch master updated: Remove docker files now present in https://github.com/USCDataScience/tika-dockers

This is an automated email from the ASF dual-hosted git repository.

mattmann pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika.git


The following commit(s) were added to refs/heads/master by this push:
     new 3ee0aff  Remove docker files now present in https://github.com/USCDataScience/tika-dockers
3ee0aff is described below

commit 3ee0aff615f49ae9c2678afa2c27a1737a329dcb
Author: Chris Mattmann <ch...@jpl.nasa.gov>
AuthorDate: Tue Nov 21 09:13:09 2017 -0800

    Remove docker files now present in https://github.com/USCDataScience/tika-dockers
---
 .../tika/parser/captioning/tf/Im2txtRestDockerfile |  60 ------------
 .../tika/parser/recognition/tf/BaseTFDockerfile    |  50 ----------
 .../parser/recognition/tf/InceptionRestDockerfile  |  53 ----------
 .../recognition/tf/InceptionVideoRestDockerfile    | 108 ---------------------
 4 files changed, 271 deletions(-)

diff --git a/tika-parsers/src/main/resources/org/apache/tika/parser/captioning/tf/Im2txtRestDockerfile b/tika-parsers/src/main/resources/org/apache/tika/parser/captioning/tf/Im2txtRestDockerfile
deleted file mode 100644
index 1d9016d..0000000
--- a/tika-parsers/src/main/resources/org/apache/tika/parser/captioning/tf/Im2txtRestDockerfile
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# 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.
-#
-
-FROM uscdatascience/tf-tika-base
-MAINTAINER Apache Tika Team
-
-# Download the pretrained im2txt checkpoint
-WORKDIR /usr/share/apache-tika/models/dl/image/caption/
-
-RUN echo "We're downloading the checkpoint file for image captioning, the shell might look unresponsive. Please be patient."  && \
-    # To get rid of early EOF error
-    git config --global http.postBuffer 1048576000 && \
-    git clone https://github.com/USCDataScience/img2text.git && \
-    # Join the parts
-    cat img2text/models/1M_iters_ckpt_parts_* >1M_iters_ckpt.tar.gz && \
-    tar -xzvf 1M_iters_ckpt.tar.gz && rm -rf 1M_iters_ckpt.tar.gz
-
-RUN curl -O https://raw.githubusercontent.com/apache/tika/master/tika-parsers/src/main/resources/org/apache/tika/parser/captioning/tf/model_info.xml
-
-# Download server related source files
-WORKDIR /usr/share/apache-tika/src/dl/image/caption/
-
-RUN curl -O https://raw.githubusercontent.com/ThejanW/tika/master/tika-parsers/src/main/resources/org/apache/tika/parser/captioning/tf/caption_generator.py && \
-    curl -O https://raw.githubusercontent.com/ThejanW/tika/master/tika-parsers/src/main/resources/org/apache/tika/parser/captioning/tf/im2txtapi.py && \
-    curl -O https://raw.githubusercontent.com/ThejanW/tika/master/tika-parsers/src/main/resources/org/apache/tika/parser/captioning/tf/model_wrapper.py && \
-    curl -O https://raw.githubusercontent.com/ThejanW/tika/master/tika-parsers/src/main/resources/org/apache/tika/parser/captioning/tf/vocabulary.py && \
-    chmod +x im2txtapi.py
-
-WORKDIR /
-
-# Remove unnecessary packages comes with base
-RUN apt-get -y remove \
-        apt-utils \
-        curl \
-        git \
-        software-properties-common \
-        unzip \
-        wget
-
-# Add symbolic link to im2txtapi.py
-RUN ln -s /usr/share/apache-tika/src/dl/image/caption/im2txtapi.py /usr/bin/im2txtapi
-
-# expose API port, this is the default port
-EXPOSE 8764
-
-CMD im2txtapi
diff --git a/tika-parsers/src/main/resources/org/apache/tika/parser/recognition/tf/BaseTFDockerfile b/tika-parsers/src/main/resources/org/apache/tika/parser/recognition/tf/BaseTFDockerfile
deleted file mode 100644
index b2cc411..0000000
--- a/tika-parsers/src/main/resources/org/apache/tika/parser/recognition/tf/BaseTFDockerfile
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# 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.
-#
-
-FROM ubuntu:16.04
-MAINTAINER Apache Tika Team
-
-RUN apt-get update && apt-get install -y --no-install-recommends \
-        apt-utils \
-        curl \
-        git \
-        python \
-        python2.7-dev \
-        software-properties-common \
-        unzip \
-        wget \
-        && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
-
-# Install pip
-RUN curl -O https://bootstrap.pypa.io/get-pip.py && \
-    python get-pip.py && \
-    rm get-pip.py
-
-# Install basic python requirements
-RUN pip --no-cache-dir install \
-        flask \
-        numpy \
-        pillow \
-        requests
-
-# Install tensorflow:1.3.0 for python 2.7
-ENV TF_BINARY_URL https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.4.0-cp27-none-linux_x86_64.whl
-RUN pip --no-cache-dir install $TF_BINARY_URL
-
-CMD ["python"]
\ No newline at end of file
diff --git a/tika-parsers/src/main/resources/org/apache/tika/parser/recognition/tf/InceptionRestDockerfile b/tika-parsers/src/main/resources/org/apache/tika/parser/recognition/tf/InceptionRestDockerfile
deleted file mode 100644
index 355c262..0000000
--- a/tika-parsers/src/main/resources/org/apache/tika/parser/recognition/tf/InceptionRestDockerfile
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# 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.
-#
-
-FROM uscdatascience/tf-tika-base
-MAINTAINER Apache Tika Team
-
-# Download the pretrained inception v4 checkpoint & other meta files
-WORKDIR /usr/share/apache-tika/models/dl/image-video/recognition/
-
-RUN curl -O http://download.tensorflow.org/models/inception_v4_2016_09_09.tar.gz && \
-    tar -xzvf inception_v4_2016_09_09.tar.gz && rm -rf inception_v4_2016_09_09.tar.gz && \
-    curl -O https://raw.githubusercontent.com/tensorflow/models/master/research/inception/inception/data/imagenet_lsvrc_2015_synsets.txt && \
-    curl -O https://raw.githubusercontent.com/tensorflow/models/master/research/inception/inception/data/imagenet_metadata.txt
-
-# Download server related source files
-WORKDIR /usr/share/apache-tika/src/dl/image-video/recognition/
-
-RUN curl -O https://raw.githubusercontent.com/ThejanW/tika/master/tika-parsers/src/main/resources/org/apache/tika/parser/recognition/tf/inceptionapi.py && \
-    curl -O https://raw.githubusercontent.com/ThejanW/tika/master/tika-parsers/src/main/resources/org/apache/tika/parser/recognition/tf/inception_v4.py && \
-    chmod +x inceptionapi.py
-
-WORKDIR /
-
-# Remove unnecessary packages comes with base
-RUN apt-get -y remove \
-        apt-utils \
-        curl \
-        git \
-        software-properties-common \
-        unzip \
-        wget
-
-# Add symbolic link to inceptionapi.py
-RUN ln -s /usr/share/apache-tika/src/dl/image-video/recognition/inceptionapi.py /usr/bin/inceptionapi
-
-# Expose API port, this is the default port
-EXPOSE 8764
-
-CMD inceptionapi
\ No newline at end of file
diff --git a/tika-parsers/src/main/resources/org/apache/tika/parser/recognition/tf/InceptionVideoRestDockerfile b/tika-parsers/src/main/resources/org/apache/tika/parser/recognition/tf/InceptionVideoRestDockerfile
deleted file mode 100644
index 3670451..0000000
--- a/tika-parsers/src/main/resources/org/apache/tika/parser/recognition/tf/InceptionVideoRestDockerfile
+++ /dev/null
@@ -1,108 +0,0 @@
-#
-# 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.
-#
-
-FROM uscdatascience/tf-tika-base
-MAINTAINER Apache Tika Team
-
-RUN apt-get update && apt-get install -y --no-install-recommends \
-      build-essential \
-      cmake \
-      libavcodec-dev \
-      libavformat-dev \
-      libswscale-dev \
-      libv4l-dev \
-      libavutil-dev \
-      pkg-config \
-      && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
-
-# Download OpenCV + OpenCV_Contrib
-WORKDIR /usr/local/src
-
-RUN \
-      wget -O opencv.zip https://github.com/opencv/opencv/archive/3.2.0.zip && \
-      unzip opencv.zip && \
-      wget -O opencv_contrib.zip https://github.com/opencv/opencv_contrib/archive/3.2.0.zip && \
-      unzip opencv_contrib.zip
-
-# Build + Install OpenCV
-RUN mkdir -p opencv-3.2.0/build
-WORKDIR /usr/local/src/opencv-3.2.0/build
-RUN cmake -D CMAKE_BUILD_TYPE=RELEASE \
-      -D CMAKE_INSTALL_PREFIX=/usr/local \
-      -D OPENCV_EXTRA_MODULES_PATH=../../opencv_contrib-3.2.0/modules \
-      -D BUILD_PYTHON_SUPPORT=ON \
-      -D BUILD_EXAMPLES=OFF \
-      -D PYTHON_DEFAULT_EXECUTABLE=/usr/bin/python3 \
-      -D BUILD_opencv_python3=OFF \
-      -D BUILD_opencv_python2=ON \
-      -D WITH_IPP=OFF \
-      -D WITH_FFMPEG=ON \
-      -D WITH_V4L=ON ..
-
-RUN make -j$(nproc) && make install
-
-# Download the pretrained inception v4 checkpoint & other meta files
-WORKDIR /usr/share/apache-tika/models/dl/image-video/recognition/
-
-RUN curl -O http://download.tensorflow.org/models/inception_v4_2016_09_09.tar.gz && \
-    tar -xzvf inception_v4_2016_09_09.tar.gz && rm -rf inception_v4_2016_09_09.tar.gz && \
-    curl -O https://raw.githubusercontent.com/tensorflow/models/master/research/inception/inception/data/imagenet_lsvrc_2015_synsets.txt && \
-    curl -O https://raw.githubusercontent.com/tensorflow/models/master/research/inception/inception/data/imagenet_metadata.txt
-
-# Download server related source files
-WORKDIR /usr/share/apache-tika/src/dl/image-video/recognition/
-
-RUN curl -O https://raw.githubusercontent.com/ThejanW/tika/master/tika-parsers/src/main/resources/org/apache/tika/parser/recognition/tf/inceptionapi.py && \
-    curl -O https://raw.githubusercontent.com/ThejanW/tika/master/tika-parsers/src/main/resources/org/apache/tika/parser/recognition/tf/inception_v4.py && \
-    curl -O https://raw.githubusercontent.com/ThejanW/tika/master/tika-parsers/src/main/resources/org/apache/tika/parser/recognition/tf/video_util.py && \
-    chmod +x inceptionapi.py
-
-WORKDIR /
-
-# Remove unnecessary packages comes with base
-RUN apt-get -y remove \
-        apt-utils \
-        curl \
-        git \
-        software-properties-common \
-        unzip \
-        wget
-
-# Remove unnecessary packages
-RUN apt-get -y remove \
-      apt-utils \
-      build-essential \
-      cmake \
-      libavcodec-dev \
-      libavformat-dev \
-      libswscale-dev \
-      libv4l-dev \
-      libavutil-dev \
-      pkg-config
-
-# Delete OpenCV source files
-RUN rm -rf /usr/local/src
-
-# Add symbolic link to inceptionapi.py
-RUN ln -s /usr/share/apache-tika/src/dl/image-video/recognition/inceptionapi.py /usr/bin/inceptionapi
-
-# Expose API port, this is the default port
-EXPOSE 8764
-
-CMD inceptionapi
\ No newline at end of file

-- 
To stop receiving notification emails like this one, please contact
['"commits@tika.apache.org" <co...@tika.apache.org>'].