From 3af53212e4aa371ad48595aafe1a098742eafe88 Mon Sep 17 00:00:00 2001 From: kanzawa Date: Thu, 14 Sep 2017 13:38:55 +0900 Subject: [PATCH 1/4] Add pg to Gemfile --- Gemfile | 1 + Gemfile.lock | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 62acca0..8f90dfa 100644 --- a/Gemfile +++ b/Gemfile @@ -5,6 +5,7 @@ source 'https://rubygems.org' gem 'rails', '4.1.8' # Use sqlite3 as the database for Active Record gem 'sqlite3' +gem 'pg' # Use SCSS for stylesheets gem 'sass-rails', '~> 4.0.3' # Use Uglifier as compressor for JavaScript assets diff --git a/Gemfile.lock b/Gemfile.lock index 66e34e7..f933590 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -92,7 +92,7 @@ GEM less-rails (2.6.0) actionpack (>= 3.1) less (~> 2.6.0) - libv8 (3.16.14.7) + libv8 (3.16.14.19) mail (2.6.3) mime-types (>= 1.16, < 3) mime-types (2.4.3) @@ -123,6 +123,7 @@ GEM oauth2 (~> 1.0) omniauth (~> 1.2) orm_adapter (0.5.0) + pg (0.21.0) rack (1.5.2) rack-test (0.6.2) rack (>= 1.0) @@ -232,6 +233,7 @@ DEPENDENCIES nokogiri omniauth omniauth-google-oauth2 + pg rails (= 4.1.8) redis rspec-rails From 4420b3391a5ef66f27e1270ae13ea7382cd84893 Mon Sep 17 00:00:00 2001 From: kanzawa Date: Tue, 19 Sep 2017 00:43:43 +0900 Subject: [PATCH 2/4] Specify the host of the redis server to be accessed --- app/models/redis_store.rb | 4 +++- config/application_settings_sample.yml | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/models/redis_store.rb b/app/models/redis_store.rb index c3882a5..eb39ef3 100644 --- a/app/models/redis_store.rb +++ b/app/models/redis_store.rb @@ -1,7 +1,9 @@ +require 'uri' module DataStore class RedisStore < Base def initialize - @redis = Redis.new + uri = URI.parse(ApplicationSettings.redis.url) + @redis = Redis.new(host: uri.host, port: uri.port) end def load(key) diff --git a/config/application_settings_sample.yml b/config/application_settings_sample.yml index b1f3be8..865b89d 100644 --- a/config/application_settings_sample.yml +++ b/config/application_settings_sample.yml @@ -7,6 +7,8 @@ default: &default google: application_id: XXXXXXXXXXXXXXXXX application_secret: XXXXXXXXXXXXXXXXX + redis: + url: redis://XXXXX:6379 development: <<: *default From b3a33e249a06f14881731284403db6c8f868da59 Mon Sep 17 00:00:00 2001 From: kanzawa Date: Tue, 19 Sep 2017 02:06:12 +0900 Subject: [PATCH 3/4] Add Dockerfile and docker-compose.yml --- Dockerfile | 15 +++++++++++++++ docker-compose.yml | 26 ++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 Dockerfile create mode 100644 docker-compose.yml diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..531ad5c --- /dev/null +++ b/Dockerfile @@ -0,0 +1,15 @@ +FROM ruby:2.1.5 +RUN apt-get update -qq && apt-get install -y build-essential ruby-dev libxslt1-dev libxml2-dev libpq-dev nodejs sqlite3 postgresql-client redis-server + +RUN git clone https://github.com/nomlab/camome.git + +WORKDIR camome + +RUN bundle install --path vendor/bundle +ADD config/secrets.yml config/secrets.yml +ADD config/application_settings.yml config/application_settings.yml +ADD config/database.yml config/database.yml +RUN git submodule init +RUN git config submodule.vendor/assets/bootstrap-table.url https://github.com/wenzhixin/bootstrap-table.git +RUN git config submodule.vendor/assets/jsSHA.url https://github.com/Caligatio/jsSHA.git +RUN git submodule update \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..28e8909 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,26 @@ +version: '2' +services: + db: + container_name: db + image: postgres + expose: + - "5432" + + web: + container_name: camome + build: . + command: bundle exec rails s -p 3000 -b '0.0.0.0' + ports: + - "3000:3000" + links: + - redis + - db + + redis: + container_name: redis + image: redis + expose: + - "6379" + volumes: + - ./redis:/data + command: redis-server --appendonly yes \ No newline at end of file From a321f6e43b6fd802b93ecf6e74753b73cbdeb459 Mon Sep 17 00:00:00 2001 From: kanzawa Date: Tue, 3 Oct 2017 12:50:57 +0900 Subject: [PATCH 4/4] Be able to use Postgres to database --- app/views/events/_recurrence_item.html.erb | 2 +- app/views/inbox/_recurrence_item.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/events/_recurrence_item.html.erb b/app/views/events/_recurrence_item.html.erb index e4e8fd5..d385edd 100644 --- a/app/views/events/_recurrence_item.html.erb +++ b/app/views/events/_recurrence_item.html.erb @@ -1,4 +1,4 @@ - <% event_count = Event.where("recurrence_id IS ?", recurrence.id).size %> + <% event_count = Event.where("recurrence_id = ?", recurrence.id).size %> <%= recurrence.name %> (<%= event_count %>) diff --git a/app/views/inbox/_recurrence_item.html.erb b/app/views/inbox/_recurrence_item.html.erb index e4e8fd5..d385edd 100644 --- a/app/views/inbox/_recurrence_item.html.erb +++ b/app/views/inbox/_recurrence_item.html.erb @@ -1,4 +1,4 @@ - <% event_count = Event.where("recurrence_id IS ?", recurrence.id).size %> + <% event_count = Event.where("recurrence_id = ?", recurrence.id).size %> <%= recurrence.name %> (<%= event_count %>)