Merge branch 'main' into tika-container

Author: nabeta

.env.template

@@ -13,6 +13,9 @@ SOLR_URL=http://solr:8983/solr/enju_leaf_${RAILS_ENV}
 
 TIKA_URL=http://tika:9998
 
+MINIO_ROOT_USER=enju
+MINIO_ROOT_PASSWORD=password
+
 ENJU_LEAF_BIND_ADDRESS=127.0.0.1
 ENJU_LEAF_BASE_URL=http://localhost:8080
 ENJU_LEAF_DEFAULT_LOCALE=ja

config/environments/production.rb

@@ -38,7 +38,7 @@
   # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
 
   # Store uploaded files on the local file system (see config/storage.yml for options).
-  config.active_storage.service = :local
+  config.active_storage.service = :minio
 
   # Mount Action Cable outside main process or domain.
   # config.action_cable.mount_path = nil

config/storage.yml

@@ -11,7 +11,7 @@ minio:
   access_key_id: <%= ENV['MINIO_ROOT_USER'] || Rails.application.credentials.dig(:minio, :access_key_id) %>
   secret_access_key: <%= ENV['MINIO_ROOT_PASSWORD'] || Rails.application.credentials.dig(:minio, :secret_access_key) %>
   region: us-east-1
-  bucket: <%= ENV['ENJU_LEAF_STORAGE_BUCKET'] || 'enju-leaf' %>-<%= Rails.env %>
+  bucket: <%= ENV['ENJU_LEAF_STORAGE_BUCKET'] %>-<%= Rails.env %>
   force_path_style: true
   endpoint: <%= ENV['ENJU_LEAF_STORAGE_ENDPOINT'] || 'http://minio:9000' %>
 

docker-compose.yml

@@ -115,7 +115,7 @@ services:
     volumes:
       - minio:/data
     entrypoint:
-      /bin/sh -c "mkdir -p /data/${ENJU_LEAF_STORAGE_BUCKET} && minio server /data --console-address \":9001\""
+      /bin/sh -c "mkdir -p /data/${ENJU_LEAF_STORAGE_BUCKET}-${RAILS_ENV} && minio server /data --console-address \":9001\""
     expose:
       - 9000
       - 9001