turniere
/
turniere-backend
mirror of https://github.com/turniere/turniere-backend.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #53 from turniere/feature/production_db 

Add production database config and secret
This commit is contained in:
Thor77 2019-06-17 15:54:37 +02:00 committed by GitHub
parent 30e852aba9 376b721ec7
commit 685e7de6c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -1,5 +1,5 @@
FROM ruby:2.6.2-alpine FROM ruby:2.6.2-alpine
RUN apk add build-base tzdata sqlite sqlite-dev && gem install tzinfo-data RUN apk add build-base tzdata sqlite sqlite-dev postgresql-dev && gem install tzinfo-data
WORKDIR /app WORKDIR /app
COPY Gemfile /app/Gemfile COPY Gemfile /app/Gemfile
COPY Gemfile.lock /app/Gemfile.lock COPY Gemfile.lock /app/Gemfile.lock

4
Gemfile
View File

@ -60,5 +60,9 @@ group :development do
gem 'spring-watcher-listen', '~> 2.0.0' gem 'spring-watcher-listen', '~> 2.0.0'
end end
group :production do
gem 'pg'
end
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby] gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby]

2
Gemfile.lock
View File

@ -122,6 +122,7 @@ GEM
parallel (1.17.0) parallel (1.17.0)
parser (2.6.2.0) parser (2.6.2.0)
ast (~> 2.4.0) ast (~> 2.4.0)
pg (1.1.4)
psych (3.1.0) psych (3.1.0)
puma (3.12.1) puma (3.12.1)
rack (2.0.7) rack (2.0.7)
@ -252,6 +253,7 @@ DEPENDENCIES
interactor interactor
interactor-rails interactor-rails
listen (>= 3.0.5, < 3.2) listen (>= 3.0.5, < 3.2)
pg
puma (~> 3.11) puma (~> 3.11)
rack-cors rack-cors
railroady railroady

2
config/credentials.yml.enc
View File

@ -1 +1 @@
a/Vh9cLLEd1hfBWkDT1nYmMfT4R/BgM3FMeZCBgaghdJ2O5r5+Fv68PtkdPgNlLObecjswDHrB9G4a6asUuHs9gDNSr1cppsCIFYEPMOxc+UFBxsJI7xD5G5Cz4MSXRg8awKLV5tRj/WG5f5TK3IlvCisqp/MqsHpWVrr0Phyi+GxEiqDqmAT+da5b0DISm+LTMLsSJPpSCTSwg0i8K0PNx6DLEHx0gSjFL8AYkjij2a0IyuOeCWGmhVJLtK/nRIS13ZG9kGlugiCambSbS/2jqh+FAk24pdW1ehEj2Aeho+UTq/Q6UGUGfyJXtsSmv94HGNd4hDOCv5Rl1syzHMgeybC8TxIWWkq2hFp8eaeZlUM/XJJY/SeWrnCQKnVRN/Q7U06sPhXr/mJ3QdAt5h5MVRgEX7HmZg97KN--61sCxyaYwUNHTLta--RPxslZdR5UsB1Jko8C/H2w== dCVJGOYsmgcPz9jtSayZvIPAReIg2LIeScmbZ66S3PHhRj32F3vhQJLpARU26RISOCc8cFxvVcZb1H/Lhmj9iq+5/+5471OB04U74F7vbXIpgwlC+4CYD99hDOw/i9GokwfT/E/nqW1tBBMIm17QC8EwrJgIZlZCxE6C/3DUx+sAcupQafb9NAFqRffoL9KQj7X7CyJ3d7GCQUX1cS+x6/sLtfqxvEN5vWn702yMg5Ff5TdGUfHlaLCfA9POk1UEf36kwcqhK78XLfGgq+W1cTJCvgOjdxk2sOdo1gRVElpFH4DJ1l/VG1/C7AO33QPZNWH0TlWwje9FewHhr3Vq3xhfqmraChfPcRiHoFOS4rPFddeMtWq2oWZMj+DfhjJVW9WccTOJO7wWUH9HOdNHFEfQ6P1vKVq3oyXcWOVi248Me1YXEqfb1X1Lt/QuTbF0tEwfUThKmlCvqi/C0To4gf8WmZaU0OrJZzdozA9uL+99aZd6VduCkVzE9/OSZ5RLlPrDThitoCDTSFfeTMIwLlF3siGsVm9oc1GFex8zIx0FsLO5AIBSEa0kx20/2jUXNw==--HHZlzHqK+9w+/284--yCLnfdWp8Wvgf3buUq4RYg==

5
config/database.yml
View File

@ -21,5 +21,6 @@ test:
database: db/test.sqlite3 database: db/test.sqlite3
production: production:
<<: *default url: <%= Rails.application.credentials.dig(:postgres, :url) %>
database: db/production.sqlite3 username: <%= Rails.application.credentials.dig(:postgres, :username) %>
password: <%= Rails.application.credentials.dig(:postgres, :password) %>