feat: Make images adaptable to support both Postgres and MongoDB uris

.editorconfig

@@ -9,5 +9,5 @@ indent_size = 2
 insert_final_newline = true
 trim_trailing_whitespace = true
 
-[{*.java,pom.xml,*.py}]
+[{*.java,pom.xml,*.py,*.sql}]
 indent_size = 4

.github/workflows/build-docker-image.yml

@@ -79,6 +79,12 @@ jobs:
           if [[ -f scripts/generate_info_json.sh ]]; then
             scripts/generate_info_json.sh
           fi
+
+      - name: Place server artifacts-es
+        env:
+          EDITION: ${{ vars.EDITION }}
+        run: |
+          scripts/prepare_server_artifacts.sh
 
       - name: Set base image tag
         id: set_base_tag

.gitignore

@@ -5,6 +5,9 @@
 stacks
 /deploy/docker/fs/opt/appsmith/info.json
 
+# Server artifacts
+/deploy/docker/fs/opt/appsmith/server
+
 # to ignore the node_modeules folder
 node_modules
 # to ignore the package-lock.json file
@@ -36,3 +39,5 @@ app/client/.fleet/*
 # Observability related local storage
 utils/observability/tempo-data/*
 
+# Ignore the mongo data backup directory for Mongo to PG migrations
+mongo-data**

Dockerfile

@@ -3,10 +3,6 @@ FROM ${BASE}
 
 ENV IN_DOCKER=1
 
-# Add backend server - Application Layer
-ARG JAR_FILE=./app/server/dist/server-*.jar
-ARG PLUGIN_JARS=./app/server/dist/plugins/*.jar
-
 ARG APPSMITH_CLOUD_SERVICES_BASE_URL
 ENV APPSMITH_CLOUD_SERVICES_BASE_URL=${APPSMITH_CLOUD_SERVICES_BASE_URL}
 
@@ -16,7 +12,17 @@ ENV APPSMITH_SEGMENT_CE_KEY=${APPSMITH_SEGMENT_CE_KEY}
 COPY deploy/docker/fs /
 
 RUN <<END
-  mkdir -p ./editor ./rts ./backend/plugins
+  if ! [ -f info.json ]; then
+    echo "Missing info.json" >&2
+    exit 1
+  fi
+
+  if ! [ -f server/mongo/server.jar && -f server/pg/server.jar ]; then
+    echo "Missing one or both server.jar files in the right place. Are you using the build script?" >&2
+    exit 1
+  fi
+
+  mkdir -p ./editor ./rts
 
   # Ensure all *.sh scripts are executable.
   find . -name node_modules -prune -or -type f -name '*.sh' -print -exec chmod +x '{}' ';'
@@ -25,10 +31,6 @@ RUN <<END
   chmod +x /opt/bin/*
 END
 
-#Add the jar to the container
-COPY ${JAR_FILE} backend/server.jar
-COPY ${PLUGIN_JARS} backend/plugins/
-
 # Add client UI - Application Layer
 COPY ./app/client/build editor/
 

deploy/docker/fs/opt/appsmith/entrypoint.sh

@@ -372,7 +372,7 @@ configure_supervisord() {
 
   # Disable services based on configuration
   if [[ -z "${DYNO}" ]]; then
-    if [[ $isUriLocal -eq 0 ]]; then
+    if [[ $isUriLocal -eq 0 && $isMongoUrl -eq 1 ]]; then
       cp "$supervisord_conf_source/mongodb.conf" "$SUPERVISORD_CONF_TARGET"
     fi
     if [[ $APPSMITH_REDIS_URL == *"localhost"* || $APPSMITH_REDIS_URL == *"127.0.0.1"* ]]; then
@@ -508,9 +508,6 @@ if [[ -z "${DYNO}" ]]; then
     tlog "Initializing MongoDB"
     init_mongodb
     init_replica_set
-  elif [[ $isPostgresUrl -eq 1 ]]; then
-    tlog "Initializing Postgres"
-    # init_postgres
   fi
 else
   # These functions are used to limit heap size for Backend process when deployed on Heroku

deploy/docker/fs/opt/appsmith/run-java.sh

@@ -5,6 +5,14 @@ set -o pipefail
 set -o nounset
 set -o noglob
 
+mode=mongo
+if [[ "$APPSMITH_DB_URL" = postgresql://* ]]; then
+  mode=pg
+fi
+
+tlog "Running with $mode."
+cd "/opt/appsmith/server/$mode"
+
 declare -a extra_args
 proxy_configured=0
 

deploy/docker/fs/opt/appsmith/templates/supervisord/application_process/backend.conf

@@ -1,5 +1,4 @@
 [program:backend]
-directory=/opt/appsmith/backend
 command=/opt/appsmith/run-with-env.sh /opt/appsmith/run-java.sh
 priority=20
 autostart=true

scripts/local_testing.sh

@@ -84,9 +84,10 @@ if ! ./build.sh -DskipTests > /dev/null; then
   echo Server build failed >&2
   exit 1
 fi
+popd
+./scripts/prepare_server_artifacts.sh
 pretty_print "Server build successful. Starting client build ..."
 
-popd
 pushd app/client > /dev/null
 yarn > /dev/null
 if ! yarn build > /dev/null; then

scripts/prepare_server_artifacts.sh

@@ -0,0 +1,28 @@
+#!/bin/bash -eux
+
+cd "$(git rev-parse --show-toplevel)"
+
+if [[ -z "${EDITION-}" ]]; then
+  export EDITION=ce
+  if [[ "$(git remote get-url origin)" == *appsmithorg/appsmith-ee* ]]; then
+    export EDITION=ee
+  fi
+fi
+
+PG_TAG="${PG_TAG-pg}"
+echo "Will be copying pg server artifacts from appsmith-$EDITION:$PG_TAG"
+
+target="deploy/docker/fs/opt/appsmith/server"
+mkdir -p "$target"
+rm -rf "$target"/{pg,mongo}
+
+cp -r "app/server/dist" "$target/mongo"
+mv "$target/mongo"/server-*.jar "$target/mongo/server.jar"
+
+# Grab PostgreSQL server artifacts from Docker image.
+image="appsmith/appsmith-$EDITION:$PG_TAG"
+docker run --name xx --detach --entrypoint sleep "$image" infinity
+docker cp xx:/opt/appsmith/server/pg "$target/pg"
+docker cp xx:/opt/appsmith/info.json "$target/pg/source-info.json"
+docker rm --force xx
+docker image rm "$image"