From eb3653a8653b7f9cfe6328a3a33ac73063541266 Mon Sep 17 00:00:00 2001 From: sauravniraula Date: Thu, 26 Jun 2025 16:57:22 +0545 Subject: [PATCH] fix(docker): adds seperate docker start scripts to fix node_modules issue on development --- Dockerfile | 2 +- Dockerfile.dev | 10 +++------- docker-compose.yml | 5 +---- docker-dev-start.sh | 13 +++++++++++++ docker-start.sh | 8 ++++++++ 5 files changed, 26 insertions(+), 12 deletions(-) create mode 100644 docker-dev-start.sh create mode 100644 docker-start.sh diff --git a/Dockerfile b/Dockerfile index ecf0dbbb..5fe801a7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -50,4 +50,4 @@ COPY nginx.conf /etc/nginx/nginx.conf EXPOSE 80 # Start the servers -CMD ["/bin/bash", "-c", "ollama serve & service nginx start && service redis-server start && node /app/start.js"] \ No newline at end of file +CMD ["/bin/bash", "/app/docker-start.sh"] \ No newline at end of file diff --git a/Dockerfile.dev b/Dockerfile.dev index 1bf2c4db..664eb16a 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -32,6 +32,8 @@ RUN npm install # Install chrome for puppeteer RUN npx puppeteer browsers install chrome --install-deps +RUN chmod -R 777 /node_dependencies + # Copy nginx configuration COPY nginx.conf /etc/nginx/nginx.conf @@ -39,10 +41,4 @@ COPY nginx.conf /etc/nginx/nginx.conf EXPOSE 80 3000 8000 # Start the servers -CMD ["/bin/bash", "-c", "\ - rm -rf /app/servers/nextjs/node_modules && \ - ln -s /node_dependencies/node_modules /app/servers/nextjs/node_modules && \ - ollama serve & \ - service nginx start & \ - service redis-server start && \ - node /app/start.js"] \ No newline at end of file +CMD ["/bin/bash", "/app/docker-dev-start.sh"] \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 52262bf0..49cf6c49 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -48,7 +48,4 @@ services: - OPENAI_API_KEY=${OPENAI_API_KEY} - GOOGLE_API_KEY=${GOOGLE_API_KEY} - OLLAMA_MODEL=${OLLAMA_MODEL} - - PEXELS_API_KEY=${PEXELS_API_KEY} - - LANGCHAIN_TRACING_V2=${LANGCHAIN_TRACING_V2} - - LANGCHAIN_API_KEY=${LANGCHAIN_API_KEY} - - LANGCHAIN_PROJECT=${LANGCHAIN_PROJECT} \ No newline at end of file + - PEXELS_API_KEY=${PEXELS_API_KEY} \ No newline at end of file diff --git a/docker-dev-start.sh b/docker-dev-start.sh new file mode 100644 index 00000000..bd6ae2ad --- /dev/null +++ b/docker-dev-start.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +echo "Starting development server..." + +if [ -d "/node_dependencies/node_modules" ]; then + rm -rf /app/servers/nextjs/node_modules + mv /node_dependencies/node_modules /app/servers/nextjs +fi + +ollama serve & +service nginx start +service redis-server start +node /app/start.js diff --git a/docker-start.sh b/docker-start.sh new file mode 100644 index 00000000..22c80b91 --- /dev/null +++ b/docker-start.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +echo "Starting production server..." + +ollama serve & +service nginx start +service redis-server start +node /app/start.js