Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add sslmode parameter to psql conn string #177

Draft
wants to merge 13 commits into
base: master
Choose a base branch
from
Draft

Add sslmode parameter to psql conn string #177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b143e43
Add sslmode parameter to psql conn string
Aug 26, 2021
46a9a21
Add ssl true parameter
Aug 26, 2021
72f92da
Export DB with params early enough
Aug 26, 2021
cd61a74
One more param and debug
Aug 26, 2021
63f3c8a
PG version 8
Aug 26, 2021
5793a92
Add Procfile
Aug 26, 2021
177ee95
Remove postbuild script
Aug 26, 2021
7aafcf2
Put proper run command in
Aug 26, 2021
b9af5d0
Return pg7, don't verify TLS
Aug 26, 2021
24ae4ff
Return npm start for local
Aug 26, 2021
edbffcb
PG 8 work please
Aug 26, 2021
255f06b
Update package-lock
littlewhywhat Aug 27, 2021
c42390d
Update cypress actions
littlewhywhat Aug 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/e2e.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
npm ci
cp .env.local.example .env
- name: e2e
uses: cypress-io/github-action@v1
uses: cypress-io/github-action@v2.3.1
with:
browser: chrome
headless: true
Expand Down
3 changes: 0 additions & 3 deletions app.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,5 @@
}
},
"name": "foosball-rating",
"scripts": {
"postdeploy": "cd backend && npm run create-test-db"
},
"stack": "container"
}
107 changes: 63 additions & 44 deletions backend/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion backend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"dependencies": {
"dotenv": "^7.0.0",
"express": "^4.16.4",
"pg": "^7.8.1",
"pg": "^8",
"slackbots": "^1.2.0"
},
"devDependencies": {
Expand Down
7 changes: 2 additions & 5 deletions heroku.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
build:
docker:
web: Dockerfile
release:
image: web
command:
- cd backend && npm run create-schema

run:
web: npm start
web: bash ./start.sh
5 changes: 5 additions & 0 deletions start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
#!/bin/bash

set -eu

PROXY_PORT=$PORT
unset PORT
export NODE_TLS_REJECT_UNAUTHORIZED=0
export DATABASE_URL="${DATABASE_URL}?sslmode=require"

cd backend
npm run create-test-db || true
npm run create-schema || true
npm start &
cd ..

Expand Down