Merge branch 'main' into rebasing/main-post-mod

2026-05-22 08:28:35 +00:00 · 2025-04-25 12:53:01 +05:30 · 2025-04-25 12:53:01 +05:30 · 1faa34bc8f
commit 1faa34bc8f
parent 2dbf616c59 1a51e127fb
11 changed files with 375 additions and 12 deletions
--- a/.github/workflows/docker-release.yml
+++ b/.github/workflows/docker-release.yml
@ -232,3 +232,95 @@ jobs:
  #         fi

  #         curl -X POST -H 'Content-type: application/json' --data "{\"text\":\"$message\"}" ${{ secrets.SLACK_WEBHOOK_URL }}
+
+
+  try-tooljet-image-build:
+    runs-on: ubuntu-latest
+    needs: build-tooljet-image-for-ee-edtion
+    if: ${{ needs.build-tooljet-image-for-ee-edtion.result == 'success' }}
+
+    steps:
+      - name: Checkout code to develop
+        if: "!contains(github.event.release.tag_name, 'ee-lts')"
+        uses: actions/checkout@v2
+        with:
+          ref: refs/heads/main
+
+      - name: Checkout code to lts-3.0
+        if: contains(github.event.release.tag_name, '-ee-lts')
+        uses: actions/checkout@v2
+        with:
+          ref: refs/heads/lts-3.0
+
+      # Create Docker Buildx builder with platform configuration
+      - name: Set up Docker Buildx
+        run: |
+          mkdir -p ~/.docker/cli-plugins
+          curl -SL https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.linux-amd64 -o ~/.docker/cli-plugins/docker-buildx
+          chmod a+x ~/.docker/cli-plugins/docker-buildx
+          docker buildx create --name mybuilder --platform linux/arm64,linux/amd64,linux/amd64/v2,linux/riscv64,linux/ppc64le,linux/s390x,linux/386,linux/mips64le,linux/mips64,linux/arm/v7,linux/arm/v6
+          docker buildx use mybuilder
+
+      - name: Set DOCKER_CLI_EXPERIMENTAL
+        run: echo "DOCKER_CLI_EXPERIMENTAL=enabled" >> $GITHUB_ENV
+
+      - name: use mybuilder buildx
+        run: docker buildx use mybuilder
+
+      - name: Docker Login
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Check if Docker image is present
+        id: check-image-presence
+        run: |
+          response=$(curl -s "https://hub.docker.com/v2/repositories/tooljet/tooljet/tags/${{ github.event.release.tag_name }}")
+          if [[ $? -ne 0 ]]; then
+            echo "Failed to fetch JSON response. Stopping workflow execution."
+            exit 1
+          fi
+
+          if [[ $response == *"tag '${{ github.event.release.tag_name }}' not found"* ]]; then
+            echo "Docker image tag '${{ github.event.release.tag_name }}' not present."
+            exit 1
+          else
+            echo "Docker image tag '${{ github.event.release.tag_name }}' is present."
+          fi
+
+      - name: Build and Push Docker image for non-EE-LTS
+        if: "!contains(github.event.release.tag_name, '-ee-lts')"
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: docker/ee/ee-try-tooljet.Dockerfile
+          push: true
+          tags: tooljet/try:${{ github.event.release.tag_name }},tooljet/try:ee-latest
+          platforms: linux/amd64
+        env:
+          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Build and Push Docker image for EE-LTS-3.0
+        if: contains(github.event.release.tag_name, '-ee-lts')
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: docker/ee/ee-try-tooljet-lts.Dockerfile
+          push: true
+          tags: tooljet/try:${{ github.event.release.tag_name }},tooljet/try:ee-lts-latest
+          platforms: linux/amd64
+        env:
+          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Send Slack Notification
+        run: |
+          if [[ "${{ job.status }}" == "success" ]]; then
+            message="Try-ToolJet image published:\\n\`tooljet/try:${{ github.event.release.tag_name }}\`"
+          else
+            message="Job '${{ env.JOB_NAME }}' failed! tooljet/try:${{ github.event.release.tag_name }}"
+          fi
+
+          curl -X POST -H 'Content-type: application/json' --data "{\"text\":\"$message\"}" ${{ secrets.SLACK_WEBHOOK_URL }}
--- a/docker/ce-entrypoint.sh
+++ b/docker/ce-entrypoint.sh
@ -0,0 +1,27 @@
+#!/bin/bash
+set -e
+
+if [ -d "./server/dist" ]; then
+  SETUP_CMD='npm run db:setup:prod'
+else
+  SETUP_CMD='npm run db:setup'
+fi
+
+if [ -f "./.env" ]; then
+  declare $(grep -v '^#' ./.env | xargs)
+fi
+
+if [ -z "$DATABASE_URL" ]; then
+  ./server/scripts/wait-for-it.sh $PG_HOST:${PG_PORT:-5432} --strict --timeout=300 -- $SETUP_CMD
+else
+  PG_HOST=$(echo "$DATABASE_URL" | awk -F'[/:@?]' '{print $6}')
+  PG_PORT=$(echo "$DATABASE_URL" | awk -F'[/:@?]' '{print $7}')
+
+  if [ -z "$DATABASE_PORT" ]; then
+    DATABASE_PORT="5432"
+  fi
+
+  ./server/scripts/wait-for-it.sh "$PG_HOST:$PG_PORT" --strict --timeout=300 -- $SETUP_CMD
+fi
+
+exec "$@"
--- a/docker/ce-production.Dockerfile
+++ b/docker/ce-production.Dockerfile
@ -88,12 +88,13 @@ COPY --from=builder /app/frontend/build ./app/frontend/build
 # copy server build
 COPY --from=builder /app/server/package.json ./app/server/package.json
 COPY --from=builder /app/server/.version ./app/server/.version
-COPY --from=builder /app/server/entrypoint.sh ./app/server/entrypoint.sh
 COPY --from=builder /app/server/node_modules ./app/server/node_modules
 COPY --from=builder /app/server/templates ./app/server/templates
 COPY --from=builder /app/server/scripts ./app/server/scripts
 COPY --from=builder /app/server/dist ./app/server/dist

+COPY ./docker/ce-entrypoint.sh ./app/server/entrypoint.sh
+
 # Define non-sudo user
 RUN useradd --create-home --home-dir /home/appuser appuser \
    && chown -R appuser:0 /app \
@ -111,5 +112,4 @@ WORKDIR /app
 # Dependencies for scripts outside nestjs
 RUN npm install dotenv@10.0.0 joi@17.4.1

-
 ENTRYPOINT ["./server/entrypoint.sh"]
--- a/docker/ee/ee-entrypoint.sh
+++ b/docker/ee/ee-entrypoint.sh
--- a/docker/ee/ee-production.Dockerfile
+++ b/docker/ee/ee-production.Dockerfile
@ -145,12 +145,13 @@ COPY --from=builder /app/frontend/build ./app/frontend/build
 COPY --from=builder /app/server/package.json ./app/server/package.json
 COPY --from=builder /app/server/.version ./app/server/.version
 COPY --from=builder /app/server/ee/keys ./app/server/ee/keys
-COPY --from=builder /app/server/entrypoint.sh ./app/server/entrypoint.sh
 COPY --from=builder /app/server/node_modules ./app/server/node_modules
 COPY --from=builder /app/server/templates ./app/server/templates
 COPY --from=builder /app/server/scripts ./app/server/scripts
 COPY --from=builder /app/server/dist ./app/server/dist

+COPY  ./docker/ee/ee-entrypoint.sh ./app/server/ee-entrypoint.sh
+
 # Define non-sudo user
 RUN useradd --create-home --home-dir /home/appuser appuser \
    && chown -R appuser:0 /app \
@ -214,4 +215,4 @@ RUN npm install dotenv@10.0.0 joi@17.4.1

 RUN npm cache clean --force

-ENTRYPOINT ["./server/entrypoint.sh"]
+ENTRYPOINT ["./server/ee-entrypoint.sh"]
--- a/docker/ee/ee-try-entrypoint-lts.sh
+++ b/docker/ee/ee-try-entrypoint-lts.sh
@ -0,0 +1,15 @@
+#!/bin/bash
+set -e
+
+# Start Redis
+# service redis-server start
+# redis-server /etc/redis/redis.conf
+
+# Start Postgres
+service postgresql start
+
+# Export the PORT variable to be used by the application
+export PORT=${PORT:-80}
+
+# Start Supervisor
+exec supervisord -c /etc/supervisor/conf.d/supervisord.conf
--- a/docker/ee/ee-try-entrypoint.sh
+++ b/docker/ee/ee-try-entrypoint.sh
@ -22,7 +22,7 @@ echo "Starting Temporal Server..."
 export PORT=${PORT:-80}

 # Start Supervisor
-/usr/bin/supervisord -n &
+exec supervisord -c /etc/supervisor/conf.d/supervisord.conf &

 # Wait for Temporal Server to be ready
 echo "Waiting for Temporal Server to be ready..."
--- a/docker/ee/ee-try-tooljet-lts.Dockerfile
+++ b/docker/ee/ee-try-tooljet-lts.Dockerfile
@ -1,21 +1,31 @@
-FROM tooljet/tooljet-ce:latest
+FROM tooljet/tooljet:ee-lts-latest

-# copy postgrest executable
-COPY --from=postgrest/postgrest:v10.1.1.20221215 /bin/postgrest /bin
+# Copy PostgREST executable
+COPY --from=postgrest/postgrest:v12.2.0 /bin/postgrest /bin

-# Install Postgres
+# Install PostgreSQL
 USER root
 RUN wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
 RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main" | tee /etc/apt/sources.list.d/pgdg.list
-RUN echo "deb http://deb.debian.org/debian"
 RUN apt update && apt -y install postgresql-13 postgresql-client-13 supervisor
+
 USER postgres
 RUN service postgresql start && \
    psql -c "create role tooljet with login superuser password 'postgres';"
 USER root

+# Install Redis
+RUN apt update && apt -y install redis
+
+# Create appuser home & ensure permission for supervisord and services
+RUN mkdir -p /var/log/supervisor /var/run/postgresql /var/lib/postgresql /var/lib/redis && \
+    chown -R appuser:appuser /etc/supervisor /var/log/supervisor /var/lib/redis && \
+    chown -R postgres:postgres /var/run/postgresql /var/lib/postgresql
+
+# Configure Supervisor to manage PostgREST, ToolJet, and Redis
 RUN echo "[supervisord] \n" \
    "nodaemon=true \n" \
+    "user=root \n" \
    "\n" \
    "[program:postgrest] \n" \
    "command=/bin/postgrest \n" \
@ -23,12 +33,23 @@ RUN echo "[supervisord] \n" \
    "autorestart=true \n" \
    "\n" \
    "[program:tooljet] \n" \
+    "user=appuser \n" \
    "command=/bin/bash -c '/app/server/scripts/init-db-boot.sh' \n" \
    "autostart=true \n" \
    "autorestart=true \n" \
    "stderr_logfile=/dev/stdout \n" \
    "stderr_logfile_maxbytes=0 \n" \
    "stdout_logfile=/dev/stdout \n" \
+    "stdout_logfile_maxbytes=0 \n" \
+    "\n" \
+    "[program:redis] \n" \
+    "user=appuser \n" \
+    "command=/usr/bin/redis-server \n" \
+    "autostart=true \n" \
+    "autorestart=true \n" \
+    "stderr_logfile=/dev/stdout \n" \
+    "stderr_logfile_maxbytes=0 \n" \
+    "stdout_logfile=/dev/stdout \n" \
    "stdout_logfile_maxbytes=0 \n" | sed 's/ //' > /etc/supervisor/conf.d/supervisord.conf

 # ENV defaults
@ -49,10 +70,17 @@ ENV TOOLJET_HOST=http://localhost \
    PGRST_HOST=http://localhost:3000 \
    PGRST_DB_URI=postgres://tooljet:postgres@localhost/tooljet_db \
    PGRST_JWT_SECRET=r9iMKoe5CRMgvJBBtp4HrqN7QiPpUToj \
+    PGRST_DB_PRE_CONFIG=postgrest.pre_config \
    ORM_LOGGING=true \
    DEPLOYMENT_PLATFORM=docker:local \
    HOME=/home/appuser \
+    REDIS_HOST=localhost \
+    REDIS_PORT=6379 \
+    REDIS_USER=default \
+    REDIS_PASS= \
    TERM=xterm

-# Prepare DB and start application
-ENTRYPOINT service postgresql start 1> /dev/null && /usr/bin/supervisord
+# Set the entrypoint
+COPY ./docker/ee/ee-try-entrypoint-lts.sh /ee-try-entrypoint-lts.sh
+RUN chmod +x /ee-try-entrypoint-lts
+ENTRYPOINT ["/ee-try-entrypoint-lts.sh"]
--- a/docker/ee/ee-try-tooljet.Dockerfile
+++ b/docker/ee/ee-try-tooljet.Dockerfile
@ -0,0 +1,117 @@
+FROM tooljet/tooljet:ee-latest
+
+# Copy postgrest executable
+COPY --from=postgrest/postgrest:v12.2.0 /bin/postgrest /bin
+
+# Install Postgres
+USER root
+RUN wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
+RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main" | tee /etc/apt/sources.list.d/pgdg.list
+RUN echo "deb http://deb.debian.org/debian"
+RUN apt update && apt -y install postgresql-13 postgresql-client-13 supervisor
+USER postgres
+RUN service postgresql start && \
+    psql -c "create role tooljet with login superuser password 'postgres';"
+USER root
+
+
+RUN apt update && apt -y install redis
+
+# Create appuser home & ensure permission for supervisord and services
+RUN mkdir -p /var/log/supervisor /var/run/postgresql /var/lib/postgresql /var/lib/redis && \
+    chown -R appuser:appuser /etc/supervisor /var/log/supervisor /var/lib/redis && \
+    chown -R postgres:postgres /var/run/postgresql /var/lib/postgresql
+
+# Install Temporal Server Binaries
+RUN curl -OL https://github.com/temporalio/temporal/releases/download/v1.24.2/temporal_1.24.2_linux_amd64.tar.gz && \
+    tar -xzf temporal_1.24.2_linux_amd64.tar.gz && \
+    mv temporal-server /usr/bin/temporal-server && \
+    chmod +x /usr/bin/temporal-server && \
+    rm temporal_1.24.2_linux_amd64.tar.gz
+
+# Install Temporal UI Server Binaries
+RUN curl -OL https://github.com/temporalio/ui-server/releases/download/v2.28.0/ui-server_2.28.0_linux_amd64.tar.gz && \
+    tar -xzf ui-server_2.28.0_linux_amd64.tar.gz && \
+    mv ui-server /usr/bin/temporal-ui-server && \
+    chmod +x /usr/bin/temporal-ui-server && \
+    rm ui-server_2.28.0_linux_amd64.tar.gz
+
+# Copy Temporal configuration files
+COPY ./docker/ee/temporal-server.yaml /etc/temporal/temporal-server.yaml
+COPY ./docker/ee/temporal-ui-server.yaml /etc/temporal/temporal-ui-server.yaml
+
+# Install grpcurl
+RUN apt update && apt install -y curl \
+    && curl -sSL https://github.com/fullstorydev/grpcurl/releases/download/v1.8.0/grpcurl_1.8.0_linux_x86_64.tar.gz | tar -xzv -C /usr/local/bin grpcurl
+
+# Configure Supervisor to manage PostgREST, ToolJet, and Redis
+RUN echo "[supervisord] \n" \
+    "nodaemon=true \n" \
+    "user=root \n" \
+    "\n" \
+    "[program:postgrest] \n" \
+    "command=/bin/postgrest \n" \
+    "autostart=true \n" \
+    "autorestart=true \n" \
+    "\n" \
+    "[program:tooljet] \n" \
+    "user=appuser \n" \
+    "command=/bin/bash -c '/app/server/scripts/init-db-boot.sh' \n" \
+    "autostart=true \n" \
+    "autorestart=true \n" \
+    "stderr_logfile=/dev/stdout \n" \
+    "stderr_logfile_maxbytes=0 \n" \
+    "stdout_logfile=/dev/stdout \n" \
+    "stdout_logfile_maxbytes=0 \n" \
+    "\n" \
+    "[program:redis] \n" \
+    "user=appuser \n" \
+    "command=/usr/bin/redis-server \n" \
+    "autostart=true \n" \
+    "autorestart=true \n" \
+    "stderr_logfile=/dev/stdout \n" \
+    "stderr_logfile_maxbytes=0 \n" \
+    "stdout_logfile=/dev/stdout \n" \
+    "stdout_logfile_maxbytes=0 \n" | sed 's/ //' > /etc/supervisor/conf.d/supervisord.conf
+
+
+# ENV defaults
+ENV TOOLJET_HOST=http://localhost \
+    TOOLJET_SERVER_URL=http://localhost \
+    PORT=80 \
+    NODE_ENV=production \
+    LOCKBOX_MASTER_KEY=replace_with_lockbox_master_key \
+    SECRET_KEY_BASE=replace_with_secret_key_base \
+    PG_DB=tooljet_production \
+    PG_USER=tooljet \
+    PG_PASS=postgres \
+    PG_HOST=localhost \
+    ENABLE_TOOLJET_DB=true \
+    TOOLJET_DB_HOST=localhost \
+    TOOLJET_DB_USER=tooljet \
+    TOOLJET_DB_PASS=postgres \
+    TOOLJET_DB=tooljet_db \
+    PGRST_HOST=http://localhost:3000 \
+    PGRST_DB_URI=postgres://tooljet:postgres@localhost/tooljet_db \
+    PGRST_JWT_SECRET=r9iMKoe5CRMgvJBBtp4HrqN7QiPpUToj \
+    PGRST_DB_PRE_CONFIG=postgrest.pre_config \
+    ORM_LOGGING=true \
+    DEPLOYMENT_PLATFORM=docker:local \
+    HOME=/home/appuser \
+    REDIS_HOST=localhost \
+    REDIS_PORT=6379 \
+    REDIS_USER=default \
+    REDIS_PASS= \
+    ENABLE_MARKETPLACE_FEATURE=true \
+    TERM=xterm \
+    ENABLE_WORKFLOW_SCHEDULING=true \
+    TEMPORAL_SERVER_ADDRESS=localhost:7233 \
+    TEMPORAL_TASK_QUEUE_NAME_FOR_WORKFLOWS=tooljet-workflows \
+    TOOLJET_WORKFLOWS_TEMPORAL_NAMESPACE=default \
+    TEMPORAL_ADDRESS=localhost:7233 \
+    TEMPORAL_CORS_ORIGINS=http://localhost:8080
+
+# Set the entrypoint
+COPY ./docker/ee/ee-try-entrypoint.sh /ee-try-entrypoint.sh
+RUN chmod +x /ee-try-entrypoint.sh
+ENTRYPOINT ["/ee-try-entrypoint.sh"]
--- a/docker/ee/temporal-server.yaml
+++ b/docker/ee/temporal-server.yaml
@ -0,0 +1,75 @@
+log:
+  stdout: true
+  level: info
+
+persistence:
+  defaultStore: sqlite-default
+  visibilityStore: sqlite-visibility
+  numHistoryShards: 4
+  datastores:
+    sqlite-default:
+      sql:
+        pluginName: "sqlite"
+        databaseName: "/etc/temporal/default.db"
+        connectAddr: "localhost"
+        connectProtocol: "tcp"
+        connectAttributes:
+          cache: "private"
+          setup: true
+
+    sqlite-visibility:
+      sql:
+        pluginName: "sqlite"
+        databaseName: "/etc/temporal/visibility.db"
+        connectAddr: "localhost"
+        connectProtocol: "tcp"
+        connectAttributes:
+          cache: "private"
+          setup: true
+
+global:
+  membership:
+    maxJoinDuration: 30s
+    broadcastAddress: "127.0.0.1"
+  pprof:
+    port: 7936
+
+services:
+  frontend:
+    rpc:
+      grpcPort: 7233
+      membershipPort: 6933
+      bindOnLocalHost: true
+      httpPort: 7243
+      
+  matching:
+    rpc:
+      grpcPort: 7235
+      membershipPort: 6935
+      bindOnLocalHost: true
+
+  history:
+    rpc:
+      grpcPort: 7234
+      membershipPort: 6934
+      bindOnLocalHost: true
+
+  worker:
+    rpc:
+      membershipPort: 6939
+
+clusterMetadata:
+  enableGlobalNamespace: false
+  failoverVersionIncrement: 10
+  masterClusterName: "active"
+  currentClusterName: "active"
+  clusterInformation:
+    active:
+      enabled: true
+      initialFailoverVersion: 1
+      rpcName: "frontend"
+      rpcAddress: "localhost:7236"
+      httpAddress: "localhost:7243"
+
+dcRedirectionPolicy:
+  policy: "noop"
--- a/docker/ee/temporal-ui-server.yaml
+++ b/docker/ee/temporal-ui-server.yaml
@ -0,0 +1,8 @@
+temporalGrpcAddress: 127.0.0.1:7233  # Use the correct Temporal server address
+host: 0.0.0.0
+port: 8080
+enableUi: true
+cors:
+  allowOrigins:
+    - http://localhost:8080
+defaultNamespace: default