diff --git a/.dockerignore b/.dockerignore index 8f98fec..d276e0b 100644 --- a/.dockerignore +++ b/.dockerignore @@ -11,4 +11,5 @@ !pyproject.toml !setup.cfg !entrypoint.sh -!entrypoint-cron.sh \ No newline at end of file +!entrypoint-cron.sh +!requirements.txt \ No newline at end of file diff --git a/.env.example b/.env.example index d46d0bc..4729bc8 100644 --- a/.env.example +++ b/.env.example @@ -1,10 +1,13 @@ -DJANGO_SECRET_KEY = 'Please set me correctly' +# Set this or it won't work. +DJANGO_SECRET_KEY = DJANGO_DEBUG = False +#set this to the hostname of your server. DJANGO_ALLOWED_HOSTS = 'localhost' DB_USER=admin +#Please set a better password DB_PASS=password DB_HOST=database DB_DATABASE=cbwebreader @@ -12,9 +15,10 @@ DB_DATABASE=cbwebreader # https://github.com/jacobian/dj-database-url DATABASE_URL = 'postgres://${DB_USER}:${DB_PASS}@${DB_HOST}/${DB_DATABASE}' +#Path to your comics. 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. # 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_PUBLIC_KEY = '' -# Uncomment the following is using a reverse proxy. -# USE_X_FORWARDED_HOST=True \ No newline at end of file +# Comment the following if not using a reverse proxy. +USE_X_FORWARDED_HOST=True \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 7be725c..0419706 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 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 -COPY pyproject.toml /src - -RUN poetry config virtualenvs.create false \ - && poetry install --no-interaction --no-ansi - COPY entrypoint.sh /src COPY . /src/ diff --git a/cbreader/settings/base.py b/cbreader/settings/base.py index b18740d..6f6cad1 100644 --- a/cbreader/settings/base.py +++ b/cbreader/settings/base.py @@ -17,7 +17,7 @@ load_dotenv(Path(BASE_DIR, '.env')) # See https://docs.djangoproject.com/en/1.8/howto/deployment/checklist/ # 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! DEBUG = os.getenv('DJANGO_DEBUG', False) == 'True'