Merge branch 'develop' into upstream/pbs-25-08

Author: brianjgeiger

.docker-compose.gv.env

@@ -1,4 +1,4 @@
-ALLOWED_HOSTS="localhost,192.168.168.167"
+ALLOWED_HOSTS="localhost,192.168.168.167,127.0.0.1"
 CORS_ALLOWED_ORIGINS="http://localhost:5000,http://192.168.168.167:5000"
 OSFDB_HOST=192.168.168.167
 POSTGRES_HOST="$OSFDB_HOST"
@@ -7,5 +7,10 @@ OSF_API_BASE_URL="http://192.168.168.167:8000"
 POSTGRES_USER="postgres"
 POSTGRES_DB="gravyvalet"
 SECRET_KEY="secret"
-PYTHONUNBUFFERED=0 # This when set to 0 will allow print statements to be visible in the Docker logs
+PYTHONUNBUFFERED=1 # This when set to 0 will allow print statements to be visible in the Docker logs
+OSF_AUTH_COOKIE_NAME=osf
+OSF_SENSITIVE_DATA_SECRET="TrainglesAre5Squares"
+OSF_SENSITIVE_DATA_SALT="yusaltydough"
+DEBUG=1
+
 

docker-compose.yml

@@ -86,6 +86,8 @@ services:
     ports:
       - 5432:5432
     environment:
+      POSTGRES_DB: osf
+      POSTGRES_HOST_AUTH_METHOD: trust
       POSTGRES_INITDB_SQL: |
         SELECT 'CREATE DATABASE gravyvalet' WHERE NOT EXISTS (SELECT FROM pg_database WHERE datname = 'gravyvalet')\gexec
     volumes:
@@ -534,13 +536,15 @@ services:
     command:
       - /bin/bash
       - -c
-      - pip install -r requirements/dev-requirements.txt &&
-        (python3 -m compileall /usr/local/lib/python3.12 || true) &&
-        rm -Rf /python3.12/* &&
-        cp -Rf -p /usr/local/lib/python3.12 /
+      - python -m venv /tmp/venv
+        && /tmp/venv/bin/pip install poetry==1.8.3 &&
+        /tmp/venv/bin/poetry config virtualenvs.create false --local &&
+        /tmp/venv/bin/poetry install --no-root --with dev --without release --compile --sync &&
+        rm -rf /python3.13/* &&
+        cp -Rf -p /usr/local/lib/python3.13 /
     restart: 'no'
     volumes:
-      - gv_requirements_vol:/python3.12
+      - gv_requirements_vol:/python3.13
 
   gv:
     image: quay.io/centerforopenscience/gravyvalet:develop
@@ -556,7 +560,39 @@ services:
     environment:
       DJANGO_SETTINGS_MODULE: app.settings
     volumes:
-      - gv_requirements_vol:/usr/local/lib/python3.12
+      - gv_requirements_vol:/usr/local/lib/python3.13
+    stdin_open: true
+
+  gv_worker:
+    image: quay.io/centerforopenscience/gravyvalet:develop
+    command: python -m celery --app app worker --uid daemon -l info
+    restart: unless-stopped
+    depends_on:
+      - postgres
+      - api
+      - rabbitmq
+    env_file:
+      - .docker-compose.gv.env
+    environment:
+      DJANGO_SETTINGS_MODULE: app.settings
+    volumes:
+      - gv_requirements_vol:/usr/local/lib/python3.13
+    stdin_open: true
+
+  gv_beat:
+    image: quay.io/centerforopenscience/gravyvalet:develop
+    command: python -m celery --app app beat --uid daemon -l info
+    restart: unless-stopped
+    depends_on:
+      - postgres
+      - api
+      - rabbitmq
+    env_file:
+      - .docker-compose.gv.env
+    environment:
+      DJANGO_SETTINGS_MODULE: app.settings
+    volumes:
+      - gv_requirements_vol:/usr/local/lib/python3.13
     stdin_open: true
 
   pigeon: