From c594699eac314aeed4c92c9c1cccac45eb55622a Mon Sep 17 00:00:00 2001
From: Shrikant Sharat Kandula <shrikant@appsmith.com>
Date: Mon, 11 Sep 2023 08:43:09 +0530
Subject: [PATCH] chore: Use single COPY command in Dockerfile for
 constant/static files (#27127)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Move the files that are copied into the Docker image, into an `fs`
folder, that reflects the folder structure of that in the image. This
means two things right away:

1. A single `COPY` instruction in `Dockerfile` is enough to copy all the
files to their places.
2. The structure of files in the repo reflects that in the Docker image.
This makes working with the files/folders and troubleshooting with them
much easier.

❗ Note: **There's actually only 3 files changed, rest are just moved.**
---
 .github/workflows/appsmithctl.yml             |  6 +--
 Dockerfile                                    | 44 ++++---------------
 .../{templates => fs/etc}/cron.d/cleanup-logs |  0
 .../etc}/cron.d/renew-certificate             |  0
 .../etc/supervisor}/supervisord.conf          |  0
 .../{ => fs/opt/appsmith}/entrypoint.sh       |  0
 .../opt/appsmith}/healthcheck.sh              |  0
 .../opt/appsmith}/init_ssl_cert.sh            |  0
 .../opt/appsmith}/install_docker.sh           |  0
 .../opt/appsmith}/pull_resource.sh            |  0
 .../opt/appsmith}/renew-certificate.sh        |  0
 .../{scripts => fs/opt/appsmith}/run-java.sh  |  0
 .../{scripts => fs/opt/appsmith}/run-nginx.sh |  0
 .../opt/appsmith}/run-starting-page-init.sh   |  0
 .../opt/appsmith}/run-with-env.sh             |  0
 .../{scripts => fs/opt/appsmith}/start_app.sh |  0
 .../opt/appsmith}/starting-page-init.py       |  0
 .../templates/appsmith_initializing.html      |  0
 .../templates/appsmith_starting.html          |  0
 .../opt/appsmith}/templates/docker.env.sh     |  0
 .../appsmith}/templates/mockdb_postgres.sql   |  0
 .../opt/appsmith/templates}/nginx-app.conf.sh |  0
 .../application_process/backend.conf          |  0
 .../application_process/editor.conf           |  0
 .../supervisord/application_process/rts.conf  |  0
 .../appsmith}/templates/supervisord/cron.conf |  0
 .../templates/supervisord/mongodb.conf        |  0
 .../templates/supervisord/postgres.conf       |  0
 .../templates/supervisord/redis.conf          |  0
 .../appsmith}/templates/users_postgres.sql    |  0
 .../update-and-restart-supervisor.sh          |  0
 .../{ => fs/opt/appsmith}/utils/bin/backup.js |  0
 .../opt/appsmith}/utils/bin/backup.test.js    |  0
 .../appsmith}/utils/bin/check_replica_set.js  |  0
 .../opt/appsmith}/utils/bin/constants.js      |  0
 .../opt/appsmith}/utils/bin/export_db.js      |  0
 .../opt/appsmith}/utils/bin/import_db.js      |  0
 .../{ => fs/opt/appsmith}/utils/bin/index.js  |  0
 .../{ => fs/opt/appsmith}/utils/bin/logger.js |  0
 .../{ => fs/opt/appsmith}/utils/bin/mailer.js |  0
 .../opt/appsmith}/utils/bin/migrate.js        |  0
 .../appsmith}/utils/bin/mongo_shell_utils.js  |  0
 .../opt/appsmith}/utils/bin/restore.js        |  0
 .../{ => fs/opt/appsmith}/utils/bin/utils.js  |  0
 .../opt/appsmith}/utils/bin/version.js        |  0
 .../opt/appsmith}/utils/package-lock.json     |  0
 .../{ => fs/opt/appsmith}/utils/package.json  |  0
 .../{ => fs}/watchtower-hooks/pre-check.sh    |  0
 .../{ => fs}/watchtower-hooks/pre-update.sh   |  0
 deploy/docker/utils/.gitignore                |  1 -
 scripts/generate_info_json.sh                 |  2 +-
 51 files changed, 13 insertions(+), 40 deletions(-)
 rename deploy/docker/{templates => fs/etc}/cron.d/cleanup-logs (100%)
 rename deploy/docker/{templates => fs/etc}/cron.d/renew-certificate (100%)
 rename deploy/docker/{templates => fs/etc/supervisor}/supervisord.conf (100%)
 rename deploy/docker/{ => fs/opt/appsmith}/entrypoint.sh (100%)
 rename deploy/docker/{scripts => fs/opt/appsmith}/healthcheck.sh (100%)
 rename deploy/docker/{scripts => fs/opt/appsmith}/init_ssl_cert.sh (100%)
 rename deploy/docker/{scripts => fs/opt/appsmith}/install_docker.sh (100%)
 rename deploy/docker/{scripts => fs/opt/appsmith}/pull_resource.sh (100%)
 rename deploy/docker/{scripts => fs/opt/appsmith}/renew-certificate.sh (100%)
 rename deploy/docker/{scripts => fs/opt/appsmith}/run-java.sh (100%)
 rename deploy/docker/{scripts => fs/opt/appsmith}/run-nginx.sh (100%)
 rename deploy/docker/{scripts => fs/opt/appsmith}/run-starting-page-init.sh (100%)
 rename deploy/docker/{scripts => fs/opt/appsmith}/run-with-env.sh (100%)
 rename deploy/docker/{scripts => fs/opt/appsmith}/start_app.sh (100%)
 rename deploy/docker/{scripts => fs/opt/appsmith}/starting-page-init.py (100%)
 rename deploy/docker/{ => fs/opt/appsmith}/templates/appsmith_initializing.html (100%)
 rename deploy/docker/{ => fs/opt/appsmith}/templates/appsmith_starting.html (100%)
 rename deploy/docker/{ => fs/opt/appsmith}/templates/docker.env.sh (100%)
 rename deploy/docker/{ => fs/opt/appsmith}/templates/mockdb_postgres.sql (100%)
 rename deploy/docker/{templates/nginx => fs/opt/appsmith/templates}/nginx-app.conf.sh (100%)
 rename deploy/docker/{ => fs/opt/appsmith}/templates/supervisord/application_process/backend.conf (100%)
 rename deploy/docker/{ => fs/opt/appsmith}/templates/supervisord/application_process/editor.conf (100%)
 rename deploy/docker/{ => fs/opt/appsmith}/templates/supervisord/application_process/rts.conf (100%)
 rename deploy/docker/{ => fs/opt/appsmith}/templates/supervisord/cron.conf (100%)
 rename deploy/docker/{ => fs/opt/appsmith}/templates/supervisord/mongodb.conf (100%)
 rename deploy/docker/{ => fs/opt/appsmith}/templates/supervisord/postgres.conf (100%)
 rename deploy/docker/{ => fs/opt/appsmith}/templates/supervisord/redis.conf (100%)
 rename deploy/docker/{ => fs/opt/appsmith}/templates/users_postgres.sql (100%)
 rename deploy/docker/{scripts => fs/opt/appsmith}/update-and-restart-supervisor.sh (100%)
 rename deploy/docker/{ => fs/opt/appsmith}/utils/bin/backup.js (100%)
 rename deploy/docker/{ => fs/opt/appsmith}/utils/bin/backup.test.js (100%)
 rename deploy/docker/{ => fs/opt/appsmith}/utils/bin/check_replica_set.js (100%)
 rename deploy/docker/{ => fs/opt/appsmith}/utils/bin/constants.js (100%)
 rename deploy/docker/{ => fs/opt/appsmith}/utils/bin/export_db.js (100%)
 rename deploy/docker/{ => fs/opt/appsmith}/utils/bin/import_db.js (100%)
 rename deploy/docker/{ => fs/opt/appsmith}/utils/bin/index.js (100%)
 rename deploy/docker/{ => fs/opt/appsmith}/utils/bin/logger.js (100%)
 rename deploy/docker/{ => fs/opt/appsmith}/utils/bin/mailer.js (100%)
 rename deploy/docker/{ => fs/opt/appsmith}/utils/bin/migrate.js (100%)
 rename deploy/docker/{ => fs/opt/appsmith}/utils/bin/mongo_shell_utils.js (100%)
 rename deploy/docker/{ => fs/opt/appsmith}/utils/bin/restore.js (100%)
 rename deploy/docker/{ => fs/opt/appsmith}/utils/bin/utils.js (100%)
 rename deploy/docker/{ => fs/opt/appsmith}/utils/bin/version.js (100%)
 rename deploy/docker/{ => fs/opt/appsmith}/utils/package-lock.json (100%)
 rename deploy/docker/{ => fs/opt/appsmith}/utils/package.json (100%)
 rename deploy/docker/{ => fs}/watchtower-hooks/pre-check.sh (100%)
 rename deploy/docker/{ => fs}/watchtower-hooks/pre-update.sh (100%)
 delete mode 100644 deploy/docker/utils/.gitignore

