-
-
Notifications
You must be signed in to change notification settings - Fork 21
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #572 from scidsg/use-postgres-everywhere
Use postgres everywhere
- Loading branch information
Showing
8 changed files
with
384 additions
and
267 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,4 +2,4 @@ | |
build | ||
coverage | ||
hushline/static/vendor/* | ||
.pytest_cache | ||
.pytest_cache |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
export FLASK_APP=hushline | ||
export ENCRYPTION_KEY=bi5FDwhZGKfc4urLJ_ChGtIAaOPgxd3RDOhnvct10mw= | ||
export SECRET_KEY=cb3f4afde364bfb3956b97ca22ef4d2b593d9d980a4330686267cabcd2c0befd | ||
export SQLALCHEMY_DATABASE_URI=sqlite:///hushline.db | ||
export SQLALCHEMY_DATABASE_URI=postgresql://hushline:hushline@127.0.0.1:5432/hushline | ||
export REGISTRATION_CODES_REQUIRED=False | ||
export SESSION_COOKIE_NAME=session | ||
export NOTIFICATIONS_ADDRESS=notifications@hushline.app |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,27 +1,28 @@ | ||
--- | ||
services: | ||
app: | ||
build: . | ||
ports: | ||
- "8080:8080" | ||
- 127.0.0.1:8080:8080 | ||
environment: | ||
- SQLALCHEMY_DATABASE_URI=postgresql://hushline:hushline@postgres:5432/hushline | ||
- FLASK_ENV=development | ||
- SECRET_KEY="cb3f4afde364bfb3956b97ca22ef4d2b593d9d980a4330686267cabcd2c0befd" | ||
- ENCRYPTION_KEY="bi5FDwhZGKfc4urLJ_ChGtIAaOPgxd3RDOhnvct10mw=" | ||
- REGISTRATION_CODES_REQUIRED=false | ||
SQLALCHEMY_DATABASE_URI: postgresql://hushline:hushline@postgres:5432/hushline | ||
FLASK_ENV: development | ||
SECRET_KEY: "cb3f4afde364bfb3956b97ca22ef4d2b593d9d980a4330686267cabcd2c0befd" | ||
ENCRYPTION_KEY: "bi5FDwhZGKfc4urLJ_ChGtIAaOPgxd3RDOhnvct10mw=" | ||
REGISTRATION_CODES_REQUIRED: false | ||
volumes: | ||
- ./volumes/app:/data | ||
- ./:/app | ||
depends_on: | ||
- postgres | ||
|
||
postgres: | ||
image: "postgres:alpine" | ||
image: postgres:16.4-alpine3.20 | ||
environment: | ||
- POSTGRES_USER=hushline | ||
- POSTGRES_PASSWORD=hushline | ||
- POSTGRES_DB=hushline | ||
POSTGRES_USER: hushline | ||
POSTGRES_PASSWORD: hushline | ||
POSTGRES_DB: hushline | ||
ports: | ||
- "5432:5432" | ||
- 127.0.0.1:5432:5432 | ||
volumes: | ||
- ./volumes/postgres:/var/lib/postgresql/data |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
#!/usr/bin/env bash | ||
|
||
docker run --rm -t -p 127.0.0.1:5432:5432 \ | ||
-e POSTGRES_USER=hushline \ | ||
-e POSTGRES_PASSWORD=hushline \ | ||
-e POSTGRES_DB=hushline \ | ||
postgres:16.4-alpine3.20 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters