From 680aca68e5c83847efd74e4e4265b6e2fccb33a7 Mon Sep 17 00:00:00 2001 From: Yuhong Sun Date: Sat, 13 Apr 2024 13:45:10 -0700 Subject: [PATCH] Make EE containers public changes (#67) --- ...build-push-model-server-container-on-tag.yml | 2 +- backend/Dockerfile | 8 +++++--- .../docker_compose/docker-compose.dev.yml | 2 +- .../docker-compose.prod-no-letsencrypt.yml | 2 +- .../docker_compose/docker-compose.prod.yml | 2 +- .../web_server-service-deployment.yaml | 2 +- web/Dockerfile | 17 +++++++++-------- web/next.config.js | 2 +- web/tailwind.config.js | 3 ++- 9 files changed, 22 insertions(+), 18 deletions(-) diff --git a/.github/workflows/docker-build-push-model-server-container-on-tag.yml b/.github/workflows/docker-build-push-model-server-container-on-tag.yml index 104b891d7..3711e7052 100644 --- a/.github/workflows/docker-build-push-model-server-container-on-tag.yml +++ b/.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: diff --git a/backend/Dockerfile b/backend/Dockerfile index 758280b53..6d13053ca 100644 --- a/backend/Dockerfile +++ b/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 \ -free for all to use. You can find it at https://hub.docker.com/r/danswer/danswer-backend. For \ -more details, visit https://github.com/danswer-ai/danswer." +LABEL com.danswer.description="This image is the Enterprise Edition (Paid Edition) backend of \ +Danswer. If you do not have a contract or agreement with DanswerAI, you are not permitted to use \ +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 diff --git a/deployment/docker_compose/docker-compose.dev.yml b/deployment/docker_compose/docker-compose.dev.yml index 8358fb3bf..1629f9cd6 100644 --- a/deployment/docker_compose/docker-compose.dev.yml +++ b/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 diff --git a/deployment/docker_compose/docker-compose.prod-no-letsencrypt.yml b/deployment/docker_compose/docker-compose.prod-no-letsencrypt.yml index 70d4aa434..41eb0451e 100644 --- a/deployment/docker_compose/docker-compose.prod-no-letsencrypt.yml +++ b/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 diff --git a/deployment/docker_compose/docker-compose.prod.yml b/deployment/docker_compose/docker-compose.prod.yml index 9a41e925c..762a76917 100644 --- a/deployment/docker_compose/docker-compose.prod.yml +++ b/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 diff --git a/deployment/kubernetes/web_server-service-deployment.yaml b/deployment/kubernetes/web_server-service-deployment.yaml index 026d5c3f4..b45edff53 100644 --- a/deployment/kubernetes/web_server-service-deployment.yaml +++ b/deployment/kubernetes/web_server-service-deployment.yaml @@ -37,4 +37,4 @@ spec: - configMapRef: name: env-configmap args: - - "NEXT_PUBLIC_EE_ENABLED=true" \ No newline at end of file + - "NEXT_PUBLIC_ENABLE_PAID_EE_FEATURES=true" diff --git a/web/Dockerfile b/web/Dockerfile index 486a99179..341b41613 100644 --- a/web/Dockerfile +++ b/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 \ -Licensed and free for all to use. You can find it at \ -https://hub.docker.com/r/danswer/danswer-web-server. For more details, visit \ -https://github.com/danswer-ai/danswer." +LABEL com.danswer.description="This image is the Enterprise Edition (Paid Edition) \ +frontend/webserver of Danswer. If you do not have a contract or agreement with DanswerAI, you are \ +not permitted to use 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 @@ -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 -ENV NEXT_PUBLIC_EE_ENABLED=${NEXT_PUBLIC_EE_ENABLED} +ARG NEXT_PUBLIC_ENABLE_PAID_EE_FEATURES +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 -ENV NEXT_PUBLIC_EE_ENABLED=${NEXT_PUBLIC_EE_ENABLED} +ARG NEXT_PUBLIC_ENABLE_PAID_EE_FEATURES +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} diff --git a/web/next.config.js b/web/next.config.js index f66bc3bd2..d0ce8a11a 100644 --- a/web/next.config.js +++ b/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 { diff --git a/web/tailwind.config.js b/web/tailwind.config.js index 239ef05f2..7efa36ae7 100644 --- a/web/tailwind.config.js +++ b/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` )