diff --git a/Dockerfile b/Dockerfile index e8e99c4e..8bb98ee2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,7 +36,9 @@ RUN --mount=type=ssh \ # Now copy source and do a final sync to install the project itself # Ensure .dockerignore is reasonable +COPY bayer bayer COPY bridge bridge +COPY biotransformer biotransformer COPY envipath envipath COPY epapi epapi COPY epauth epauth diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 0c0cdac6..ad4174fa 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -1,26 +1,54 @@ services: db: image: postgres:18 - container_name: envipath-postgres + container_name: eppostgres environment: - POSTGRES_USER: postgres - POSTGRES_PASSWORD: postgres - POSTGRES_DB: envipath + POSTGRES_USER: ${POSTGRES_USER} + POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} + POSTGRES_DB: ${POSTGRES_DB} ports: - "5432:5432" volumes: - - postgres_data:/var/lib/postgresql + - ep_bayer_postgres_data:/var/lib/postgresql healthcheck: - test: ["CMD-SHELL", "pg_isready -U postgres"] + test: [ "CMD-SHELL", "pg_isready -U postgres" ] interval: 5s timeout: 5s retries: 5 redis: image: redis:7-alpine - container_name: envipath-redis + container_name: epredis ports: - "6379:6379" + volumes: + - ep_bayer_redis_data:/data + + biotransformer3: + image: envipath/biotransformer3:1.0 + container_name: epbiotransformer3 + +# web: +# image: envipath/envipy-bayer:1.0 +# container_name: epdjango +# ports: +# - "127.0.0.1:8000:8000" +# env_file: +# - .env +# command: gunicorn envipath.wsgi:application --bind 0.0.0.0:8000 --workers 3 +# volumes: +# - ep_bayer_data:/opt/enviPy/ + + celery_worker: + image: envipath/envipy-bayer:1.0 + container_name: epcelery + env_file: + - .env.dev + command: celery -A envipath worker --concurrency=6 -Q model,predict,background --pool threads + volumes: + - ep_bayer_data:/opt/enviPy/ volumes: - postgres_data: + ep_bayer_postgres_data: + ep_bayer_redis_data: + ep_bayer_data: