diff --git a/docker-compose.example.yml b/docker-compose.example.yml index cd9e04e..cc0cbf5 100644 --- a/docker-compose.example.yml +++ b/docker-compose.example.yml @@ -6,9 +6,9 @@ services: build: . working_dir: /app command: > - bash -c "python manage.py migrate - && python3 manage.py collectstatic --noinput - && gunicorn pinry.wsgi:application -b 0.0.0.0:8000 --timeout 30" + bash -c "poetry run python manage.py migrate + && poetry run python3 manage.py collectstatic --noinput + && poetry run gunicorn pinry.wsgi:application -b 0.0.0.0:8000 --timeout 30" ports: - "127.0.0.1:2048:8000" environment: diff --git a/docs/src/development.md b/docs/src/development.md index bd736d3..102f9ed 100644 --- a/docs/src/development.md +++ b/docs/src/development.md @@ -59,24 +59,30 @@ changing settings file in `pinry/settings`. - Docker - Docker Compose -- Set any custom configuration options you need and run:: +- Set any custom configuration options you need and run - cp docker-compose.example.yml docker-compose.yml - \# edit docker-compose.yml and change the secret-key, - \# don't forget to backup this config file. - \# You should build frontend first - docker-compose up build_frontend - \# then start the backend server - docker-compose up -d web -- If you want to run Pinry with current user in docker:: + cp docker-compose.example.yml docker-compose.yml + # edit docker-compose.yml and change the secret-key, + # don't forget to backup this config file. + # You should build frontend first + docker-compose up build_frontend + # then start the backend server + docker-compose up -d web + + +- If you want to run Pinry with current user in docker + ./start_docker_with_current_user.sh [-d] -- Bootstrap the database(optional):: + +- Bootstrap the database(optional) + docker-compose exec web python3 manage.py migrate --settings=pinry.settings.docker + **Note** : No static file server configured, your should configure nginx or other server to serve static files from `./static`(as path `/static`) and `./pinry-spa/dist` (as html root `/`)