diff --git a/.github/workflows/appsmithctl.yml b/.github/workflows/appsmithctl.yml
index 5270ff0f6b..d091308ee4 100644
--- a/.github/workflows/appsmithctl.yml
+++ b/.github/workflows/appsmithctl.yml
@@ -14,12 +14,12 @@ on:
   pull_request:
     branches: [release, master]
     paths:
-      - "deploy/docker/utils/**"
+      - "deploy/docker/fs/opt/appsmith/utils/**"
 
 # Change the working directory for all the jobs in this workflow
 defaults:
   run:
-    working-directory: deploy/docker/utils/
+    working-directory: deploy/docker/fs/opt/appsmith/utils/
 
 jobs:
   build:
@@ -97,7 +97,7 @@ jobs:
           echo "appsmithctl_run_result=failed" >> $GITHUB_OUTPUT > ~/appsmithctl_run_result
           exit 1;
 
-  
+
       # Set status = success
       - name: Save the status of the run
         run: echo "appsmithctl_run_result=success" >> $GITHUB_OUTPUT > ~/appsmithctl_run_result
diff --git a/Dockerfile b/Dockerfile
index c1ff8b6d0c..2f44b44bad 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -34,8 +34,7 @@ RUN curl --silent --show-error --location https://www.mongodb.org/static/pgp/ser
   && curl --silent --show-error --location https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
   && apt update \
   && apt-get install --no-install-recommends --yes mongodb-org nodejs redis build-essential postgresql-13 \
