fix(docker): adds seperate docker start scripts to fix node_modules issue on development
This commit is contained in:
parent
98d29f811f
commit
eb3653a865
5 changed files with 26 additions and 12 deletions
|
|
@ -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"]
|
||||
CMD ["/bin/bash", "/app/docker-start.sh"]
|
||||
|
|
@ -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"]
|
||||
CMD ["/bin/bash", "/app/docker-dev-start.sh"]
|
||||
|
|
@ -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}
|
||||
- PEXELS_API_KEY=${PEXELS_API_KEY}
|
||||
13
docker-dev-start.sh
Normal file
13
docker-dev-start.sh
Normal file
|
|
@ -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
|
||||
8
docker-start.sh
Normal file
8
docker-start.sh
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
#!/bin/bash
|
||||
|
||||
echo "Starting production server..."
|
||||
|
||||
ollama serve &
|
||||
service nginx start
|
||||
service redis-server start
|
||||
node /app/start.js
|
||||
Loading…
Add table
Reference in a new issue