Minor Docker Reference Updates

Minor Docker Reference Updates

backend/Dockerfile

@@ -7,13 +7,13 @@ have a contract or agreement with DanswerAI, you are not permitted to use the En
 Edition features outside of personal development or testing purposes. Please reach out to \
 founders@onyx.app for more information. Please visit https://github.com/onyx-dot-app/onyx"
 
-# Default DANSWER_VERSION, typically overriden during builds by GitHub Actions.
+# Default ONYX_VERSION, typically overriden during builds by GitHub Actions.
-ARG DANSWER_VERSION=0.8-dev
+ARG ONYX_VERSION=0.8-dev
-ENV DANSWER_VERSION=${DANSWER_VERSION} \
+ENV ONYX_VERSION=${ONYX_VERSION} \
     DANSWER_RUNNING_IN_DOCKER="true"
 
 
-RUN echo "DANSWER_VERSION: ${DANSWER_VERSION}"
+RUN echo "ONYX_VERSION: ${ONYX_VERSION}"
 # Install system dependencies
 # cmake needed for psycopg (postgres)
 # libpq-dev needed for psycopg (postgres)

backend/Dockerfile.model_server

@@ -6,13 +6,13 @@ AI models for Onyx. This container and all the code is MIT Licensed and free for
 You can find it at https://hub.docker.com/r/onyx/onyx-model-server. For more details, \
 visit https://github.com/onyx-dot-app/onyx."
 
-# Default DANSWER_VERSION, typically overriden during builds by GitHub Actions.
+# Default ONYX_VERSION, typically overriden during builds by GitHub Actions.
-ARG DANSWER_VERSION=0.8-dev
+ARG ONYX_VERSION=0.8-dev
-ENV DANSWER_VERSION=${DANSWER_VERSION} \
+ENV ONYX_VERSION=${ONYX_VERSION} \
     DANSWER_RUNNING_IN_DOCKER="true"
 
 
-RUN echo "DANSWER_VERSION: ${DANSWER_VERSION}"
+RUN echo "ONYX_VERSION: ${ONYX_VERSION}"
 
 COPY ./requirements/model_server.txt /tmp/requirements.txt
 RUN pip install --no-cache-dir --upgrade \

backend/onyx/__init__.py

@@ -1,3 +1,3 @@
 import os
 
-__version__ = os.environ.get("DANSWER_VERSION", "") or "Development"
+__version__ = os.environ.get("ONYX_VERSION", "") or "Development"

deployment/cloud_kubernetes/workers/beat.yaml

@@ -30,7 +30,7 @@ spec:
                 secretKeyRef:
                   name: onyx-secrets
                   key: redis_password
-            - name: DANSWER_VERSION
+            - name: ONYX_VERSION
               value: "v0.11.0-cloud.beta.8"
           envFrom:
             - configMapRef:

deployment/cloud_kubernetes/workers/heavy_worker.yaml

@@ -33,7 +33,7 @@ spec:
                 secretKeyRef:
                   name: onyx-secrets
                   key: redis_password
-            - name: DANSWER_VERSION
+            - name: ONYX_VERSION
               value: "v0.11.0-cloud.beta.8"
           envFrom:
             - configMapRef:

deployment/cloud_kubernetes/workers/indexing_worker.yaml

@@ -35,7 +35,7 @@ spec:
                 secretKeyRef:
                   name: onyx-secrets
                   key: redis_password
-            - name: DANSWER_VERSION
+            - name: ONYX_VERSION
               value: "v0.11.0-cloud.beta.8"
           envFrom:
             - configMapRef:

deployment/cloud_kubernetes/workers/light_worker.yaml

@@ -35,7 +35,7 @@ spec:
                 secretKeyRef:
                   name: onyx-secrets
                   key: redis_password
-            - name: DANSWER_VERSION
+            - name: ONYX_VERSION
               value: "v0.11.0-cloud.beta.8"
           envFrom:
             - configMapRef:

deployment/cloud_kubernetes/workers/primary.yaml

@@ -35,7 +35,7 @@ spec:
                 secretKeyRef:
                   name: onyx-secrets
                   key: redis_password
-            - name: DANSWER_VERSION
+            - name: ONYX_VERSION
               value: "v0.11.0-cloud.beta.8"
           envFrom:
             - configMapRef:

web/Dockerfile

@@ -7,10 +7,10 @@ have a contract or agreement with DanswerAI, you are not permitted to use the En
 Edition features outside of personal development or testing purposes. Please reach out to \
 founders@onyx.app for more information. Please visit https://github.com/onyx-dot-app/onyx"
 
-# Default DANSWER_VERSION, typically overriden during builds by GitHub Actions.
+# Default ONYX_VERSION, typically overriden during builds by GitHub Actions.
-ARG DANSWER_VERSION=0.8-dev
+ARG ONYX_VERSION=0.8-dev
-ENV DANSWER_VERSION=${DANSWER_VERSION}
+ENV ONYX_VERSION=${ONYX_VERSION}
-RUN echo "DANSWER_VERSION: ${DANSWER_VERSION}"
+RUN echo "ONYX_VERSION: ${ONYX_VERSION}"
 
 # Step 1. Install dependencies + rebuild the source code only when needed
 FROM base AS builder

web/next.config.js

@@ -1,6 +1,6 @@
 // Get Onyx Web Version
 const { version: package_version } = require("./package.json"); // version from package.json
-const env_version = process.env.DANSWER_VERSION; // version from env variable
+const env_version = process.env.ONYX_VERSION; // version from env variable
 // Use env version if set & valid, otherwise default to package version
 const version = env_version || package_version;