fixed tests working.

This commit is contained in:
2021-04-15 14:05:45 +01:00
parent 43fc877445
commit 64acde19db
4 changed files with 14 additions and 12 deletions

View File

@@ -12,3 +12,4 @@
!setup.cfg !setup.cfg
!entrypoint.sh !entrypoint.sh
!entrypoint-cron.sh !entrypoint-cron.sh
!requirements.txt

View File

@@ -1,10 +1,13 @@
DJANGO_SECRET_KEY = 'Please set me correctly' # Set this or it won't work.
DJANGO_SECRET_KEY =
DJANGO_DEBUG = False DJANGO_DEBUG = False
#set this to the hostname of your server.
DJANGO_ALLOWED_HOSTS = 'localhost' DJANGO_ALLOWED_HOSTS = 'localhost'
DB_USER=admin DB_USER=admin
#Please set a better password
DB_PASS=password DB_PASS=password
DB_HOST=database DB_HOST=database
DB_DATABASE=cbwebreader DB_DATABASE=cbwebreader
@@ -12,9 +15,10 @@ DB_DATABASE=cbwebreader
# https://github.com/jacobian/dj-database-url # https://github.com/jacobian/dj-database-url
DATABASE_URL = 'postgres://${DB_USER}:${DB_PASS}@${DB_HOST}/${DB_DATABASE}' DATABASE_URL = 'postgres://${DB_USER}:${DB_PASS}@${DB_HOST}/${DB_DATABASE}'
#Path to your comics.
COMIC_BOOK_VOLUME = '/path/to/comic/folder' COMIC_BOOK_VOLUME = '/path/to/comic/folder'
STATIC_ROOT = 'path/to/static/files' STATIC_ROOT = '/static'
# This expects the office winrar unrar command line tool for windows or linux. # This expects the office winrar unrar command line tool for windows or linux.
# Will work without setting if it is in the path # Will work without setting if it is in the path
@@ -25,5 +29,5 @@ STATIC_ROOT = 'path/to/static/files'
# DJANGO_RECAPTCHA_PRIVATE_KEY = '' # DJANGO_RECAPTCHA_PRIVATE_KEY = ''
# DJANGO_RECAPTCHA_PUBLIC_KEY = '' # DJANGO_RECAPTCHA_PUBLIC_KEY = ''
# Uncomment the following is using a reverse proxy. # Comment the following if not using a reverse proxy.
# USE_X_FORWARDED_HOST=True USE_X_FORWARDED_HOST=True

View File

@@ -21,15 +21,12 @@ RUN apk add --no-cache --virtual .build-deps mariadb-dev build-base \
&& apk add --virtual .runtime-deps mariadb-connector-c-dev mariadb-connector-c \ && apk add --virtual .runtime-deps mariadb-connector-c-dev mariadb-connector-c \
&& apk del .build-deps && apk del .build-deps
RUN pip install "poetry==1.1.4" COPY requirements.txt /src
RUN pip install -r requirements.txt
ADD https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh /src ADD https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh /src
COPY pyproject.toml /src
RUN poetry config virtualenvs.create false \
&& poetry install --no-interaction --no-ansi
COPY entrypoint.sh /src COPY entrypoint.sh /src
COPY . /src/ COPY . /src/

View File

@@ -17,7 +17,7 @@ load_dotenv(Path(BASE_DIR, '.env'))
# See https://docs.djangoproject.com/en/1.8/howto/deployment/checklist/ # See https://docs.djangoproject.com/en/1.8/howto/deployment/checklist/
# SECURITY WARNING: keep the secret key used in production secret! # SECURITY WARNING: keep the secret key used in production secret!
SECRET_KEY = os.environ.get("DJANGO_SECRET_KEY", "9!u#3b@%&vhmh2f89l+tl6r30ce_c&e22bc3l8jx_7#mybxbdq") SECRET_KEY = os.environ.get("DJANGO_SECRET_KEY", None)
# SECURITY WARNING: don't run with debug turned on in production! # SECURITY WARNING: don't run with debug turned on in production!
DEBUG = os.getenv('DJANGO_DEBUG', False) == 'True' DEBUG = os.getenv('DJANGO_DEBUG', False) == 'True'