-  && apt-get clean \
-  && rm -rf /var/lib/apt/lists/*
+  && apt-get clean
 
 # Clean up cache file - Service layer
 RUN rm -rf \
@@ -62,7 +61,9 @@ ENV APPSMITH_CLOUD_SERVICES_BASE_URL=${APPSMITH_CLOUD_SERVICES_BASE_URL}
 ARG APPSMITH_SEGMENT_CE_KEY
 ENV APPSMITH_SEGMENT_CE_KEY=${APPSMITH_SEGMENT_CE_KEY}
 #Create the plugins directory
-RUN mkdir -p ./backend ./editor ./rts ./backend/plugins ./templates ./utils
+RUN mkdir -p ./editor ./rts ./backend/plugins
+
+COPY deploy/docker/fs /
 
 #Add the jar to the container
 COPY ${JAR_FILE} backend/server.jar
@@ -74,43 +75,16 @@ COPY ./app/client/build editor/
 # Add RTS - Application Layer
 COPY ./app/client/packages/rts/package.json ./app/client/packages/rts/dist rts/
 
-# Nginx, MongoDB and PostgreSQL data config template - Configuration layer
-COPY ./deploy/docker/templates/nginx/* \
-  ./deploy/docker/templates/docker.env.sh \
-  ./deploy/docker/templates/mockdb_postgres.sql \
-  ./deploy/docker/templates/users_postgres.sql \
-  ./deploy/docker/templates/appsmith_starting.html \
-  ./deploy/docker/templates/appsmith_initializing.html \
-  templates/
-
-# Add bootstrapfile
-COPY ./deploy/docker/entrypoint.sh ./deploy/docker/scripts/* info.*json ./
-
-# Add util tools
-COPY ./deploy/docker/utils ./utils
-RUN cd ./utils && npm install --only=prod && npm install --only=prod -g .
-
-# Add process config to be run by supervisord
-COPY ./deploy/docker/templates/supervisord.conf /etc/supervisor/supervisord.conf
-COPY ./deploy/docker/templates/supervisord/ templates/supervisord/
-
-# Add defined cron job
-COPY ./deploy/docker/templates/cron.d /etc/cron.d/
-RUN chmod 0644 /etc/cron.d/*
-
-RUN chmod +x entrypoint.sh renew-certificate.sh healthcheck.sh
-
-# Disable setuid/setgid bits for the files inside container.
-RUN find / \( -path /proc -prune \) -o \( \( -perm -2000 -o -perm -4000 \) -print -exec chmod -s '{}' + \) || true
+RUN cd ./utils && npm install --only=prod && npm install --only=prod -g . && cd - \
+  && chmod 0644 /etc/cron.d/* \
+  && chmod +x entrypoint.sh renew-certificate.sh healthcheck.sh /watchtower-hooks/*.sh \
+  # Disable setuid/setgid bits for the files inside container.
+  && find / \( -path /proc -prune \) -o \( \( -perm -2000 -o -perm -4000 \) -print -exec chmod -s '{}' + \) || true
 
 # Update path to load appsmith utils tool as default
 ENV PATH /opt/appsmith/utils/node_modules/.bin:$PATH
 LABEL com.centurylinklabs.watchtower.lifecycle.pre-check=/watchtower-hooks/pre-check.sh
 LABEL com.centurylinklabs.watchtower.lifecycle.pre-update=/watchtower-hooks/pre-update.sh
-COPY ./deploy/docker/watchtower-hooks /watchtower-hooks
-RUN chmod +x /watchtower-hooks/pre-check.sh
-RUN chmod +x /watchtower-hooks/pre-update.sh
-
 
 EXPOSE 80
 EXPOSE 443
diff --git a/deploy/docker/templates/cron.d/cleanup-logs b/deploy/docker/fs/etc/cron.d/cleanup-logs
similarity index 100%
rename from deploy/docker/templates/cron.d/cleanup-logs
rename to deploy/docker/fs/etc/cron.d/cleanup-logs
diff --git a/deploy/docker/templates/cron.d/renew-certificate b/deploy/docker/fs/etc/cron.d/renew-certificate
similarity index 100%
rename from deploy/docker/templates/cron.d/renew-certificate
rename to deploy/docker/fs/etc/cron.d/renew-certificate
diff --git a/deploy/docker/templates/supervisord.conf b/deploy/docker/fs/etc/supervisor/supervisord.conf
similarity index 100%
rename from deploy/docker/templates/supervisord.conf
rename to deploy/docker/fs/etc/supervisor/supervisord.conf
diff --git a/deploy/docker/entrypoint.sh b/deploy/docker/fs/opt/appsmith/entrypoint.sh
similarity index 100%
rename from deploy/docker/entrypoint.sh
rename to deploy/docker/fs/opt/appsmith/entrypoint.sh
diff --git a/deploy/docker/scripts/healthcheck.sh b/deploy/docker/fs/opt/appsmith/healthcheck.sh
similarity index 100%
rename from deploy/docker/scripts/healthcheck.sh
rename to deploy/docker/fs/opt/appsmith/healthcheck.sh
diff --git a/deploy/docker/scripts/init_ssl_cert.sh b/deploy/docker/fs/opt/appsmith/init_ssl_cert.sh
similarity index 100%
rename from deploy/docker/scripts/init_ssl_cert.sh
rename to deploy/docker/fs/opt/appsmith/init_ssl_cert.sh
diff --git a/deploy/docker/scripts/install_docker.sh b/deploy/docker/fs/opt/appsmith/install_docker.sh
similarity index 100%
rename from deploy/docker/scripts/install_docker.sh
rename to deploy/docker/fs/opt/appsmith/install_docker.sh
diff --git a/deploy/docker/scripts/pull_resource.sh b/deploy/docker/fs/opt/appsmith/pull_resource.sh
similarity index 100%
rename from deploy/docker/scripts/pull_resource.sh
rename to deploy/docker/fs/opt/appsmith/pull_resource.sh
diff --git a/deploy/docker/scripts/renew-certificate.sh b/deploy/docker/fs/opt/appsmith/renew-certificate.sh
similarity index 100%
rename from deploy/docker/scripts/renew-certificate.sh
rename to deploy/docker/fs/opt/appsmith/renew-certificate.sh
diff --git a/deploy/docker/scripts/run-java.sh b/deploy/docker/fs/opt/appsmith/run-java.sh
similarity index 100%
rename from deploy/docker/scripts/run-java.sh
rename to deploy/docker/fs/opt/appsmith/run-java.sh
diff --git a/deploy/docker/scripts/run-nginx.sh b/deploy/docker/fs/opt/appsmith/run-nginx.sh
similarity index 100%
rename from deploy/docker/scripts/run-nginx.sh
rename to deploy/docker/fs/opt/appsmith/run-nginx.sh
diff --git a/deploy/docker/scripts/run-starting-page-init.sh b/deploy/docker/fs/opt/appsmith/run-starting-page-init.sh
similarity index 100%
rename from deploy/docker/scripts/run-starting-page-init.sh
rename to deploy/docker/fs/opt/appsmith/run-starting-page-init.sh
diff --git a/deploy/docker/scripts/run-with-env.sh b/deploy/docker/fs/opt/appsmith/run-with-env.sh
similarity index 100%
rename from deploy/docker/scripts/run-with-env.sh
rename to deploy/docker/fs/opt/appsmith/run-with-env.sh
diff --git a/deploy/docker/scripts/start_app.sh b/deploy/docker/fs/opt/appsmith/start_app.sh
similarity index 100%
rename from deploy/docker/scripts/start_app.sh
rename to deploy/docker/fs/opt/appsmith/start_app.sh
diff --git a/deploy/docker/scripts/starting-page-init.py b/deploy/docker/fs/opt/appsmith/starting-page-init.py
similarity index 100%
rename from deploy/docker/scripts/starting-page-init.py
rename to deploy/docker/fs/opt/appsmith/starting-page-init.py
diff --git a/deploy/docker/templates/appsmith_initializing.html b/deploy/docker/fs/opt/appsmith/templates/appsmith_initializing.html
similarity index 100%
rename from deploy/docker/templates/appsmith_initializing.html
rename to deploy/docker/fs/opt/appsmith/templates/appsmith_initializing.html
diff --git a/deploy/docker/templates/appsmith_starting.html b/deploy/docker/fs/opt/appsmith/templates/appsmith_starting.html
similarity index 100%
rename from deploy/docker/templates/appsmith_starting.html
rename to deploy/docker/fs/opt/appsmith/templates/appsmith_starting.html
diff --git a/deploy/docker/templates/docker.env.sh b/deploy/docker/fs/opt/appsmith/templates/docker.env.sh
similarity index 100%
rename from deploy/docker/templates/docker.env.sh
rename to deploy/docker/fs/opt/appsmith/templates/docker.env.sh
diff --git a/deploy/docker/templates/mockdb_postgres.sql b/deploy/docker/fs/opt/appsmith/templates/mockdb_postgres.sql
similarity index 100%
rename from deploy/docker/templates/mockdb_postgres.sql
rename to deploy/docker/fs/opt/appsmith/templates/mockdb_postgres.sql
diff --git a/deploy/docker/templates/nginx/nginx-app.conf.sh b/deploy/docker/fs/opt/appsmith/templates/nginx-app.conf.sh
similarity index 100%
rename from deploy/docker/templates/nginx/nginx-app.conf.sh
rename to deploy/docker/fs/opt/appsmith/templates/nginx-app.conf.sh
diff --git a/deploy/docker/templates/supervisord/application_process/backend.conf b/deploy/docker/fs/opt/appsmith/templates/supervisord/application_process/backend.conf
similarity index 100%
rename from deploy/docker/templates/supervisord/application_process/backend.conf
rename to deploy/docker/fs/opt/appsmith/templates/supervisord/application_process/backend.conf
diff --git a/deploy/docker/templates/supervisord/application_process/editor.conf b/deploy/docker/fs/opt/appsmith/templates/supervisord/application_process/editor.conf
similarity index 100%
rename from deploy/docker/templates/supervisord/application_process/editor.conf
rename to deploy/docker/fs/opt/appsmith/templates/supervisord/application_process/editor.conf
diff --git a/deploy/docker/templates/supervisord/application_process/rts.conf b/deploy/docker/fs/opt/appsmith/templates/supervisord/application_process/rts.conf
similarity index 100%
rename from deploy/docker/templates/supervisord/application_process/rts.conf
rename to deploy/docker/fs/opt/appsmith/templates/supervisord/application_process/rts.conf
diff --git a/deploy/docker/templates/supervisord/cron.conf b/deploy/docker/fs/opt/appsmith/templates/supervisord/cron.conf
similarity index 100%
rename from deploy/docker/templates/supervisord/cron.conf
rename to deploy/docker/fs/opt/appsmith/templates/supervisord/cron.conf
diff --git a/deploy/docker/templates/supervisord/mongodb.conf b/deploy/docker/fs/opt/appsmith/templates/supervisord/mongodb.conf
similarity index 100%
rename from deploy/docker/templates/supervisord/mongodb.conf
rename to deploy/docker/fs/opt/appsmith/templates/supervisord/mongodb.conf
diff --git a/deploy/docker/templates/supervisord/postgres.conf b/deploy/docker/fs/opt/appsmith/templates/supervisord/postgres.conf
similarity index 100%
rename from deploy/docker/templates/supervisord/postgres.conf
rename to deploy/docker/fs/opt/appsmith/templates/supervisord/postgres.conf
diff --git a/deploy/docker/templates/supervisord/redis.conf b/deploy/docker/fs/opt/appsmith/templates/supervisord/redis.conf
similarity index 100%
rename from deploy/docker/templates/supervisord/redis.conf
rename to deploy/docker/fs/opt/appsmith/templates/supervisord/redis.conf
diff --git a/deploy/docker/templates/users_postgres.sql b/deploy/docker/fs/opt/appsmith/templates/users_postgres.sql
similarity index 100%
rename from deploy/docker/templates/users_postgres.sql
rename to deploy/docker/fs/opt/appsmith/templates/users_postgres.sql
diff --git a/deploy/docker/scripts/update-and-restart-supervisor.sh b/deploy/docker/fs/opt/appsmith/update-and-restart-supervisor.sh
similarity index 100%
rename from deploy/docker/scripts/update-and-restart-supervisor.sh
rename to deploy/docker/fs/opt/appsmith/update-and-restart-supervisor.sh
diff --git a/deploy/docker/utils/bin/backup.js b/deploy/docker/fs/opt/appsmith/utils/bin/backup.js
similarity index 100%
rename from deploy/docker/utils/bin/backup.js
rename to deploy/docker/fs/opt/appsmith/utils/bin/backup.js
diff --git a/deploy/docker/utils/bin/backup.test.js b/deploy/docker/fs/opt/appsmith/utils/bin/backup.test.js
similarity index 100%
rename from deploy/docker/utils/bin/backup.test.js
rename to deploy/docker/fs/opt/appsmith/utils/bin/backup.test.js
diff --git a/deploy/docker/utils/bin/check_replica_set.js b/deploy/docker/fs/opt/appsmith/utils/bin/check_replica_set.js
similarity index 100%
rename from deploy/docker/utils/bin/check_replica_set.js
rename to deploy/docker/fs/opt/appsmith/utils/bin/check_replica_set.js
diff --git a/deploy/docker/utils/bin/constants.js b/deploy/docker/fs/opt/appsmith/utils/bin/constants.js
similarity index 100%
rename from deploy/docker/utils/bin/constants.js
rename to deploy/docker/fs/opt/appsmith/utils/bin/constants.js
diff --git a/deploy/docker/utils/bin/export_db.js b/deploy/docker/fs/opt/appsmith/utils/bin/export_db.js
similarity index 100%
rename from deploy/docker/utils/bin/export_db.js
rename to deploy/docker/fs/opt/appsmith/utils/bin/export_db.js
diff --git a/deploy/docker/utils/bin/import_db.js b/deploy/docker/fs/opt/appsmith/utils/bin/import_db.js
similarity index 100%
rename from deploy/docker/utils/bin/import_db.js
rename to deploy/docker/fs/opt/appsmith/utils/bin/import_db.js
diff --git a/deploy/docker/utils/bin/index.js b/deploy/docker/fs/opt/appsmith/utils/bin/index.js
similarity index 100%
rename from deploy/docker/utils/bin/index.js
rename to deploy/docker/fs/opt/appsmith/utils/bin/index.js
diff --git a/deploy/docker/utils/bin/logger.js b/deploy/docker/fs/opt/appsmith/utils/bin/logger.js
similarity index 100%
rename from deploy/docker/utils/bin/logger.js
rename to deploy/docker/fs/opt/appsmith/utils/bin/logger.js
diff --git a/deploy/docker/utils/bin/mailer.js b/deploy/docker/fs/opt/appsmith/utils/bin/mailer.js
similarity index 100%
rename from deploy/docker/utils/bin/mailer.js
rename to deploy/docker/fs/opt/appsmith/utils/bin/mailer.js
diff --git a/deploy/docker/utils/bin/migrate.js b/deploy/docker/fs/opt/appsmith/utils/bin/migrate.js
similarity index 100%
rename from deploy/docker/utils/bin/migrate.js
rename to deploy/docker/fs/opt/appsmith/utils/bin/migrate.js
diff --git a/deploy/docker/utils/bin/mongo_shell_utils.js b/deploy/docker/fs/opt/appsmith/utils/bin/mongo_shell_utils.js
similarity index 100%
rename from deploy/docker/utils/bin/mongo_shell_utils.js
rename to deploy/docker/fs/opt/appsmith/utils/bin/mongo_shell_utils.js
diff --git a/deploy/docker/utils/bin/restore.js b/deploy/docker/fs/opt/appsmith/utils/bin/restore.js
similarity index 100%
rename from deploy/docker/utils/bin/restore.js
rename to deploy/docker/fs/opt/appsmith/utils/bin/restore.js
diff --git a/deploy/docker/utils/bin/utils.js b/deploy/docker/fs/opt/appsmith/utils/bin/utils.js
similarity index 100%
rename from deploy/docker/utils/bin/utils.js
rename to deploy/docker/fs/opt/appsmith/utils/bin/utils.js
diff --git a/deploy/docker/utils/bin/version.js b/deploy/docker/fs/opt/appsmith/utils/bin/version.js
similarity index 100%
rename from deploy/docker/utils/bin/version.js
rename to deploy/docker/fs/opt/appsmith/utils/bin/version.js
diff --git a/deploy/docker/utils/package-lock.json b/deploy/docker/fs/opt/appsmith/utils/package-lock.json
similarity index 100%
rename from deploy/docker/utils/package-lock.json
rename to deploy/docker/fs/opt/appsmith/utils/package-lock.json
diff --git a/deploy/docker/utils/package.json b/deploy/docker/fs/opt/appsmith/utils/package.json
similarity index 100%
rename from deploy/docker/utils/package.json
rename to deploy/docker/fs/opt/appsmith/utils/package.json
diff --git a/deploy/docker/watchtower-hooks/pre-check.sh b/deploy/docker/fs/watchtower-hooks/pre-check.sh
similarity index 100%
rename from deploy/docker/watchtower-hooks/pre-check.sh
rename to deploy/docker/fs/watchtower-hooks/pre-check.sh
diff --git a/deploy/docker/watchtower-hooks/pre-update.sh b/deploy/docker/fs/watchtower-hooks/pre-update.sh
similarity index 100%
rename from deploy/docker/watchtower-hooks/pre-update.sh
rename to deploy/docker/fs/watchtower-hooks/pre-update.sh
diff --git a/deploy/docker/utils/.gitignore b/deploy/docker/utils/.gitignore
deleted file mode 100644
index 40b878db5b..0000000000
--- a/deploy/docker/utils/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-node_modules/
\ No newline at end of file
diff --git a/scripts/generate_info_json.sh b/scripts/generate_info_json.sh
index ae1375bb3e..8eac9534e3 100755
--- a/scripts/generate_info_json.sh
+++ b/scripts/generate_info_json.sh
@@ -39,4 +39,4 @@ jq -n \
   --arg githubRunUrl "${github_run_url-}" \
   --arg imageBuiltAt "$(date -u -Iseconds)" \
   --argjson isCI "${CI:-false}" \
-  '$ARGS.named' | tee "$(git rev-parse --show-toplevel)/info.json"
+  '$ARGS.named' | tee "$(git rev-parse --show-toplevel)/deploy/docker/fs/opt/appsmith/info.json"