Remove memcached from development version

This commit is contained in:
Eric Schultz 2019-11-06 14:48:14 -06:00
parent 7763a84d93
commit 4e41f40863
7 changed files with 0 additions and 24 deletions

View file

@ -46,8 +46,6 @@ gem 'table_print', '~> 1.5', '>= 1.5.6' # Nice table printing of data for the co
# Database and Events # Database and Events
gem 'bunny', '~> 2.14', '>= 2.14.2' # RabittMQ gem 'bunny', '~> 2.14', '>= 2.14.2' # RabittMQ
gem 'dalli', '~> 2.7'
gem 'memcachier', '~> 0.0.2'
gem 'pg', '~> 0.11' gem 'pg', '~> 0.11'
gem 'param_validation', path: 'gems/ruby-param-validation' gem 'param_validation', path: 'gems/ruby-param-validation'

View file

@ -146,7 +146,6 @@ GEM
crass (1.0.4) crass (1.0.4)
css_parser (1.7.0) css_parser (1.7.0)
addressable addressable
dalli (2.7.10)
dante (0.2.0) dante (0.2.0)
database_cleaner (1.7.0) database_cleaner (1.7.0)
debase (0.2.4) debase (0.2.4)
@ -291,7 +290,6 @@ GEM
tilt tilt
marcel (0.3.3) marcel (0.3.3)
mimemagic (~> 0.3.2) mimemagic (~> 0.3.2)
memcachier (0.0.2)
method_source (0.9.2) method_source (0.9.2)
mime-types (3.2.2) mime-types (3.2.2)
mime-types-data (~> 3.2015) mime-types-data (~> 3.2015)
@ -519,7 +517,6 @@ DEPENDENCIES
colorize (~> 0.8.1) colorize (~> 0.8.1)
config (> 1.5) config (> 1.5)
countries (~> 3.0) countries (~> 3.0)
dalli (~> 2.7)
database_cleaner (~> 1.7) database_cleaner (~> 1.7)
debase (~> 0.2.3) debase (~> 0.2.3)
delayed_job_active_record (~> 4.1) delayed_job_active_record (~> 4.1)
@ -548,7 +545,6 @@ DEPENDENCIES
i18n-js (~> 3.3) i18n-js (~> 3.3)
lograge (~> 0.11.2) lograge (~> 0.11.2)
mail_view (~> 2.0) mail_view (~> 2.0)
memcachier (~> 0.0.2)
mini_magick (~> 4.9) mini_magick (~> 4.9)
nearest_time_zone (~> 0.0.4) nearest_time_zone (~> 0.0.4)
parallel (~> 1.17) parallel (~> 1.17)

View file

@ -10,9 +10,6 @@ default:
nonprofit: "/images/fallback/default-nonprofit.png" nonprofit: "/images/fallback/default-nonprofit.png"
campaign: "/fallback/default-campaign-background.jpg" campaign: "/fallback/default-campaign-background.jpg"
cache_store: dalli_store
aws: aws:
access_key_id: <%= ENV['AWS_ACCESS_KEY'] %> access_key_id: <%= ENV['AWS_ACCESS_KEY'] %>
secret_access_key: <%= ENV['AWS_SECRET_ACCESS_KEY'] %> secret_access_key: <%= ENV['AWS_SECRET_ACCESS_KEY'] %>

View file

@ -55,10 +55,6 @@ Config.schema do
# the path on your image.host to your default campaign background image # the path on your image.host to your default campaign background image
required(:campaign).filled(:str?) required(:campaign).filled(:str?)
end end
# the cache stor you're using. Must be the name of caching store for rails
# Default is dalli_store
required(:cache_store).filled(:str?)
end end
required(:aws).schema do required(:aws).schema do

View file

@ -14,9 +14,6 @@ default:
nonprofit: "/images/fallback/default-nonprofit.png" nonprofit: "/images/fallback/default-nonprofit.png"
campaign: "/fallback/default-campaign-background.jpg" campaign: "/fallback/default-campaign-background.jpg"
cache_store: dalli_store
aws: aws:
access_key_id: <%= ENV['AWS_ACCESS_KEY'] %> access_key_id: <%= ENV['AWS_ACCESS_KEY'] %>
secret_access_key: <%= ENV['AWS_SECRET_ACCESS_KEY'] %> secret_access_key: <%= ENV['AWS_SECRET_ACCESS_KEY'] %>

View file

@ -10,7 +10,6 @@ services:
- memcached - memcached
environment: environment:
- DATABASE_HOST=db - DATABASE_HOST=db
- MEMCACHE_SERVERS=memcached
volumes: volumes:
- ../../:/myapp - ../../:/myapp
db: db:
@ -18,6 +17,4 @@ services:
environment: environment:
POSTGRES_USER: "admin" POSTGRES_USER: "admin"
POSTGRES_PASSWORD: "password" POSTGRES_PASSWORD: "password"
memcached:
image: memcached

View file

@ -11,7 +11,6 @@ services:
environment: environment:
- DATABASE_HOST=db - DATABASE_HOST=db
- MEMCACHE_SERVERS=memcached
- USER=${USER} - USER=${USER}
volumes: volumes:
@ -21,15 +20,11 @@ services:
- "5000:5000" - "5000:5000"
depends_on: depends_on:
- db - db
- memcached
db: db:
image: postgres:9.6 image: postgres:9.6
environment: environment:
POSTGRES_USER: "admin" POSTGRES_USER: "admin"
POSTGRES_PASSWORD: "password" POSTGRES_PASSWORD: "password"
memcached:
image: memcached