Merge pull request #2725 from hennevogel/bugfix/cleanup

Cleanup dev-env switch
This commit is contained in:
Henne Vogelsang 2021-03-06 02:40:53 +01:00 committed by GitHub
commit a3721cb298
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 14 deletions

View file

@ -237,8 +237,6 @@ GEM
i18n (1.8.5) i18n (1.8.5)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
i18n_data (0.8.0) i18n_data (0.8.0)
inversion (1.1.1)
loggability (~> 0.12)
io-like (0.3.0) io-like (0.3.0)
iso-639 (0.2.8) iso-639 (0.2.8)
jaro_winkler (1.5.3) jaro_winkler (1.5.3)
@ -268,7 +266,6 @@ GEM
rb-fsevent (~> 0.9, >= 0.9.4) rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7) rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2) ruby_dep (~> 1.2)
loggability (0.14.0)
loofah (2.7.0) loofah (2.7.0)
crass (~> 1.0.2) crass (~> 1.0.2)
nokogiri (>= 1.5.9) nokogiri (>= 1.5.9)
@ -443,12 +440,6 @@ GEM
rb-inotify (0.10.0) rb-inotify (0.10.0)
ffi (~> 1.0) ffi (~> 1.0)
rbtree3 (0.5.0) rbtree3 (0.5.0)
rdoc (6.0.4)
rdoc-generator-fivefish (0.4.0)
inversion (~> 1.1)
loggability (~> 0.12)
rdoc (~> 6.0)
yajl-ruby (~> 1.3)
recaptcha (4.14.0) recaptcha (4.14.0)
json json
redcarpet (3.5.0) redcarpet (3.5.0)
@ -606,7 +597,6 @@ GEM
chronic (>= 0.6.3) chronic (>= 0.6.3)
xpath (3.2.0) xpath (3.2.0)
nokogiri (~> 1.8) nokogiri (~> 1.8)
yajl-ruby (1.4.1)
PLATFORMS PLATFORMS
ruby ruby
@ -693,7 +683,6 @@ DEPENDENCIES
rails-assets-waypoints! rails-assets-waypoints!
rails-controller-testing rails-controller-testing
rails-i18n rails-i18n
rdoc-generator-fivefish
recaptcha recaptcha
redcarpet redcarpet
responders (~> 2.0) responders (~> 2.0)
@ -725,7 +714,7 @@ DEPENDENCIES
whenever whenever
RUBY VERSION RUBY VERSION
ruby 2.5.0p0 ruby 2.5.8p224
BUNDLED WITH BUNDLED WITH
1.17.3 1.17.3

View file

@ -2,9 +2,10 @@ version: "2"
services: services:
database: database:
image: postgres image: postgres:12-alpine
environment: environment:
PGDATA: /var/lib/postgresql/data/pgdata PGDATA: /var/lib/postgresql/data/pgdata
POSTGRES_PASSWORD: mysecretpassword
osem: osem:
build: build:
context: . context: .

View file

@ -2,9 +2,10 @@ version: "2"
services: services:
production_database: production_database:
image: postgres image: postgres:12-alpine
environment: environment:
PGDATA: /var/lib/postgresql/data/pgdata PGDATA: /var/lib/postgresql/data/pgdata
POSTGRES_PASSWORD: mysecretpassword
volumes: volumes:
- osem_production_database:/var/lib/postgresql/data/pgdata - osem_production_database:/var/lib/postgresql/data/pgdata
production_web: production_web: