Skip to content

Rename docker settings to fix local environment #6703

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

Merged
merged 1 commit into from
Feb 25, 2020
Merged

Rename docker settings to fix local environment #6703

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ env.bak/
venv.bak/

dev.db-journal
/readthedocs/settings/build.py
/readthedocs/settings/celery.py
/readthedocs/settings/web.py
/readthedocs/settings/build_docker.py
/readthedocs/settings/celery_docker.py
/readthedocs/settings/proxito_docker.py
/readthedocs/settings/web_docker.py
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like we don't need / at the start?

Suggested change
/readthedocs/settings/web_docker.py
readthedocs/settings/web_docker.py

16 changes: 8 additions & 8 deletions docker-compose.override.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,17 @@ services:
image: community_server:latest
volumes:
- ${PWD}:/usr/src/app/checkouts/readthedocs.org
- ${PWD}/dockerfiles/settings/proxito.py:/usr/src/app/checkouts/readthedocs.org/readthedocs/settings/proxito.py
- ${PWD}/dockerfiles/settings/proxito.py:/usr/src/app/checkouts/readthedocs.org/readthedocs/settings/proxito_docker.py
environment:
- DJANGO_SETTINGS_MODULE=readthedocs.settings.proxito
- DJANGO_SETTINGS_MODULE=readthedocs.settings.proxito_docker

web:
image: community_server:latest
volumes:
- ${PWD}:/usr/src/app/checkouts/readthedocs.org
- ${PWD}/dockerfiles/settings/web.py:/usr/src/app/checkouts/readthedocs.org/readthedocs/settings/web.py
- ${PWD}/dockerfiles/settings/web.py:/usr/src/app/checkouts/readthedocs.org/readthedocs/settings/web_docker.py
environment:
- DJANGO_SETTINGS_MODULE=readthedocs.settings.web
- DJANGO_SETTINGS_MODULE=readthedocs.settings.web_docker
- HOSTIP=${HOSTIP:-}
extra_hosts:
- "community.dev.readthedocs.io:10.10.0.100"
Expand All @@ -54,18 +54,18 @@ services:
image: community_server:latest
volumes:
- ${PWD}:/usr/src/app/checkouts/readthedocs.org
- ${PWD}/dockerfiles/settings/celery.py:/usr/src/app/checkouts/readthedocs.org/readthedocs/settings/celery.py
- ${PWD}/dockerfiles/settings/celery.py:/usr/src/app/checkouts/readthedocs.org/readthedocs/settings/celery_docker.py
environment:
- DJANGO_SETTINGS_MODULE=readthedocs.settings.celery
- DJANGO_SETTINGS_MODULE=readthedocs.settings.celery_docker
- CELERY_APP_NAME=readthedocs

build:
image: community_server:latest
volumes:
- ${PWD}:/usr/src/app/checkouts/readthedocs.org
- ${PWD}/dockerfiles/settings/build.py:/usr/src/app/checkouts/readthedocs.org/readthedocs/settings/build.py
- ${PWD}/dockerfiles/settings/build.py:/usr/src/app/checkouts/readthedocs.org/readthedocs/settings/build_docker.py
environment:
- DJANGO_SETTINGS_MODULE=readthedocs.settings.build
- DJANGO_SETTINGS_MODULE=readthedocs.settings.build_docker
- CELERY_APP_NAME=readthedocs

storage:
Expand Down