Make EE containers public changes (#67)

.github/workflows/docker-build-push-model-server-container-on-tag.yml

@@ -3,7 +3,7 @@ name: Build and Push Model Server Image on Tag
 on:
   push:
     tags:
-      - '*'
+      - 'disabled-model-server-build'  # Currently there are no EE features on the model server
 
 jobs:
   build-and-push:

backend/Dockerfile

@@ -1,9 +1,11 @@
 FROM python:3.11.7-slim-bookworm
 
 LABEL com.danswer.maintainer="founders@danswer.ai"
-LABEL com.danswer.description="This image is for the backend of Danswer. It is MIT Licensed and \
+LABEL com.danswer.description="This image is the Enterprise Edition (Paid Edition) backend of \
-free for all to use. You can find it at https://hub.docker.com/r/danswer/danswer-backend. For \
+Danswer. If you do not have a contract or agreement with DanswerAI, you are not permitted to use \
-more details, visit https://github.com/danswer-ai/danswer."
+this container outside of personal development or testing purposes. Please reach out to \
+founders@danswer.ai for more information. You can access the MIT version of Danswer at \
+https://github.com/danswer-ai/danswer"
 
 # Default DANSWER_VERSION, typically overriden during builds by GitHub Actions.
 ARG DANSWER_VERSION=0.3-dev

deployment/docker_compose/docker-compose.dev.yml

@@ -209,7 +209,7 @@ services:
         - NEXT_PUBLIC_NEGATIVE_PREDEFINED_FEEDBACK_OPTIONS=${NEXT_PUBLIC_NEGATIVE_PREDEFINED_FEEDBACK_OPTIONS:-}
         - NEXT_PUBLIC_DISABLE_LOGOUT=${NEXT_PUBLIC_DISABLE_LOGOUT:-}
         - NEXT_PUBLIC_THEME=${NEXT_PUBLIC_THEME:-}
-        - NEXT_PUBLIC_EE_ENABLED=${NEXT_PUBLIC_EE_ENABLED:-true}
+        - NEXT_PUBLIC_ENABLE_PAID_EE_FEATURES=${NEXT_PUBLIC_ENABLE_PAID_EE_FEATURES:-true}
     depends_on:
       - api_server
     restart: always

deployment/docker_compose/docker-compose.prod-no-letsencrypt.yml

@@ -71,7 +71,7 @@ services:
         - NEXT_PUBLIC_NEGATIVE_PREDEFINED_FEEDBACK_OPTIONS=${NEXT_PUBLIC_NEGATIVE_PREDEFINED_FEEDBACK_OPTIONS:-}
         - NEXT_PUBLIC_DISABLE_LOGOUT=${NEXT_PUBLIC_DISABLE_LOGOUT:-}
         - NEXT_PUBLIC_THEME=${NEXT_PUBLIC_THEME:-}
-        - NEXT_PUBLIC_EE_ENABLED=${NEXT_PUBLIC_EE_ENABLED:-true}
+        - NEXT_PUBLIC_ENABLE_PAID_EE_FEATURES=${NEXT_PUBLIC_ENABLE_PAID_EE_FEATURES:-true}
     depends_on:
       - api_server
     restart: always

deployment/docker_compose/docker-compose.prod.yml

@@ -71,7 +71,7 @@ services:
         - NEXT_PUBLIC_NEGATIVE_PREDEFINED_FEEDBACK_OPTIONS=${NEXT_PUBLIC_NEGATIVE_PREDEFINED_FEEDBACK_OPTIONS:-}
         - NEXT_PUBLIC_DISABLE_LOGOUT=${NEXT_PUBLIC_DISABLE_LOGOUT:-}
         - NEXT_PUBLIC_THEME=${NEXT_PUBLIC_THEME:-}
-        - NEXT_PUBLIC_EE_ENABLED=${NEXT_PUBLIC_EE_ENABLED:-true}
+        - NEXT_PUBLIC_ENABLE_PAID_EE_FEATURES=${NEXT_PUBLIC_ENABLE_PAID_EE_FEATURES:-true}
     depends_on:
       - api_server
     restart: always

deployment/kubernetes/web_server-service-deployment.yaml

@@ -37,4 +37,4 @@ spec:
         - configMapRef:
             name: env-configmap
         args:
-          - "NEXT_PUBLIC_EE_ENABLED=true"
+          - "NEXT_PUBLIC_ENABLE_PAID_EE_FEATURES=true"

web/Dockerfile

@@ -1,10 +1,11 @@
 FROM node:20-alpine AS base
 
 LABEL com.danswer.maintainer="founders@danswer.ai"
-LABEL com.danswer.description="This image is for the frontend/webserver of Danswer. It is MIT \
+LABEL com.danswer.description="This image is the Enterprise Edition (Paid Edition) \
-Licensed and free for all to use. You can find it at \
+frontend/webserver of Danswer. If you do not have a contract or agreement with DanswerAI, you are \
-https://hub.docker.com/r/danswer/danswer-web-server. For more details, visit \
+not permitted to use this container outside of personal development or testing purposes. Please \
-https://github.com/danswer-ai/danswer."
+reach out to founders@danswer.ai for more information. You can access the MIT version of Danswer \
+at https://github.com/danswer-ai/danswer"
 
 # Default DANSWER_VERSION, typically overriden during builds by GitHub Actions.
 ARG DANSWER_VERSION=0.3-dev
@@ -56,8 +57,8 @@ ENV NEXT_PUBLIC_NEGATIVE_PREDEFINED_FEEDBACK_OPTIONS=${NEXT_PUBLIC_NEGATIVE_PRED
 ARG NEXT_PUBLIC_THEME
 ENV NEXT_PUBLIC_THEME=${NEXT_PUBLIC_THEME}
 
-ARG NEXT_PUBLIC_EE_ENABLED
+ARG NEXT_PUBLIC_ENABLE_PAID_EE_FEATURES
-ENV NEXT_PUBLIC_EE_ENABLED=${NEXT_PUBLIC_EE_ENABLED}
+ENV NEXT_PUBLIC_ENABLE_PAID_EE_FEATURES=${NEXT_PUBLIC_ENABLE_PAID_EE_FEATURES}
 
 ARG NEXT_PUBLIC_DISABLE_LOGOUT
 ENV NEXT_PUBLIC_DISABLE_LOGOUT=${NEXT_PUBLIC_DISABLE_LOGOUT}
@@ -109,8 +110,8 @@ ENV NEXT_PUBLIC_NEGATIVE_PREDEFINED_FEEDBACK_OPTIONS=${NEXT_PUBLIC_NEGATIVE_PRED
 ARG NEXT_PUBLIC_THEME
 ENV NEXT_PUBLIC_THEME=${NEXT_PUBLIC_THEME}
 
-ARG NEXT_PUBLIC_EE_ENABLED
+ARG NEXT_PUBLIC_ENABLE_PAID_EE_FEATURES
-ENV NEXT_PUBLIC_EE_ENABLED=${NEXT_PUBLIC_EE_ENABLED}
+ENV NEXT_PUBLIC_ENABLE_PAID_EE_FEATURES=${NEXT_PUBLIC_ENABLE_PAID_EE_FEATURES}
 
 ARG NEXT_PUBLIC_DISABLE_LOGOUT
 ENV NEXT_PUBLIC_DISABLE_LOGOUT=${NEXT_PUBLIC_DISABLE_LOGOUT}

web/next.config.js

@@ -10,7 +10,7 @@ const nextConfig = {
   swcMinify: true,
   rewrites: async () => {
     const eeRedirects =
-      process.env.NEXT_PUBLIC_EE_ENABLED === "true"
+      process.env.NEXT_PUBLIC_ENABLE_PAID_EE_FEATURES === "true"
         ? [
             // user group pages
             {

web/tailwind.config.js

@@ -2,7 +2,8 @@ var merge = require("lodash/merge");
 
 const baseThemes = require("./tailwind-themes/tailwind.config.js");
 const customThemes =
-  process.env.NEXT_PUBLIC_EE_ENABLED && process.env.NEXT_PUBLIC_THEME
+  process.env.NEXT_PUBLIC_ENABLE_PAID_EE_FEATURES &&
+  process.env.NEXT_PUBLIC_THEME
     ? require(
         `./tailwind-themes/custom/${process.env.NEXT_PUBLIC_THEME}/tailwind.config.js`
       )