[REF] prepare compose.neurosynth.org

.github/workflows/workflow.yml

@@ -63,7 +63,7 @@ jobs:
     runs-on: ubuntu-latest
     defaults:
       run:
-        working-directory: synth
+        working-directory: compose
     steps:
     - 
       name: Checkout
@@ -105,22 +105,22 @@ jobs:
         AUTH0_AUTH_URL: ${{ secrets.AUTH0_AUTH_URL }}
       run: |
         docker-compose run \
-          -e "APP_SETTINGS=neurosynth.config.DockerTestConfig" \
+          -e "APP_SETTINGS=neurosynth_compose.config.DockerTestConfig" \
           -e "AUTH0_CLIENT_ID=${AUTH0_CLIENT_ID}" \
           -e "AUTH0_CLIENT_SECRET=${AUTH0_CLIENT_SECRET}" \
           -e "AUTH0_BASE_URL=${AUTH0_BASE_URL}" \
           -e "AUTH0_ACCESS_TOKEN_URL=${AUTH0_ACCESS_TOKEN_URL}" \
           -e "AUTH0_AUTH_URL=${AUTH0_AUTH_URL}" \
           --rm -w /neurosynth \
           neurosynth \
-          python -m pytest neurosynth/tests
+          python -m pytest neurosynth_compose/tests
     -
       name: Frontend Configuration
       run: |
         cd neurosynth-frontend/ && \
         cp .env.example .env.dev && \
         docker-compose run \
-          -e "APP_SETTINGS=neurosynth.config.DockerTestConfig" \
+          -e "APP_SETTINGS=neurosynth_compose.config.DockerTestConfig" \
           -e "AUTH0_CLIENT_ID=${AUTH0_CLIENT_ID}" \
           -e "AUTH0_CLIENT_SECRET=${AUTH0_CLIENT_SECRET}" \
           -e "AUTH0_BASE_URL=${AUTH0_BASE_URL}" \
@@ -140,7 +140,7 @@ jobs:
       name: Build Frontend
       run: |
         docker-compose run \
-          -e "APP_SETTINGS=neurosynth.config.DockerTestConfig" \
+          -e "APP_SETTINGS=neurosynth_compose.config.DockerTestConfig" \
           -e "AUTH0_CLIENT_ID=${AUTH0_CLIENT_ID}" \
           -e "AUTH0_CLIENT_SECRET=${AUTH0_CLIENT_SECRET}" \
           -e "AUTH0_BASE_URL=${AUTH0_BASE_URL}" \
@@ -167,7 +167,7 @@ jobs:
         REACT_APP_AUTH0_CLIENT_ID: ${{ secrets.REACT_APP_AUTH0_CLIENT_ID }}
       run: |
         docker-compose run \
-          -e "APP_SETTINGS=neurosynth.config.DockerTestConfig" \
+          -e "APP_SETTINGS=neurosynth_compose.config.DockerTestConfig" \
           -e "AUTH0_CLIENT_ID=${AUTH0_CLIENT_ID}" \
           -e "AUTH0_CLIENT_SECRET=${AUTH0_CLIENT_SECRET}" \
           -e "AUTH0_BASE_URL=${AUTH0_BASE_URL}" \
@@ -198,5 +198,5 @@ jobs:
         pip install flake8
         cd ./store
         flake8 ./neurostore
-        cd ../synth
-        flake8 ./neurosynth
+        cd ../compose
+        flake8 ./neurosynth_compose

.gitmodules

@@ -3,11 +3,11 @@
 	url = https://github.com/neurostuff/neurostore-spec
 
 [submodule "synth/neurosynth/openapi"]
-	path = synth/neurosynth/openapi
+	path = compose/neurosynth_compose/openapi
 	url = https://github.com/neurostuff/neurostore-spec
 [submodule "synth/neurosynth-frontend/src/neurostore-typescript-sdk"]
