chore: merge

.github/workflows/continuous.yaml

@@ -1,11 +1,7 @@
 name: Continuous
 on:
   push:
-    branches:
-      - "*"
   pull_request:
-    branches:
-      - "*"
 
 concurrency:
   group: ${{ github.ref }}
@@ -93,6 +89,8 @@ jobs:
 #         cache-to: type=registry,ref=gcr.io/${{ secrets.DEV_PROJECT }}/sefaria-${{ matrix.app }}/cache, mode=max
           context: .
           push: true
+          build-args: |
+            TYPE=build
           file: ./build/${{ matrix.app }}/Dockerfile
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

.github/workflows/production-deploy.yaml

@@ -97,6 +97,8 @@ jobs:
 #         cache-to: type=registry,ref=$gcr.io/${{ secrets.PROD_GKE_PROJECT }}/{{ secrets.IMAGE_NAME }}-${{ matrix.app }}/cache,mode=max
           context: .
           push: true
+          build-args: |
+            TYPE=build-prod
           file: ./build/${{ matrix.app }}/Dockerfile
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
@@ -218,7 +220,6 @@ jobs:
           IMAGE_NAME: "${{ secrets.IMAGE_NAME }}"
           CHART_VERSION: "${{ steps.chart_version.outputs.chart_version }}"
       - name: Update workflow default chart
-        if: github.ref == 'refs/heads/master'
         run: > 
           curl -L 
           -X PATCH 

README.mkd

@@ -108,7 +108,7 @@ If the server isn't running, you may need to run `docker-compose up` again.
 #### Run locally
 #### 1) Install Python 3.7
 
-*We Recommend using the latest Python 3.7 as opposed to later versions of Python (esp 3.10 and up) since it has been known to cause some compatability issues. These are solvable, but for an easier install experience, we currently recommend 3.7*
+*We Recommend using the latest Python 3.7 as opposed to later versions of Python (esp 3.10 and up) since it has been known to cause some compatibility issues. These are solvable, but for an easier install experience, we currently recommend 3.7*
 
 ###### Linux and macOS
 Most UNIX systems come with a python interpreter pre-installed. However, this is generally still Python 2. The recommended way to get Python 3, and not mess up any software the OS is dependent on, is by using Pyenv. You can use the instructions [here](https://github.com/pyenv/pyenv#installation) and also [here](https://opensource.com/article/19/5/python-3-default-mac#what-we-should-do).

build/ci/production-values.yaml

@@ -193,7 +193,7 @@ secrets:
   slackWebhook:
     ref: slack-webhook-production
 instrumentation:
-  enabled: true
+  enabled: false
   otelEndpoint: "http://otel-collector-collector.monitoring:4317"
   jaegerEndpoint: "jaeger-agent-dev.monitoring.svc.cluster.local:6831"
 

build/node/Dockerfile

@@ -1,4 +1,5 @@
 FROM gcr.io/production-deployment/base-node:v13.0.0
+ARG TYPE=build-prod
 
 WORKDIR /app/
 
@@ -7,7 +8,7 @@ RUN npm install --unsafe-perm
 
 COPY ./node /app/node
 COPY ./static/js /app/static/js
-RUN npm run build-prod
+RUN npm run $TYPE
 
 COPY . /app/
 EXPOSE 3000

build/web/Dockerfile

@@ -1,4 +1,5 @@
 FROM gcr.io/production-deployment/base-web:v3.7-bullseye
+ARG TYPE=build-prod
 
 WORKDIR /app/
 # Copied separately to allow for caching of the `pip install` build step
@@ -10,7 +11,7 @@ RUN npm install --unsafe-perm
 
 COPY ./node /app/node
 COPY ./static/js /app/static/js
-RUN npm run build-prod
+RUN npm run $TYPE
 
 COPY . /app/
 

helm-chart/sefaria-project/templates/configmap/create-mongo-dumps.yaml

@@ -67,7 +67,7 @@ data:
     sleep 2
     done
 
-    until mongodump --uri="$URI" -v -d $DATABASE --excludeCollection=history --excludeCollection=texts --excludeCollection=sheets --excludeCollection=links --excludeCollection=user_history -o "${DATADIR}/dump"
+    until mongodump --uri="$URI" -v -d $DATABASE --excludeCollection=history --excludeCollection=texts --excludeCollection=sheets --excludeCollection=links --excludeCollection=django_cache  --excludeCollection=user_history -o "${DATADIR}/dump"
     do
     echo "trying to dump other stuff again"
     sleep 2

helm-chart/sefaria-project/templates/configmap/mongo-destroy.yaml

@@ -8,7 +8,7 @@ metadata:
     {{- include "sefaria.labels" . | nindent 4 }}
   annotations:
     helm.sh/hook: post-delete
-    helm.sh/hook-delete-policy: hook-succeeded
+    helm.sh/hook-delete-policy: hook-succeeded, hook-failed
     helm.sh/hook-weight: "5"
 data:
   destroy-mongo.sh: |-
@@ -37,8 +37,14 @@ data:
     DB_NAME=$SEFARIA_DB
     {{ end }}
 
-    URI="${URI}${MONGO_HOST}/${DATABASE}?ssl=false&authSource=admin"
+    echo "APSCHEDULER: ${APSCHEDULER_NAME}"
+
+    if [[ -z "$APSCHEDULER_NAME" ]]; then
+      APSCHEDULER_NAME={{ tpl .Values.localSettings.APSCHEDULER_NAME . | quote }}
+    fi
+
     APSCHEDULER_URI="${URI}${MONGO_HOST}/${APSCHEDULER_NAME}?ssl=false&authSource=admin"
+    URI="${URI}${MONGO_HOST}/${DB_NAME}?ssl=false&authSource=admin"
 
     if [[ ! -z "$MONGO_REPLICASET_NAME" ]]; then
     URI="${URI}&replicaSet=${MONGO_REPLICASET_NAME}"