[Groonga-commit] ranguba/chupa-text-docker at 5b5cb1a [master] Support env_file

Back to archive index

Kouhei Sutou null+****@clear*****
Wed Jul 12 15:24:52 JST 2017


Kouhei Sutou	2017-07-12 15:24:52 +0900 (Wed, 12 Jul 2017)

  New Revision: 5b5cb1a24a1db6565711b3b9170c7a64591965b5
  https://github.com/ranguba/chupa-text-docker/commit/5b5cb1a24a1db6565711b3b9170c7a64591965b5

  Message:
    Support env_file

  Added files:
    chupa-text.env
  Modified files:
    chupa-text/Dockerfile
    docker-compose.yml

  Added: chupa-text.env (+13 -0) 100644
===================================================================
--- /dev/null
+++ chupa-text.env    2017-07-12 15:24:52 +0900 (0e7b0fb)
@@ -0,0 +1,13 @@
+# Limit for the max CPU time in second.
+# CHUPA_TEXT_EXTERNAL_COMMAND_LIMIT_CPU=5
+
+# 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
+# in second.
+# CHUPA_TEXT_DECOMPOSER_WEBKIT_TIMEOUT=10
+
+# Enable in-process mode for chupa-text-decomposer-webkit.
+# It's not recommended for now.
+# CHUPA_TEXT_DECOMPOSER_WEBKIT_IN_PROCESS=yes

  Modified: chupa-text/Dockerfile (+2 -1)
===================================================================
--- chupa-text/Dockerfile    2017-07-12 10:48:10 +0900 (7a575c0)
+++ chupa-text/Dockerfile    2017-07-12 15:24:52 +0900 (9799a78)
@@ -66,6 +66,7 @@ ENV \
   RAILS_ENV=production \
   PATH=/var/lib/gems/2.3.0/bin:$PATH
 
+ENV LOCAL_CHUPA_TEXT_REVISION_FOR_UPDATE_DOCKER=3
 RUN git clone --depth 1 https://github.com/ranguba/chupa-text-http-server.git
 
 COPY \
@@ -83,6 +84,6 @@ RUN \
   sudo rm -rf /var/cache/apt/archives/*
 
 RUN \
-  RAILS_ENV=production bin/rails assets:precompile
+  bin/rails assets:precompile
 
 CMD /bin/bash

  Modified: docker-compose.yml (+2 -0)
===================================================================
--- docker-compose.yml    2017-07-12 10:48:10 +0900 (2c98de6)
+++ docker-compose.yml    2017-07-12 15:24:52 +0900 (4ff5790)
@@ -39,6 +39,8 @@ services:
       http_proxy: http://proxy:3128/
       https_proxy: http://proxy:3128/
       RAILS_SERVE_STATIC_FILES: "true"
+    env_file:
+      - chupa-text.env
     volumes:
       - /var/log/chupa-text/rails:/home/chupa-text/chupa-text-http-server/log:z
     depends_on:
-------------- next part --------------
HTML����������������������������...
Download 



More information about the Groonga-commit mailing list
Back to archive index