Quellcode durchsuchen

fix: fix development docker building

tags/v2.1.12
winkidney vor 2 Jahren
Ursprung
Commit
c70800d494
2 geänderte Dateien mit 19 neuen und 13 gelöschten Zeilen
  1. +3
    -3
      docker-compose.example.yml
  2. +16
    -10
      docs/src/development.md

+ 3
- 3
docker-compose.example.yml Datei anzeigen

@@ -6,9 +6,9 @@ services:
build: . build: .
working_dir: /app working_dir: /app
command: > 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: ports:
- "127.0.0.1:2048:8000" - "127.0.0.1:2048:8000"
environment: environment:


+ 16
- 10
docs/src/development.md Datei anzeigen

@@ -59,24 +59,30 @@ changing settings file in `pinry/settings`.
- Docker - Docker
- Docker Compose - 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] ./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 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 **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 `/`) static files from `./static`(as path `/static`) and `./pinry-spa/dist` (as html root `/`)

Laden…
Abbrechen
Speichern