cgiacofei/TandoorRecipes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changes to enable sqlite3 in docker container

Browse Source
This commit is contained in:
smilerz 2023-10-30 21:37:45 -05:00
parent 9cb1c21cd8
commit 6680fbb644
No known key found for this signature in database
GPG Key ID: 39444C7606D47126
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -74,6 +74,7 @@ mediafiles/
\.env \.env
staticfiles/ staticfiles/
postgresql/ postgresql/
data/
/docker-compose.override.yml /docker-compose.override.yml

2
boot.sh
View File

@ -35,7 +35,7 @@ echo "Waiting for database to be ready..."
attempt=0 attempt=0
max_attempts=20 max_attempts=20
if [ "${DB_ENGINE}" != 'django.db.backends.sqlite3' ]; then if [ "${DB_ENGINE}" == 'django.db.backends.postgresql' ]; then
# POSTGRES_PASSWORD (or a valid file at POSTGRES_PASSWORD_FILE) must be set in .env file # POSTGRES_PASSWORD (or a valid file at POSTGRES_PASSWORD_FILE) must be set in .env file

2
recipes/settings.py
View File

@ -350,7 +350,7 @@ WSGI_APPLICATION = 'recipes.wsgi.application'
# Load settings from env files # Load settings from env files
if os.getenv('DATABASE_URL'): if os.getenv('DATABASE_URL'):
match = re.match( match = re.match(
r'(?P<schema>\w+):\/\/(?P<user>[\w\d_-]+)(:(?P<password>[^@]+))?@(?P<host>[^:/]+)(:(?P<port>\d+))?(\/(?P<database>[\w\d\/\._-]+))?', r'(?P<schema>\w+):\/\/(?:(?P<user>[\w\d_-]+)(?::(?P<password>[^@]+))?@)?(?P<host>[^:/]+)(?:(?P<port>\d+))?(?:/(?P<database>[\w\d/._-]+))?',
os.getenv('DATABASE_URL') os.getenv('DATABASE_URL')
) )
settings = match.groupdict() settings = match.groupdict()