highperfocused/danswer
1
0
Fork 0
mirror of https://github.com/danswer-ai/danswer.git synced 2025-04-01 00:18:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make EE containers public changes (#67)

Browse Source
This commit is contained in:
Yuhong Sun 2024-04-13 13:45:10 -07:00 committed by Chris Weaver
parent 22a2f86fb9
commit 680aca68e5
9 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/docker-build-push-model-server-container-on-tag.yml vendored
View File

@ -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:

8
backend/Dockerfile
View File

@ -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

2
deployment/docker_compose/docker-compose.dev.yml
View File

@ -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

2
deployment/docker_compose/docker-compose.prod-no-letsencrypt.yml
View File

@ -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

2
deployment/docker_compose/docker-compose.prod.yml
View File

@ -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

2
deployment/kubernetes/web_server-service-deployment.yaml
View File

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

17
web/Dockerfile
View File

@ -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}

2
web/next.config.js
View File

@ -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
{

3
web/tailwind.config.js
View File

@ -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`
)