Kouhei Sutou 2019-03-25 19:01:04 +0900 (Mon, 25 Mar 2019) Revision: fa7b37858c5e8cec0c9531f65113f57376bb6510 https://github.com/ranguba/chupa-text-docker/commit/fa7b37858c5e8cec0c9531f65113f57376bb6510 Message: Update But it doesn't work yet. Modified files: chupa-text.env chupa-text/Dockerfile chupa-text/home/chupa-text/chupa-text-http-server/Gemfile.local chupa-text/home/chupa-text/chupa-text-http-server/start.sh docker-compose.yml proxy/Dockerfile Modified: chupa-text.env (+4 -1) =================================================================== --- chupa-text.env 2017-07-12 17:12:09 +0900 (0e7b0fb) +++ chupa-text.env 2019-03-25 19:01:04 +0900 (075e53b) @@ -4,7 +4,10 @@ # Limit for the max address (virtual memory) size in byte. # CHUPA_TEXT_EXTERNAL_COMMAND_LIMIT_AS=2GB -# Timeout of for generating screenshot by chupa-text-decomposer-webkit +# Timeout for extracting text by external command in second. +# CHUPA_TEXT_EXTERNAL_COMMAND_TIMEOUT=10 + +# Timeout for generating screenshot by chupa-text-decomposer-webkit # in second. # CHUPA_TEXT_DECOMPOSER_WEBKIT_TIMEOUT=10 Modified: chupa-text/Dockerfile (+4 -7) =================================================================== --- chupa-text/Dockerfile 2017-07-12 17:12:09 +0900 (ffacd86) +++ chupa-text/Dockerfile 2019-03-25 19:01:04 +0900 (16fb479) @@ -1,4 +1,4 @@ -# Copyright (C) 2017 Kouhei Sutou <kou****@clear*****> +# Copyright (C) 2017-2019 Kouhei Sutou <kou****@clear*****> # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -14,10 +14,10 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -FROM ubuntu:17.04 +FROM ubuntu:18.04 MAINTAINER groonga -RUN ln -fs /usr/share/zoneinfo/Asia/Tokyo /etc/localtime +RUN ln -fs /usr/share/zoneinfo/UTC /etc/localtime RUN \ apt update && \ @@ -30,12 +30,9 @@ RUN \ git \ libapr1-dev \ libaprutil1-dev \ - libcurl4-openssl-dev \ libreoffice \ - libssl-dev \ make \ nodejs \ - nodejs-legacy \ npm \ ruby \ ruby-dev \ @@ -64,7 +61,7 @@ WORKDIR /home/chupa-text ENV \ RAILS_ENV=production \ - PATH=/var/lib/gems/2.3.0/bin:$PATH + PATH=/var/lib/gems/2.5.0/bin:$PATH ENV LOCAL_CHUPA_TEXT_REVISION_FOR_UPDATE_DOCKER=4 RUN git clone --depth 1 https://github.com/ranguba/chupa-text-http-server.git Modified: chupa-text/home/chupa-text/chupa-text-http-server/Gemfile.local (+4 -2) =================================================================== --- chupa-text/home/chupa-text/chupa-text-http-server/Gemfile.local 2017-07-12 17:12:09 +0900 (d435176) +++ chupa-text/home/chupa-text/chupa-text-http-server/Gemfile.local 2019-03-25 19:01:04 +0900 (7b9923c) @@ -1,6 +1,6 @@ # -*- ruby -*- # -# Copyright (C) 2017 Kouhei Sutou <kou****@clear*****> +# Copyright (C) 2017-2019 Kouhei Sutou <kou****@clear*****> # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -18,5 +18,7 @@ gem "chupa-text-decomposer-html" gem "chupa-text-decomposer-webkit" -gem "chupa-text-decomposer-libreoffice" +gem "chupa-text-decomposer-libreoffice-excel" +gem "chupa-text-decomposer-libreoffice-powerpoint" +gem "chupa-text-decomposer-libreoffice-word" gem "chupa-text-decomposer-pdf" Modified: chupa-text/home/chupa-text/chupa-text-http-server/start.sh (+2 -2) =================================================================== --- chupa-text/home/chupa-text/chupa-text-http-server/start.sh 2017-07-12 17:12:09 +0900 (d6755af) +++ chupa-text/home/chupa-text/chupa-text-http-server/start.sh 2019-03-25 19:01:04 +0900 (7a4fed3) @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2017 Kouhei Sutou <kou****@clear*****> +# Copyright (C) 2017-2019 Kouhei Sutou <kou****@clear*****> # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -19,7 +19,7 @@ set -e set -u -sudo -H chown -R $(id --name --user):$(id --name --group) log +sudo -H chown -R $(id --name --user): log (echo "production:"; \ echo " secret_key_base: $(bin/rails secret)") > \ Modified: docker-compose.yml (+1 -1) =================================================================== --- docker-compose.yml 2017-07-12 17:12:09 +0900 (4ff5790) +++ docker-compose.yml 2019-03-25 19:01:04 +0900 (85947a9) @@ -1,4 +1,4 @@ -# Copyright (C) 2017 Kouhei Sutou <kou****@clear*****> +# Copyright (C) 2017-2019 Kouhei Sutou <kou****@clear*****> # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public Modified: proxy/Dockerfile (+3 -3) =================================================================== --- proxy/Dockerfile 2017-07-12 17:12:09 +0900 (5573995) +++ proxy/Dockerfile 2019-03-25 19:01:04 +0900 (1004f00) @@ -1,4 +1,4 @@ -# Copyright (C) 2017 Kouhei Sutou <kou****@clear*****> +# Copyright (C) 2017-2019 Kouhei Sutou <kou****@clear*****> # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -14,10 +14,10 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -FROM ubuntu:17.04 +FROM ubuntu:18.04 MAINTAINER groonga -RUN ln -fs /usr/share/zoneinfo/Asia/Tokyo /etc/localtime +RUN ln -fs /usr/share/zoneinfo/UTC /etc/localtime RUN \ apt update && \ -------------- next part -------------- An HTML attachment was scrubbed... URL: <https://lists.osdn.me/mailman/archives/groonga-commit/attachments/20190325/4d441e48/attachment-0001.html>
