Merge branch 'dev'

UAlbertaALTLab · Aug 23, 2024 · 4f7da78 · 4f7da78
2 parents cdd3034 + b90ad86
commit 4f7da78
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 0 deletions.
diff --git a/.github/workflows/test-and-deploy.yml b/.github/workflows/test-and-deploy.yml
@@ -166,6 +166,12 @@ jobs:
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GHCR_PERSONAL_ACCESS_TOKEN }}
       - uses: actions/checkout@v4
+      - name: Rename docker-compose for dev
+        run: mv docker/docker-compose-dev.yml docker/docker-compose.yml
+      - name: Change crkeng settings to dev
+        run: sed -i 's/itwewina.altlab.app/itwewina.altlab.dev/g' src/crkeng/site/settings.py
+      - name: Ensure banner appears on dev
+        run: sed -i 's/MORPHODICT_PREVIEW_WARNING = False/# MORPHODICT_PREVIEW_WARNING = False/' src/crkeng/site/settings.py  
       - name: Build and push Docker images
         uses: docker/build-push-action@v6
         with:

diff --git a/docker/docker-compose-dev.yml b/docker/docker-compose-dev.yml
@@ -0,0 +1,34 @@
+#  WARNING: This file is autogenerated by make-yaml. Changes here
+#  will be overwritten. Edit the corresponding .template file
+#  instead.
+
+version: "3"
+
+services:
+  crkeng-dev:
+    restart: always
+    # Specify hostname to make it clearer which container is active when
+    # using docker to get a shell in the container.
+    hostname: crkeng-dev-container
+    image: ghcr.io/ualbertaaltlab/itwewina.altlab.app:dev
+    command: /app/app.sh crkeng
+    deploy:
+      resources:
+        limits:
+          memory: 2048M
+    ports:
+      - "8211:8000" # http
+      - "9211:9191" # uWSGI stats
+    volumes:
+      - "./.env:/app/.env"
+
+      # LFS mounts
+      - "../src/morphodict/lexicon/resources/vector_models/:/app/src/morphodict/lexicon/resources/vector_models/:ro"
+      - "../src/crkeng/resources/fst:/app/src/crkeng/resources/fst:ro"
+      - "../src/CreeDictionary/res/fst/:/app/src/CreeDictionary/res/fst/:ro"
+      - "../src/CreeDictionary/res/:/app/src/CreeDictionary/res/:ro"
+      - "../src/crkeng/resources/dictionary/:/app/src/crkeng/resources/dictionary/:ro"
+
+      - "/data_local/application-data/crkeng-dev/vector_models:/app/src/crkeng/resources/vector_models/"
+      - "/data_local/application-data/crkeng-dev/db:/app/src/crkeng/db/"
+      - "/data_local/application-data/crkeng-dev/search_quality:/app/src/crkeng/CreeDictionary/search_quality/"
diff --git a/src/arpeng/site/settings.py b/src/arpeng/site/settings.py
@@ -22,6 +22,7 @@
 PRODUCTION_HOST = "nihiitono.altlab.dev"
 
 ALLOWED_HOSTS.append(PRODUCTION_HOST)
+CSRF_TRUSTED_ORIGINS.append("https://" + PRODUCTION_HOST)
 
 DEFAULT_RUNSERVER_PORT = 8007
 

diff --git a/src/blaeng/site/settings.py b/src/blaeng/site/settings.py
@@ -22,6 +22,7 @@
 PRODUCTION_HOST = "ipowahsin.altlab.dev"
 
 ALLOWED_HOSTS.append(PRODUCTION_HOST)
+CSRF_TRUSTED_ORIGINS.append("https://" + PRODUCTION_HOST)
 
 DEFAULT_RUNSERVER_PORT = 8011
 

diff --git a/src/crkLacombeeng/site/settings.py b/src/crkLacombeeng/site/settings.py
@@ -22,6 +22,7 @@
 PRODUCTION_HOST = "lacombe.altlab.dev"
 
 ALLOWED_HOSTS.append(PRODUCTION_HOST)
+CSRF_TRUSTED_ORIGINS.append("https://" + PRODUCTION_HOST)
 
 DEFAULT_RUNSERVER_PORT = 8016
 

diff --git a/src/cwdeng/site/settings.py b/src/cwdeng/site/settings.py
@@ -24,6 +24,7 @@
 DEFAULT_RUNSERVER_PORT = 8005
 
 ALLOWED_HOSTS.append(PRODUCTION_HOST)
+CSRF_TRUSTED_ORIGINS.append("https://" + PRODUCTION_HOST)
 
 FST_TOOL_SAMPLES = [
     "kika-nîminaw",

diff --git a/src/hdneng/site/settings.py b/src/hdneng/site/settings.py
@@ -22,6 +22,7 @@
 PRODUCTION_HOST = "guusaaw.altlab.dev"
 
 ALLOWED_HOSTS.append(PRODUCTION_HOST)
+CSRF_TRUSTED_ORIGINS.append("https://" + PRODUCTION_HOST)
 
 DEFAULT_RUNSERVER_PORT = 8010
 

diff --git a/src/srseng/site/settings.py b/src/srseng/site/settings.py
@@ -24,6 +24,7 @@
 DEFAULT_RUNSERVER_PORT = 8009
 
 ALLOWED_HOSTS.append(PRODUCTION_HOST)
+CSRF_TRUSTED_ORIGINS.append("https://" + PRODUCTION_HOST)
 
 INSTALLED_APPS.insert(0, "srseng.app")