From d23f8618e352aa4a69f7eb87137a2210dbc9512d Mon Sep 17 00:00:00 2001
From: Shrikant Sharat Kandula <shrikant@appsmith.com>
Date: Thu, 7 Nov 2024 10:38:20 +0530
Subject: [PATCH 1/3] chore: Fix condition syntax in Dockerfile

---
 Dockerfile | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2245e81037e5..2b0d8f836cf0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,18 +17,10 @@ RUN <<END
     exit 1
   fi
 
-  if ! [ -f server/mongo/server.jar && -f server/pg/server.jar ]; then
+  if ! [ -f server/mongo/server.jar -a -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 '{}' ';'
-
-  # Ensure all custom command-scripts have executable permission
-  chmod +x /opt/bin/*
 END
 
 # Add client UI - Application Layer
@@ -48,6 +40,10 @@ RUN <<END
   rm -rf utils/node_modules/resolve/test
   cd -
 
+  # Ensure all *.sh scripts are executable.
+  find . -name node_modules -prune -or -type f -name '*.sh' -print -exec chmod +x '{}' ';'
+
+  # Ensure all custom command-scripts have executable permission
   chmod +x /opt/bin/* *.sh /watchtower-hooks/*.sh
 
   # Disable setuid/setgid bits for the files inside container.

From 024a43b302aca1bb6fa769fdc525b8ad4868b914 Mon Sep 17 00:00:00 2001
From: Shrikant Sharat Kandula <shrikant@appsmith.com>
Date: Thu, 7 Nov 2024 10:50:21 +0530
Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=90=87=20suggestions?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2b0d8f836cf0..7a764932ee04 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -40,11 +40,11 @@ RUN <<END
   rm -rf utils/node_modules/resolve/test
   cd -
 
-  # Ensure all *.sh scripts are executable.
-  find . -name node_modules -prune -or -type f -name '*.sh' -print -exec chmod +x '{}' ';'
+  # Make all `*.sh` files executable, excliding `node_modules`.
+  find . \( -name node_modules -prune \) -o \( -type f -name '*.sh' \) -exec chmod +x '{}' +
 
   # Ensure all custom command-scripts have executable permission
-  chmod +x /opt/bin/* *.sh /watchtower-hooks/*.sh
+  chmod +x /opt/bin/* /watchtower-hooks/*.sh
 
   # Disable setuid/setgid bits for the files inside container.
   find / \( -path /proc -prune \) -o \( \( -perm -2000 -o -perm -4000 \) -exec chmod -s '{}' + \) || true

From 6c739439fa181f41245294a46321544edf61e878 Mon Sep 17 00:00:00 2001
From: Arpit Mohan <mohanarpit@users.noreply.github.com>
Date: Thu, 7 Nov 2024 13:17:44 +0530
Subject: [PATCH 3/3] correct typo in comment

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 7a764932ee04..be72a28da060 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -40,7 +40,7 @@ RUN <<END
   rm -rf utils/node_modules/resolve/test
   cd -
 
-  # Make all `*.sh` files executable, excliding `node_modules`.
+  # Make all `*.sh` files executable, excluding `node_modules`.
   find . \( -name node_modules -prune \) -o \( -type f -name '*.sh' \) -exec chmod +x '{}' +
 
   # Ensure all custom command-scripts have executable permission