From 9474d2f6330bee5774cbaa2ace42fc8a08a83d10 Mon Sep 17 00:00:00 2001
From: Arnab-Afk <arnabbhowmik019@gmail.com>
Date: Thu, 14 Aug 2025 23:49:19 +0530
Subject: [PATCH] Add Dockerfile and Makefile for cloudflared tunnel setup;
 include startup script

---
 new-backend/Dockerfile.tunnel | 12 +++---------
 new-backend/Makefile          | 21 +++++++++++++++++++++
 new-backend/start.sh          | 16 ++++++++++++++++
 3 files changed, 40 insertions(+), 9 deletions(-)
 create mode 100644 new-backend/Makefile
 create mode 100644 new-backend/start.sh

diff --git a/new-backend/Dockerfile.tunnel b/new-backend/Dockerfile.tunnel
index 94e763e..c0f4b16 100644
--- a/new-backend/Dockerfile.tunnel
+++ b/new-backend/Dockerfile.tunnel
@@ -40,15 +40,9 @@ COPY config.json /etc/cloudflared/config.json
 # Copy the binary from builder
 COPY --from=builder /app/monaco-backend /monaco-backend
 
-# Add startup script
-RUN echo '#!/bin/sh\n\
-# Start the backend\n\
-/monaco-backend & \n\
-# Wait for backend to start\n\
-sleep 5\n\
-# Start cloudflared tunnel using config file\n\
-cloudflared tunnel --no-autoupdate run --config /etc/cloudflared/config.json\n\
-' > /start.sh && chmod +x /start.sh
+# Copy the startup script
+COPY start.sh /start.sh
+RUN chmod +x /start.sh
 
 # Expose port for local access
 EXPOSE 8080
diff --git a/new-backend/Makefile b/new-backend/Makefile
new file mode 100644
index 0000000..b39dec5
--- /dev/null
+++ b/new-backend/Makefile
@@ -0,0 +1,21 @@
+.PHONY: build run run-detached stop logs
+
+# Build the image
+build:
+	docker-compose -f docker-compose.tunnel.yml build
+
+# Run the container
+run: build
+	docker-compose -f docker-compose.tunnel.yml up
+
+# Run in detached mode
+run-detached: build
+	docker-compose -f docker-compose.tunnel.yml up -d
+
+# Stop the container
+stop:
+	docker-compose -f docker-compose.tunnel.yml down
+
+# View logs
+logs:
+	docker-compose -f docker-compose.tunnel.yml logs -f
diff --git a/new-backend/start.sh b/new-backend/start.sh
new file mode 100644
index 0000000..6090f69
--- /dev/null
+++ b/new-backend/start.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+# Start the backend
+/monaco-backend &
+BACKEND_PID=$!
+echo "Backend started with PID: $BACKEND_PID"
+
+# Wait for backend to start
+echo "Waiting for backend to initialize..."
+sleep 5
+
+# Start cloudflared tunnel using config file
+echo "Starting Cloudflare tunnel to api.ishikabhoyar.tech..."
+cloudflared tunnel --no-autoupdate run --config /etc/cloudflared/config.json
+
+# If cloudflared exits, kill the backend too
+kill $BACKEND_PID