Skip to content

Commit

Permalink
Fix: Ruby3でElasticsearchを動かすための暫定処置
Browse files Browse the repository at this point in the history
  • Loading branch information
momocus committed Jul 3, 2021
1 parent c74ff46 commit 72f39df
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
# Install build tools, posgresql-client, yarn and node
RUN apt-get update -qq && \
DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends \
curl=7.64.* build-essential=12.6 gnupg2=2.2.* imagemagick=8:6.9.* && \
curl=7.64.* build-essential=12.6 gnupg2=2.2.* imagemagick=8:6.9.* git=1:2.20.* && \
apt-get clean && \
rm -rf /var/cache/apt/archives/* && \
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ gem "era_ja"

# ElasticSearch
gem "bonsai-elasticsearch-rails"
gem "elasticsearch-model"
gem "elasticsearch-model", github: "indirect/elasticsearch-rails"
gem "elasticsearch-rails"

group :development, :test do
Expand Down
15 changes: 10 additions & 5 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
GIT
remote: https://github.com/indirect/elasticsearch-rails.git
revision: 20efbf2ca6a4d310b3e11638334d85017d923ffe
specs:
elasticsearch-model (7.1.0)
activesupport (> 3)
elasticsearch (~> 7)
hashie

GEM
remote: https://rubygems.org/
specs:
Expand Down Expand Up @@ -135,10 +144,6 @@ GEM
elasticsearch-transport (= 7.13.1)
elasticsearch-api (7.13.1)
multi_json
elasticsearch-model (7.1.1)
activesupport (> 3)
elasticsearch (> 1)
hashie
elasticsearch-rails (7.1.1)
elasticsearch-transport (7.13.1)
faraday (~> 1)
Expand Down Expand Up @@ -426,7 +431,7 @@ DEPENDENCIES
devise
devise-i18n
dotenv-rails
elasticsearch-model
elasticsearch-model!
elasticsearch-rails
enum_help
era_ja
Expand Down

0 comments on commit 72f39df

Please sign in to comment.