-
-
Notifications
You must be signed in to change notification settings - Fork 38
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.
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
Add a Docker Compose setup for development. #128
Merged
Merged
Changes from 7 commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
a09ce00
Add a Docker Compose setup.
toolness bb5346a
Make app and docs ports configurable.
toolness 8f3856b
Add .dockerignore.
toolness 21c6301
Wait for postgres in app container.
toolness 8108b9e
Run app container in /app.
toolness 21d76f6
Add docs to contributing.
toolness 6a2469e
Add settings.LOGIN_URL.
toolness 274aa93
Run black.
toolness a801dc2
Make GID, UID customizable and document it.
toolness ee4ba16
Move LOGIN_URL to settings.py.
toolness fb0e441
Add redirect from / to /dashboard/.
toolness 3570550
Auto-run migrations on 'docker compose up'.
toolness 62813f4
Fix broken test.
toolness 9d2f926
Typo
simonw File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
.venv | ||
.vscode | ||
__pycache__/ | ||
*.py[cod] | ||
*$py.class | ||
venv | ||
.eggs | ||
.pytest_cache | ||
*.egg-info | ||
.DS_Store |
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,27 @@ | ||
FROM python:3.9 | ||
|
||
WORKDIR /app | ||
|
||
# Set up the minimum structure needed to install | ||
# django_sql_dashboard's dependencies and the package itself | ||
# in development mode. | ||
COPY setup.py README.md . | ||
RUN mkdir django_sql_dashboard && pip install -e '.[test]' | ||
|
||
# We need to have postgres installed in this container | ||
# because the automated test suite actually spins up | ||
# (and shuts down) a database inside the container. | ||
RUN apt-get update && apt-get install -y \ | ||
postgresql postgresql-contrib \ | ||
&& rm -rf /var/lib/apt/lists/* | ||
|
||
# Install dependencies needed for editing documentation. | ||
COPY docs/requirements.txt . | ||
RUN pip install -r requirements.txt | ||
|
||
# Set up a non-root user. Aside from being best practice, | ||
# we also need to do this because the test suite refuses to | ||
# run as the root user. | ||
RUN groupadd -g 1000 appuser && useradd -r -u 1000 -g appuser appuser | ||
|
||
USER appuser |
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,34 @@ | ||
version: "2" | ||
services: | ||
app: | ||
build: . | ||
links: | ||
- db | ||
volumes: | ||
- .:/app | ||
environment: | ||
- DATABASE_URL=postgres://appuser:test123@db/test_project | ||
- DJANGO_SETTINGS_MODULE=config.settings_interactive | ||
- PYTHONUNBUFFERED=yup | ||
working_dir: /app | ||
entrypoint: ["./test_project/wait-for-postgres.sh"] | ||
toolness marked this conversation as resolved.
Show resolved
Hide resolved
|
||
ports: | ||
- "${APP_PORT:-8000}:${APP_PORT:-8000}" | ||
command: python test_project/manage.py runserver 0.0.0.0:${APP_PORT:-8000} | ||
docs: | ||
build: . | ||
volumes: | ||
- .:/app | ||
working_dir: /app/docs | ||
ports: | ||
- "${DOCS_PORT:-8001}:${DOCS_PORT:-8001}" | ||
command: make SPHINXOPTS="--host 0.0.0.0 --port ${DOCS_PORT:-8001}" livehtml | ||
db: | ||
# Note that this database is only used when we use | ||
# test_project interactively; automated tests spin up | ||
# their own database inside the app container. | ||
image: postgres:13-alpine | ||
environment: | ||
- POSTGRES_PASSWORD=test123 | ||
- POSTGRES_USER=appuser | ||
- POSTGRES_DB=test_project |
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 |
---|---|---|
@@ -0,0 +1,14 @@ | ||
# Normally test_project is used as scaffolding for | ||
# django_sql_dashboard's automated tests. However, it can | ||
# be useful during development to have a sample project to | ||
# tinker with interactively. These Django settings can be | ||
# useful when we want to do that. | ||
|
||
from .settings import * | ||
|
||
# Just have our dashboard use the exact same credentials for | ||
# our database, there's no need to bother with read-only | ||
# permissions when using test_project interactively. | ||
DATABASES["dashboard"] = DATABASES["default"] | ||
|
||
LOGIN_URL="/admin/login/" | ||
toolness marked this conversation as resolved.
Show resolved
Hide resolved
|
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,11 @@ | ||
#!/bin/sh | ||
# wait-for-postgres.sh | ||
|
||
set -e | ||
|
||
until psql $DATABASE_URL -c '\q'; do | ||
>&2 echo "Postgres is unavailable - sleeping" | ||
sleep 1 | ||
done | ||
|
||
exec "$@" |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Note that this assumes that the UID of the current user is 1000, which it usually is on individual OS X and Linux machines (it's the UID of the first non-root account). However, if it's different, the user could run into some really annoying permission issues.
There are some funky workarounds to set this to the UID of the user who is currently active, I think. I can try looking into it.