Merge branch 'hotfix/1.6.2'
This commit is contained in:
commit
a3d14c1884
3 changed files with 3 additions and 13 deletions
12
app.json
12
app.json
|
@ -37,17 +37,7 @@
|
|||
}
|
||||
},
|
||||
"image": "heroku/ruby",
|
||||
"addons": [
|
||||
{
|
||||
"plan": "heroku-redis"
|
||||
},
|
||||
{
|
||||
"plan": "heroku-postgresql",
|
||||
"options": {
|
||||
"version": "9.5"
|
||||
}
|
||||
}
|
||||
],
|
||||
"addons": [ "heroku-redis", "heroku-postgresql"],
|
||||
"buildpacks": [
|
||||
{
|
||||
"url": "heroku/ruby"
|
||||
|
|
|
@ -39,7 +39,7 @@ services:
|
|||
command: ['bundle', 'exec', 'sidekiq', '-C', 'config/sidekiq.yml']
|
||||
|
||||
postgres:
|
||||
image: postgres:11.6
|
||||
image: postgres:12
|
||||
restart: always
|
||||
ports:
|
||||
- '5432:5432'
|
||||
|
|
|
@ -82,7 +82,7 @@ services:
|
|||
command: bin/webpack-dev-server
|
||||
|
||||
postgres:
|
||||
image: postgres:11.6
|
||||
image: postgres:12
|
||||
restart: always
|
||||
ports:
|
||||
- '5432:5432'
|
||||
|
|
Loading…
Reference in a new issue