diff --git a/.env.template b/.env.template index 28facd5b59..9cc9ed738f 100644 --- a/.env.template +++ b/.env.template @@ -29,6 +29,8 @@ ENJU_LEAF_EXTRACT_FILESIZE_LIMIT=2097152 CANTALOUPE_BASE_URI=http://cantaloupe:8182 +NODE_OPTIONS=--openssl-legacy-provider + no_proxy=localhost,webpacker,minio,solr,tika NO_PROXY=${no_proxy} diff --git a/Dockerfile b/Dockerfile index ca2c5f38ff..1a61ffeae2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,8 +17,13 @@ ARG UID=1000 ARG GID=1000 RUN groupadd --gid ${GID} enju && useradd -m --uid ${UID} --gid ${GID} enju -RUN apt-get update -qq && curl -sL https://deb.nodesource.com/setup_16.x | bash - && \ - apt-get install -y nodejs postgresql-client imagemagick poppler-utils ffmpeg && npm install -g yarn +RUN mkdir -p /etc/apt/keyrings && \ + apt-get update -qq && apt-get install -y curl ca-certificates gnupg && \ + curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \ + curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor -o /etc/apt/keyrings/yarnkey.gpg && \ + echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list && \ + echo "deb [signed-by=/etc/apt/keyrings/yarnkey.gpg] https://dl.yarnpkg.com/debian stable main" | tee /etc/apt/sources.list.d/yarn.list && \ + apt-get update -qq && apt-get install -y nodejs yarn postgresql-client imagemagick poppler-utils ffmpeg && apt-get clean && rm -rf /var/lib/apt/lists/* RUN mkdir /enju && chown -R enju:enju /enju USER enju WORKDIR /enju diff --git a/Gemfile.lock b/Gemfile.lock index f6bd0e35cd..d108d05869 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -46,7 +46,7 @@ GEM erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - active_storage_validations (1.1.2) + active_storage_validations (1.1.4) activejob (>= 5.2.0) activemodel (>= 5.2.0) activestorage (>= 5.2.0) @@ -75,17 +75,18 @@ GEM activerecord (>= 6.1, < 7.2) acts_as_list (1.1.0) activerecord (>= 4.2) - addressable (2.8.5) + addressable (2.8.6) public_suffix (>= 2.0.2, < 6.0) annotate (3.2.0) activerecord (>= 3.2, < 8.0) rake (>= 10.4, < 14.0) awesome_nested_set (3.6.0) activerecord (>= 4.0.0, < 7.2) + base64 (0.2.0) bcp47_spec (0.2.1) bcrypt (3.1.20) bindex (0.8.1) - bootsnap (1.17.0) + bootsnap (1.17.1) msgpack (~> 1.2) browser (5.3.1) builder (3.2.4) @@ -107,13 +108,13 @@ GEM caxlsx_rails (0.6.3) actionpack (>= 3.1) caxlsx (>= 3.0) - climate_control (0.2.0) + climate_control (1.2.0) cocoon (1.2.15) - concurrent-ruby (1.2.2) + concurrent-ruby (1.2.3) crack (0.4.5) rexml crass (1.0.6) - database_consistency (1.7.22) + database_consistency (1.7.23) activerecord (>= 3.2) date (3.3.4) date_validator (0.12.0) @@ -131,11 +132,11 @@ GEM dotenv-rails (2.8.1) dotenv (= 2.8.1) railties (>= 3.2) - ebnf (2.4.0) + ebnf (2.5.0) htmlentities (~> 4.3) rdf (~> 3.3) scanf (~> 1.0) - sxp (~> 1.3) + sxp (~> 2.0) unicode-types (~> 1.8) erubi (1.12.0) factory_bot (6.2.1) @@ -182,7 +183,7 @@ GEM request_store (~> 1.0) globalize-accessors (0.3.0) globalize (>= 5.0.0) - hashdiff (1.0.1) + hashdiff (1.1.0) highline (2.1.0) htmlentities (4.3.4) i18n (1.14.1) @@ -213,12 +214,12 @@ GEM kaminari-core (1.2.2) kramdown (2.4.0) rexml - kt-paperclip (7.2.1) + kt-paperclip (7.2.2) activemodel (>= 4.2.0) activesupport (>= 4.2.0) marcel (~> 1.0.1) mime-types - terrapin (~> 0.6.0) + terrapin (>= 0.6.0, < 2.0) library_stdnums (1.6.0) link_header (0.0.8) lisbn (0.3.2) @@ -238,29 +239,29 @@ GEM marcel (1.0.2) matrix (0.4.2) method_source (1.0.0) - mime-types (3.5.1) + mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2023.1003) + mime-types-data (3.2023.1205) mini_magick (4.12.0) mini_mime (1.1.5) - minitest (5.20.0) + minitest (5.21.2) mono_logger (1.1.2) msgpack (1.7.2) multi_json (1.15.0) multipart-post (2.3.0) mustermann (3.0.0) ruby2_keywords (~> 0.0.1) - net-imap (0.4.5) + net-imap (0.4.9.1) date net-protocol net-pop (0.1.2) net-protocol net-protocol (0.2.2) timeout - net-smtp (0.4.0) + net-smtp (0.4.0.1) net-protocol - nio4r (2.6.0) - nokogiri (1.15.5-x86_64-linux) + nio4r (2.7.0) + nokogiri (1.16.0-x86_64-linux) racc (~> 1.4) nori (2.6.0) oai (1.2.1) @@ -269,8 +270,8 @@ GEM faraday-follow_redirects (>= 0.3.0, < 2) options (2.3.2) orm_adapter (0.5.0) - parallel (1.23.0) - parallel_tests (4.3.0) + parallel (1.24.0) + parallel_tests (4.4.0) parallel pg (1.4.6) pr_geohash (1.0.0) @@ -280,7 +281,7 @@ GEM highline (>= 1.6, < 3) options (~> 2.3.0) public_suffix (5.0.4) - puma (5.6.7) + puma (5.6.8) nio4r (~> 2.0) pundit (2.3.1) activesupport (>= 3.0.0) @@ -288,7 +289,8 @@ GEM rack (2.2.8) rack-mini-profiler (2.3.4) rack (>= 1.2.0) - rack-protection (3.1.0) + rack-protection (3.2.0) + base64 (>= 0.1.0) rack (~> 2.2, >= 2.2.4) rack-proxy (0.7.7) rack @@ -348,7 +350,7 @@ GEM redis (4.8.1) redis-namespace (1.11.0) redis (>= 4) - regexp_parser (2.8.2) + regexp_parser (2.9.0) request_store (1.5.1) rack (>= 1.4) responders (3.1.1) @@ -376,7 +378,7 @@ GEM rspec-mocks (3.12.6) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) - rspec-rails (6.0.3) + rspec-rails (6.1.0) actionpack (>= 6.1) activesupport (>= 6.1) railties (>= 6.1) @@ -404,7 +406,7 @@ GEM sprockets-rails tilt scanf (1.0.0) - selenium-webdriver (4.15.0) + selenium-webdriver (4.16.0) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) @@ -415,10 +417,10 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - sinatra (3.1.0) + sinatra (3.2.0) mustermann (~> 3.0) rack (~> 2.2, >= 2.2.4) - rack-protection (= 3.1.0) + rack-protection (= 3.2.0) tilt (~> 2.0) sitemap_generator (6.3.0) builder (~> 3.0) @@ -438,11 +440,11 @@ GEM sunspot_rails (2.6.0) rails (>= 3) sunspot (= 2.6.0) - sxp (1.3.0) + sxp (2.0.0) matrix (~> 0.4) rdf (~> 3.3) - terrapin (0.6.0) - climate_control (>= 0.0.3, < 1.0) + terrapin (1.0.1) + climate_control thor (1.3.0) tilt (2.3.0) timeout (0.4.1) diff --git a/config/locales/enju_biblio_ja.yml b/config/locales/enju_biblio_ja.yml index a8d98b3a64..baea017599 100644 --- a/config/locales/enju_biblio_ja.yml +++ b/config/locales/enju_biblio_ja.yml @@ -1,14 +1,14 @@ ja: activerecord: models: - carrier_type: 資料の形態 - content_type: 資料の内容の種別 + carrier_type: キャリア種別 + content_type: 表現種別 create: 著作関係 create_type: 著作の関係 embody: 具体化 exemplify: 書誌と所蔵の関係 form_of_work: 著作の形態 - frequency: 発行頻度 + frequency: 刊行頻度 item: 所蔵情報 language: 言語 manifestation: 資料 @@ -51,14 +51,14 @@ ja: attributes: manifestation: - original_title: 原題 + original_title: 本タイトル title_alternative: 代替タイトル title_transcription: タイトルのヨミ classification_number: 分類番号 manifestation_identifier: ローカル識別子 - date_of_publication: 出版日 + date_of_publication: 出版日付 pub_date: 出版日 - access_address: アクセスアドレス + access_address: URL number_of_page_string: ページ数(文字列) start_page: 最初のページ end_page: 最後のページ @@ -76,8 +76,8 @@ ja: issue_number_string: 号 serial_number: 通号 serial_number_string: 通号(文字) - edition: 版(数字) - edition_string: 版 + edition: 版次(数字) + edition_string: 版次 note: 注記 memo: 業務メモ repository_content: リポジトリのコンテンツ @@ -101,10 +101,10 @@ ja: statement_of_responsibility: 責任表示 publication_place: 出版地 parent_id: 親書誌 - extent: ページ数 + extent: 数量 dimensions: 大きさ fulltext_content: 全文あり - date_copyrighted: 著作権発行日 + date_copyrighted: 著作権日付 manifestation/subjects: term: 件名 manifestation/classifications: diff --git a/docker-compose.yml b/docker-compose.yml index 9661e0e5e4..25146b6f62 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -118,7 +118,7 @@ services: retries: 3 tika: - image: apache/tika:2.8.0.0 + image: apache/tika:2.9.1.0 expose: - 9998 restart: always