codeforleipzig/stadtratmonitor
codeforleipzig/stadtratmonitor
1
1
Fork 0
mirror of https://github.com/CodeforLeipzig/stadtratmonitor.git synced 2024-12-22 15:43:14 +01:00
Code Issues Projects Releases Packages 4 Wiki Activity

downgrade elasticsearch because not recognized as elastic from rails otherwise

Browse source
This commit is contained in:
Joerg Reichert 2023-04-02 00:43:07 +02:00
parent 22d180c38d
commit 3857a7c002
4 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -6,7 +6,7 @@ gem 'rails', '~> 7.0.4'
gem 'rails-i18n' gem 'rails-i18n'
# database and search index # database and search index
gem 'elasticsearch', '~> 8' gem 'elasticsearch', '~> 7.17.7'
gem 'elasticsearch-dsl' gem 'elasticsearch-dsl'
gem 'elasticsearch-model', '~> 7' gem 'elasticsearch-model', '~> 7'
gem 'elasticsearch-rails', '~> 7' gem 'elasticsearch-rails', '~> 7'

27
Gemfile.lock
View file

@ -99,13 +99,10 @@ GEM
date (3.3.3) date (3.3.3)
diff-lcs (1.5.0) diff-lcs (1.5.0)
docile (1.4.0) docile (1.4.0)
elastic-transport (8.2.1) elasticsearch (7.17.7)
faraday (< 3) elasticsearch-api (= 7.17.7)
multi_json elasticsearch-transport (= 7.17.7)
elasticsearch (8.7.0) elasticsearch-api (7.17.7)
elastic-transport (~> 8)
elasticsearch-api (= 8.7.0)
elasticsearch-api (8.7.0)
multi_json multi_json
elasticsearch-dsl (0.1.10) elasticsearch-dsl (0.1.10)
elasticsearch-model (7.1.1) elasticsearch-model (7.1.1)
@ -113,6 +110,9 @@ GEM
elasticsearch (> 1) elasticsearch (> 1)
hashie hashie
elasticsearch-rails (7.2.1) elasticsearch-rails (7.2.1)
elasticsearch-transport (7.17.7)
faraday (~> 1)
multi_json
erubi (1.12.0) erubi (1.12.0)
execjs (2.8.1) execjs (2.8.1)
factory_bot (6.2.1) factory_bot (6.2.1)
@ -122,10 +122,9 @@ GEM
railties (>= 5.0.0) railties (>= 5.0.0)
faker (3.1.1) faker (3.1.1)
i18n (>= 1.8.11, < 2) i18n (>= 1.8.11, < 2)
faraday (2.7.4) faraday (1.2.0)
faraday-net_http (>= 2.0, < 3.1) multipart-post (>= 1.2, < 3)
ruby2_keywords (>= 0.0.4) ruby2_keywords
faraday-net_http (3.0.2)
ffi (1.15.5) ffi (1.15.5)
foundation-rails (6.6.2.0) foundation-rails (6.6.2.0)
railties (>= 3.1.0) railties (>= 3.1.0)
@ -174,6 +173,7 @@ GEM
mini_mime (1.1.2) mini_mime (1.1.2)
minitest (5.18.0) minitest (5.18.0)
multi_json (1.15.0) multi_json (1.15.0)
multipart-post (2.3.0)
net-imap (0.3.4) net-imap (0.3.4)
date date
net-protocol net-protocol
@ -358,7 +358,7 @@ DEPENDENCIES
awesome_print awesome_print
capybara capybara
database_cleaner database_cleaner
elasticsearch (~> 8) elasticsearch (~> 7.17.7)
elasticsearch-dsl elasticsearch-dsl
elasticsearch-model (~> 7) elasticsearch-model (~> 7)
elasticsearch-rails (~> 7) elasticsearch-rails (~> 7)
@ -394,5 +394,8 @@ DEPENDENCIES
validate_url validate_url
webrick (~> 1.7) webrick (~> 1.7)
RUBY VERSION
ruby 3.2.2p53
BUNDLED WITH BUNDLED WITH
2.4.10 2.4.10

2
app/models/paper.rb
View file

@ -92,7 +92,7 @@ class Paper < ActiveRecord::Base
url: record['url'] url: record['url']
} }
record = find_or_initialize_by(url: attributes[:url]) record = find_or_initialize_by(url: attributes[:url])
out = record.update_attributes(attributes) out = record.update(attributes)
if !out if !out
puts "Not imported #{attributes[:name]}: #{record.errors.messages}" puts "Not imported #{attributes[:name]}: #{record.errors.messages}"
end end

2
docker/elasticsearch/Dockerfile
View file

@ -1,4 +1,4 @@
FROM elasticsearch:8.6.2 FROM docker.elastic.co/elasticsearch/elasticsearch:7.10.2
RUN \ RUN \
mkdir -p /usr/share/elasticsearch/config/analysis && \ mkdir -p /usr/share/elasticsearch/config/analysis && \