diff --git a/apps/tooljet/app.env b/apps/tooljet/app.env deleted file mode 100644 index 3729d17c..00000000 --- a/apps/tooljet/app.env +++ /dev/null @@ -1,42 +0,0 @@ -TOOLJET_HOST= - -LOCKBOX_MASTER_KEY=70726290922441785304399601987729268981756953900892 -SECRET_KEY_BASE=mqrBZqJvzUJ2GsHQaktZjKdb2cvdM8 - -# DATABASE CONFIG -ORM_LOGGING= -PG_DB=tooljet -PG_USER=tooljet -PG_HOST=postgres_tooljet -PG_PASS=tooljet - -# Checks every 24 hours to see if a new version of ToolJet is available -CHECK_FOR_UPDATES=check_if_updates_are_available - -GOOGLE_CLIENT_ID= -GOOGLE_CLIENT_SECRET= - -# EMAIL CONFIGURATION -DEFAULT_FROM_EMAIL=hello@tooljet.io -SMTP_USERNAME= -SMTP_PASSWORD= -SMTP_DOMAIN= -SMTP_PORT= - -# DISABLE USER SIGNUPS (true or false). Default: true -DISABLE_SIGNUPS= - -# OBSERVABILITY -APM_VENDOR= -SENTRY_DNS= -SENTRY_DEBUG= - -# FEATURE TOGGLE -COMMENT_FEATURE_ENABLE= - -#SSO -SSO_DISABLE_SIGNUP= -SSO_RESTRICTED_DOMAIN= -SSO_GOOGLE_OAUTH2_CLIENT_ID= -SSO_GIT_OAUTH2_CLIENT_ID= -SSO_GIT_OAUTH2_CLIENT_SECRET= \ No newline at end of file diff --git a/apps/tooljet/docker-compose.yml b/apps/tooljet/docker-compose.yml index bc330a7a..f92ac742 100644 --- a/apps/tooljet/docker-compose.yml +++ b/apps/tooljet/docker-compose.yml @@ -1,12 +1,11 @@ -version: "3.7" +version: '3.7' services: - tooljet: container_name: tooljet tty: true stdin_open: true - image: tooljet/tooljet-client-ce:v2.4.2 + image: tooljet/tooljet-client-ce:v2.4.2 restart: always ports: - ${APP_PORT}:80 @@ -45,7 +44,7 @@ services: tooljet-server: container_name: tooljet-server - image: tooljet/tooljet-server-ce:v2.14.0 + image: tooljet/tooljet-server-ce:v2.14.0 tty: true stdin_open: true restart: always @@ -57,28 +56,12 @@ services: - TOOLJET_HOST=https://${APP_DOMAIN} - LOCKBOX_MASTER_KEY=${LOCKBOX_MASTER_KEY} - SECRET_KEY_BASE=${SECRET_KEY_BASE} - - ORM_LOGGING - PG_DB=tooljet - PG_USER=tooljet - PG_HOST=db-tooljet - PG_PASS=${DB_PASSWORD} - CHECK_FOR_UPDATES=check_if_updates_are_available - - GOOGLE_CLIENT_ID - - GOOGLE_CLIENT_SECRET - DEFAULT_FROM_EMAIL=hello@tooljet.io - - SMTP_USERNAME - - SMTP_PASSWORD - - SMTP_DOMAIN - - SMTP_PORT - - DISABLE_SIGNUPS - - APM_VENDOR - - SENTRY_DNS - - SENTRY_DEBUG - - SSO_DISABLE_SIGNUP - - SSO_RESTRICTED_DOMAIN - - SSO_GOOGLE_OAUTH2_CLIENT_ID - - SSO_GIT_OAUTH2_CLIENT_ID - - SSO_GIT_OAUTH2_CLIENT_SECRET command: npm run start:prod db-tooljet: @@ -94,4 +77,3 @@ services: - PGDATA=/data/postgres networks: - tipi_main_network - diff --git a/apps/tooljet/metadata/logo.jpg b/apps/tooljet/metadata/logo.jpg index cdfd64ea..b2e9f2fe 100644 Binary files a/apps/tooljet/metadata/logo.jpg and b/apps/tooljet/metadata/logo.jpg differ