Skip to content

Commit c577328

Browse files
committed
Fix: Ruby3でElasticsearchを動かすための暫定処置
参考: elastic/elasticsearch-rails#992
1 parent 34859b4 commit c577328

File tree

3 files changed

+12
-7
lines changed

3 files changed

+12
-7
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
55
# Install build tools, posgresql-client, yarn and node
66
RUN apt-get update -qq && \
77
DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends \
8-
curl=7.64.* build-essential=12.6 gnupg2=2.2.* imagemagick=8:6.9.* && \
8+
curl=7.64.* build-essential=12.6 gnupg2=2.2.* imagemagick=8:6.9.* git && \
99
apt-get clean && \
1010
rm -rf /var/cache/apt/archives/* && \
1111
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ gem "era_ja"
5454

5555
# ElasticSearch
5656
gem "bonsai-elasticsearch-rails"
57-
gem "elasticsearch-model"
57+
gem "elasticsearch-model", github: "indirect/elasticsearch-rails"
5858
gem "elasticsearch-rails"
5959

6060
group :development, :test do

Gemfile.lock

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
GIT
2+
remote: https://github.com/indirect/elasticsearch-rails.git
3+
revision: 20efbf2ca6a4d310b3e11638334d85017d923ffe
4+
specs:
5+
elasticsearch-model (7.1.0)
6+
activesupport (> 3)
7+
elasticsearch (~> 7)
8+
hashie
9+
110
GEM
211
remote: https://rubygems.org/
312
specs:
@@ -135,10 +144,6 @@ GEM
135144
elasticsearch-transport (= 7.13.1)
136145
elasticsearch-api (7.13.1)
137146
multi_json
138-
elasticsearch-model (7.1.1)
139-
activesupport (> 3)
140-
elasticsearch (> 1)
141-
hashie
142147
elasticsearch-rails (7.1.1)
143148
elasticsearch-transport (7.13.1)
144149
faraday (~> 1)
@@ -426,7 +431,7 @@ DEPENDENCIES
426431
devise
427432
devise-i18n
428433
dotenv-rails
429-
elasticsearch-model
434+
elasticsearch-model!
430435
elasticsearch-rails
431436
enum_help
432437
era_ja

0 commit comments

Comments
 (0)