diff --git a/docker-compose.yml b/docker-compose.yml index 36ff364..62ba6ea 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -20,19 +20,21 @@ services: volumes: - arches-log:/arches/arches/logs - arches-static:/static_root - # $ARCHES_ROOT:/web_root/arches + - $ARCHES_ROOT:/web_root/arches # $ARCHES_ROOT/docker/gunicorn_config.py:/web_root/arches/gunicorn_config.py # ./$ARCHES_PROJECT/media/node_modules/arches/docker/gunicorn_config.py:/web_root/arches/arches/gunicorn_config.py - ${ARCHES_PROJECT_ROOT}.:/web_root/$ARCHES_PROJECT - ${ARCHES_PROJECT_ROOT}./docker/entrypoint.sh:/web_root/entrypoint.sh - ${ARCHES_PROJECT_ROOT}./docker/settings_docker.py:/web_root/$ARCHES_PROJECT/$ARCHES_PROJECT/settings_local.py + - ${ARCHES_PROJECT_ROOT}./../arches-orm/arches_orm:/web_root/ENV/lib/python3.10/site-packages/arches_orm environment: - ARCHES_PROJECT=$ARCHES_PROJECT - INSTALL_DEFAULT_GRAPHS=False - INSTALL_DEFAULT_CONCEPTS=False - PGUSERNAME=postgres - PGPASSWORD=postgres - - PGDBNAME=arches + - PGDBNAME=arches2 + - CASBIN_RELOAD_QUEUE=True - PGHOST=db - PGPORT=5432 - ESHOST=elasticsearch @@ -74,7 +76,7 @@ services: - INSTALL_DEFAULT_CONCEPTS=False - PGUSERNAME=postgres - PGPASSWORD=postgres - - PGDBNAME=arches + - PGDBNAME=arches2 - PGHOST=db - PGPORT=5432 - ESHOST=elasticsearch @@ -103,13 +105,13 @@ services: volumes: - arches-log:/arches/arches/logs - arches-static:/static_root - # $ARCHES_ROOT:/web_root/arches + - $ARCHES_ROOT:/web_root/arches # $ARCHES_ROOT/docker/gunicorn_config.py:/web_root/arches/gunicorn_config.py # ./$ARCHES_PROJECT/media/node_modules/arches/docker/gunicorn_config.py:/web_root/arches/arches/gunicorn_config.py - ${ARCHES_PROJECT_ROOT}.:/web_root/$ARCHES_PROJECT - ${ARCHES_PROJECT_ROOT}./docker/entrypoint.sh:/web_root/entrypoint.sh - ${ARCHES_PROJECT_ROOT}./docker/settings_docker.py:/web_root/$ARCHES_PROJECT/$ARCHES_PROJECT/settings_local.py - # ${ARCHES_PROJECT_ROOT}./../arches-orm/arches_orm:/web_root/ENV/lib/python3.10/site-packages/arches_orm + - ${ARCHES_PROJECT_ROOT}./../arches-orm/arches_orm:/web_root/ENV/lib/python3.10/site-packages/arches_orm environment: - ARCHES_PROJECT=$ARCHES_PROJECT - INSTALL_DEFAULT_GRAPHS=False @@ -117,7 +119,7 @@ services: - GUNICORN_WORKER_TIMEOUT=300 - PGUSERNAME=postgres - PGPASSWORD=postgres - - PGDBNAME=arches + - PGDBNAME=arches2 - PGHOST=db - PGPORT=5432 - ESHOST=elasticsearch @@ -154,26 +156,27 @@ services: volumes: - arches-log:/arches/arches/logs - arches-static:/static_root - # $ARCHES_ROOT:/web_root/arches + - $ARCHES_ROOT:/web_root/arches # $ARCHES_ROOT/docker/gunicorn_config.py:/web_root/arches/gunicorn_config.py # ./$ARCHES_PROJECT/media/node_modules/arches/docker/gunicorn_config.py:/web_root/arches/arches/gunicorn_config.py - ${ARCHES_PROJECT_ROOT}.:/web_root/$ARCHES_PROJECT - ${ARCHES_PROJECT_ROOT}./docker/entrypoint.sh:/web_root/entrypoint.sh - ${ARCHES_PROJECT_ROOT}./docker/settings_docker.py:/web_root/$ARCHES_PROJECT/$ARCHES_PROJECT/settings_local.py - # ${ARCHES_PROJECT_ROOT}./../arches-orm/arches_orm:/web_root/ENV/lib/python3.10/site-packages/arches_orm + - ${ARCHES_PROJECT_ROOT}./../arches-orm/arches_orm:/web_root/ENV/lib/python3.10/site-packages/arches_orm environment: - ARCHES_PROJECT=$ARCHES_PROJECT - INSTALL_DEFAULT_GRAPHS=False - INSTALL_DEFAULT_CONCEPTS=False - PGUSERNAME=postgres - PGPASSWORD=postgres - - PGDBNAME=arches + - PGDBNAME=arches2 - PGHOST=db - PGPORT=5432 - ESHOST=elasticsearch - ESPORT=9200 - DJANGO_MODE=DEV - DJANGO_DEBUG=True + - CASBIN_RELOAD_QUEUE=True # - DJANGO_REMOTE_DEBUG=False - DOMAIN_NAMES=localhost - PYTHONUNBUFFERED=0 @@ -195,8 +198,8 @@ services: # template directory created image: kartoza/postgis:12.0 volumes: - - postgres-data:/var/lib/postgresql - - postgres-log:/var/log/postgresql + - postgres2-data:/var/lib/postgresql + - postgres2-log:/var/log/postgresql - ${ARCHES_PROJECT_ROOT}./docker/init-unix.sql:/docker-entrypoint-initdb.d/init.sql # to set up the DB template ports: - '5432:5432' @@ -235,7 +238,7 @@ services: volumes: arches-log: arches-static: - postgres-log: - postgres-data: + postgres2-log: + postgres2-data: elasticsearch-data: cantaloupe-data: