Merge pull request 'Added enterprise functionality' (#8) from jjsfunhouse/nocodb:enterprise-update into main

Reviewed-on: coop-cloud/nocodb#8

.env.sample

@@ -10,3 +10,15 @@ LETS_ENCRYPT_ENV=production
 SECRET_DB_PASSWORD_VERSION=v1
 SECRET_NC_DB_URL_VERSION=v1
 ENABLE_BACKUPS=true
+
+COMPOSE_FILE="compose.yml"
+
+# ---- UNCOMMENT THESE LINES FOR ENTERPRISE VERSION USE ----
+#COMPOSE_FILE="$COMPOSE_FILE:compose.license.yml"
+
+# License to enable enterprise features.
+#NC_LICENSE_KEY=<YOUR_LICENSE_HERE>
+
+#JWT used for authentication in enterprise version
+#SECRET_AUTH_JWT_VERSION=v1
+#NC_AUTH_JWT_SECRET_FILE=/run/secrets/auth_jwt

README.md

@@ -25,4 +25,12 @@
 * `abra app secret insert <app-name> nc_db_url v1 pg://db:5432?u=nocodb&p=${DATABASE_PW}&d=nocodb`
 * `abra app deploy <app-name>`
 
+## NocoDB Enterprise Version
+
+* `abra app config <app-name>`. Uncomment the variables used for setting enterprise values. Make sure you have a valid license.
+* `abra app undeploy <app-name>`
+* `export JWT_SECRET=$(pwgen 50)`
+* `abra app secret insert <app-name> auth_jwt v1 ${JWT_SECRET}`
+* `abra app deploy <app-name>`
+
 For more, see [`docs.coopcloud.tech`](https://docs.coopcloud.tech).

abra.sh

@@ -1 +1,2 @@
 export PG_BACKUP_VERSION=v1
+export NOCODB_ENTRYPOINT_VERSION=v1

compose-license.yml

@@ -0,0 +1,25 @@
+version: "3.8"
+services:
+  app:
+    image: nocodb/nocodb-ee:2026.03.0-pre.01
+    secrets:
+      - auth_jwt
+    configs: 
+      - source: nocodb_entrypoint
+        target: /entrypoint.sh
+        mode: 0555
+    entrypoint: /entrypoint.sh
+    environment:
+      NC_LICENSE_KEY: ${NC_LICENSE_KEY}
+
+
+configs:
+  nocodb_entrypoint:
+    name: ${STACK_NAME}_nocodb_entrypoint_${NOCODB_ENTRYPOINT_VERSION}
+    file: entrypoint.sh.tmpl
+    template_driver: golang
+
+secrets:
+  auth_jwt:
+    external: true
+    name: ${STACK_NAME}_auth_jwt_${SECRET_AUTH_JWT_VERSION}

compose.yml

@@ -3,7 +3,7 @@ version: "3.8"
 
 services:
   app:
-    image: nocodb/nocodb:0.301.3
+    image: nocodb/nocodb:0.301.5
     secrets:
       - nc_db_url
     networks:
@@ -29,10 +29,10 @@ services:
         #- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true"
         #- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
         - "backupbot.backup=${ENABLE_BACKUPS:-true}"
-        - "coop-cloud.${STACK_NAME}.version=2.1.1+0.301.3"
+        - "coop-cloud.${STACK_NAME}.version=2.1.3+0.301.5"
 
   db:
-    image: postgres:13.23-alpine
+    image: postgres:13.2-alpine
     secrets:
       - db_password
     networks:

entrypoint.sh.tmpl

@@ -0,0 +1,34 @@
+#!/bin/sh
+set -e
+
+echo "Entrypoint running"
+
+file_env() {
+  var="$1"
+  fileVar="${var}_FILE"
+  def="${2:-}"
+
+  eval "var_val=\${$var}"
+  eval "file_val=\${$fileVar}"
+
+  if [ -n "$var_val" ] && [ -n "$file_val" ]; then
+    echo >&2 "error: both $var and $fileVar are set (but are exclusive)"
+    exit 1
+  fi
+
+  val="$def"
+
+  if [ -n "$var_val" ]; then
+    val="$var_val"
+  elif [ -n "$file_val" ]; then
+    val="$(cat "$file_val")"
+  fi
+
+  export "$var=$val"
+  unset "$fileVar"
+}
+
+file_env "NC_AUTH_JWT_SECRET"
+echo "Added JWT secret"
+
+/usr/bin/dumb-init -- /usr/src/appEntry/start.sh "$@"