-	path = synth/neurosynth-frontend/src/neurostore-typescript-sdk
+	path = compose/neurosynth-frontend/src/neurostore-typescript-sdk
 	url = https://github.com/neurostuff/neurostore-typescript-sdk.git
 [submodule "synth/neurosynth-frontend/src/neurosynth-compose-typescript-sdk"]
-	path = synth/neurosynth-frontend/src/neurosynth-compose-typescript-sdk
+	path = compose/neurosynth-frontend/src/neurosynth-compose-typescript-sdk
 	url = https://github.com/neurostuff/neurosynth-compose-typescript-sdk.git

synth/.env.example → compose/.env.example

@@ -1,9 +1,9 @@
-APP_SETTINGS=neurosynth.config.DevelopmentConfig
+APP_SETTINGS=neurosynth_compose.config.DevelopmentConfig
 FLASK_APP=manage
 COMPOSE_CONVERT_WINDOWS_PATHS=1
 POSTGRES_HOST=synth_pgsql
 POSTGRES_PASSWORD=example
-BEARERINFO_FUNC=neurosynth.resources.auth.decode_token
+BEARERINFO_FUNC=neurosynth_compose.resources.auth.decode_token
 AUTH0_CLIENT_ID=YOUR_CLIENT_ID
 AUTH0_CLIENT_SECRET=YOUR_CLIENT_SECRET
-V_HOST=localhost
+V_HOST=localhost

compose/docker-compose.dev.yml

@@ -0,0 +1,11 @@
+version: "2"
+services:
+  nginx:
+    ports:
+      - "81:80"
+
+  neurosynth:
+    expose:
+      - "8000"
+    command: /usr/local/bin/gunicorn -w 2 -b :8000 neurosynth_compose.core:app --log-level debug --timeout 300 --reload
+    restart: "no"

synth/docker-compose.yml → compose/docker-compose.yml

@@ -2,16 +2,16 @@ version: "2"
 services:
   neurosynth:
     restart: always
-    build: ./neurosynth
+    build: ./neurosynth_compose
     expose:
       - "8000"
     volumes:
       - ./postgres/migrations:/migrations
       - ./:/neurosynth
-    command: /usr/local/bin/gunicorn -w 2 -b :8000 neurosynth.core:app --log-level debug --timeout 120
+    command: /usr/local/bin/gunicorn -w 2 -b :8000 neurosynth_compose.core:app --log-level debug --timeout 120
     env_file:
       - .env
-    container_name: neurosynth
+    container_name: neurosynth_compose
 
   nginx:
     restart: always
@@ -42,4 +42,4 @@ volumes:
 networks:
   default:
     external:
-      name: nginx-proxy
+      name: nginx-proxy

synth/manage.py → compose/manage.py

@@ -6,9 +6,9 @@
 import click
 from flask_migrate import Migrate
 
-from neurosynth.core import app, db
-from neurosynth import models
-from neurosynth.ingest import neurostore as ingest_nstore
+from neurosynth_compose.core import app, db
+from neurosynth_compose import models
+from neurosynth_compose.ingest import neurostore as ingest_nstore
 
 app.config.from_object(os.environ["APP_SETTINGS"])
 

synth/neurosynth-frontend/package.json → compose/neurosynth-frontend/package.json

@@ -30,8 +30,10 @@
     "scripts": {
         "start:dev": "env-cmd -f .env.dev react-scripts start",
         "start:staging": "env-cmd -f .env.staging react-scripts start",
+        "start:prod": "env-cmd -f .env.prod react-scripts start",
         "build:dev": "env-cmd -f .env.dev react-scripts build",
         "build:staging": "env-cmd -f .env.staging react-scripts build",
+        "build:prod": "env-cmd -f .env.prod react-scripts build",
         "test": "react-scripts test",
         "test-with-coverage": "npm run test -- --coverage --watchAll=false",
         "cy:e2e-headless": "cypress run",