feat: took care of merge conflicts

Author: MS-githubaccnt

src/backend/main.ts

@@ -132,6 +132,7 @@ async function addSubdomain(ctx: Context) {
       copy.env_content,
       copy.static_content,
       copy.dockerfile_present,
+      copy.volume_needed,
       copy.stack,
       copy.port,
       copy.build_cmds,
@@ -145,7 +146,7 @@ async function addSubdomain(ctx: Context) {
     ctx.response.body = { "status": "failed" };
   }
 }
-
+//!add volume removal logic on deleting the subdomain
 async function deleteSubdomain(ctx: Context) {
   if (!ctx.request.hasBody) {
     ctx.throw(415);

src/backend/scripts.ts

@@ -26,12 +26,13 @@ async function safeExec(command: string): Promise<void> {
     throw error;
   }
 }
-
+//! what if it is url or port
 async function addScript(
   document: DfContentMap,
   env_content: string,
   static_content: string,
   dockerfile_present: string,
+  volume_needed:string,
   stack: string,
   port: string,
   build_cmds: string,
@@ -40,7 +41,9 @@ async function addScript(
   const resource = shellEscape(document.resource, "resource");
   const safePort = shellEscape(port, "port");
   const memLimit = shellEscape(MEMORY_LIMIT || "512m", "MEMORY_LIMIT");
-
+  volume_needed=(volume_needed=="Yes").toString();
+  const volumeNeeded=shellEscape(volume_needed,"false");
+  
   if (document.resource_type === "URL") {
     await safeExec(
       `bash -c "echo 'bash ../../src/backend/shell_scripts/automate.sh -u ${resource} ${subdomain}' > /hostpipe/pipe"`,
@@ -52,19 +55,19 @@ async function addScript(
   } else if (document.resource_type === "GITHUB" && static_content == "Yes") {
     await Deno.writeTextFile(`/hostpipe/.env`, env_content || "");
     await safeExec(
-      `bash -c "echo 'bash ../../src/backend/shell_scripts/container.sh -s ${subdomain} ${resource} 80 ${memLimit}' > /hostpipe/pipe"`,
+      `bash -c "echo 'bash ../../src/backend/shell_scripts/container.sh -s ${subdomain} ${resource} 80 ${memLimit} ${volumeNeeded}' > /hostpipe/pipe"`,
     );
   } else if (document.resource_type === "GITHUB" && static_content == "No") {
     if (dockerfile_present === 'No') {
       await Deno.writeTextFile(`/hostpipe/Dockerfile`, dockerize(stack || "", safePort, build_cmds || ""));
       await Deno.writeTextFile(`/hostpipe/.dockerignore`, dockerignore(stack || ""));
       await Deno.writeTextFile(`/hostpipe/.env`, env_content || "");
       await safeExec(
-        `bash -c "echo 'bash ../../src/backend/shell_scripts/container.sh -g ${subdomain} ${resource} ${safePort} ${memLimit}' > /hostpipe/pipe"`,
+        `bash -c "echo 'bash ../../src/backend/shell_scripts/container.sh -g ${subdomain} ${resource} ${safePort} ${memLimit} ${volumeNeeded}' > /hostpipe/pipe"`,
       );
     } else if (dockerfile_present === 'Yes') {
       await safeExec(
-        `bash -c "echo 'bash ../../src/backend/shell_scripts/container.sh -d ${subdomain} ${resource} ${safePort} ${memLimit}' > /hostpipe/pipe"`,
+        `bash -c "echo 'bash ../../src/backend/shell_scripts/container.sh -d ${subdomain} ${resource} ${safePort} ${memLimit} ${volumeNeeded}' > /hostpipe/pipe"`,
       );
     }
   }

src/backend/shell_scripts/container.sh

@@ -5,9 +5,11 @@ name=$2
 resource=$3
 exp_port=$4
 max_mem=$5 
+enable_voume=$6
 
 available_ports=()
-
+STORAGE_ROOT="/mnt/storage"
+PROJECT_STORAGE="$STORAGE_ROOT/$name"
 for ((port=PORT_MIN; port<=PORT_MAX; port++)); do
     if ! ss -ln src :$port | grep -q "\<$port\>"; then
         available_ports+=($port)
@@ -30,13 +32,33 @@ elif [ $flag = "-s" ]; then
     COPY . /usr/share/nginx/html
     " > Dockerfile    
 fi
-
+if [ "$enable_volume" = "true" ]; then
+    echo "Creating persistent storage at $PROJECT_STORAGE"
+    sudo mkdir -p $PROJECT_STORAGE
+    sudo chmod 777 $PROJECT_STORAGE   # tighten later
+fi
 sudo docker build -t $name .
 
 # Safety net: If the frontend sends double requests from spam-clicking, forcefully remove any zombie container holding the name
 sudo docker rm -f $name 2>/dev/null || true
 
-sudo docker run --memory=$max_mem --name=$name -d -p ${available_ports[$AVAILABLE]}:$exp_port $name
+if [ "$enable_volume" = "true" ]; then
+    sudo docker run \
+        --memory=$max_mem \
+        --name=$name \
+        -d \
+        -p ${available_ports[$AVAILABLE]}:$exp_port \
+        -v $PROJECT_STORAGE:/app/data \
+        -e DATA_DIR=/app/data \
+        $name
+else
+    sudo docker run \
+        --memory=$max_mem \
+        --name=$name \
+        -d \
+        -p ${available_ports[$AVAILABLE]}:$exp_port \
+        $name
+fi
 cd ..
 sudo rm -rf $name
 sudo rm Dockerfile

src/frontend/src/components/modal.vue

@@ -35,6 +35,11 @@ const domain = import.meta.env.VITE_APP_DOMAIN
           <option v-for="option in stacks" :key="option">{{ option }}</option>
         </select>
         </div>
+        <div class="volume-needed">
+          <label for="volume">Do you need persistent storage (Volume)?</label><br>
+          <input name="radio" type="radio" value="Yes" v-model="volume_needed"> Yes
+          <input name="radio" type="radio" value="No" v-model="volume_needed"> No
+        </div>
         <p>Port:<br><input class="input-field" v-model="port" /></p>
         <div v-if="dockerfile_present === 'No'" class="dockerfile-section">
         <p>Build Commands:<br><textarea class="textarea-field" cols="50" rows="10" v-model="build_cmds"></textarea></p>
@@ -67,6 +72,7 @@ export default {
       env_content: 'key1 = value1', // Default prompt text
       static_content: 'No',
       dockerfile_present :'No',
+      volume_needed: 'No',
       port: '',
       stack: '',
       build_cmds: '',
@@ -78,7 +84,7 @@ export default {
   methods: {
     submitForm() {
       console.log(this.subdomain, this.resource_type, this.resource);
-      create(this.subdomain, this.resource_type, this.resource, this.env_content, this.static_content,this.dockerfile_present,this.port, this.stack, this.build_cmds, this.enable_ci)
+      create(this.subdomain, this.resource_type, this.resource, this.env_content, this.static_content,this.dockerfile_present, this.volume_needed, this.port, this.stack, this.build_cmds,this.enable_ci)
         .then((res) => {
           console.log(res);
           if (res === 'Submitted') {

src/frontend/src/utils/create.ts

@@ -61,6 +61,7 @@ export async function create(
   env_content: string,
   static_content: string,
   dockerfile_present:string,
+  volume_needed:string,
   port: string,
   stack: string,
   build_cmds: string,
@@ -89,6 +90,7 @@ export async function create(
     "env_content": env_content,
     "static_content": static_content,
     "dockerfile_present":dockerfile_present,
+    "volume_needed":volume_needed,
     "port": port,
     "build_cmds": build_cmds,
     "stack": stack,