diff --git a/.dockerignore b/.dockerignore index c0e3eddd..616ca25a 100644 --- a/.dockerignore +++ b/.dockerignore @@ -6,4 +6,5 @@ out build .git .gitignore -tmp \ No newline at end of file +tmp +debug \ No newline at end of file diff --git a/.gitignore b/.gitignore index e55e0c33..6d9d48ad 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,5 @@ __pycache__ node_modules out user_data -tmp \ No newline at end of file +tmp +debug \ No newline at end of file diff --git a/Dockerfile.dev b/Dockerfile.dev index 4c8d2c2b..1bf2c4db 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -24,9 +24,8 @@ RUN curl -fsSL https://ollama.com/install.sh | sh COPY servers/fastapi/requirements.txt ./ RUN pip install -r requirements.txt - # Install dependencies for Next.js -WORKDIR /app/servers/nextjs +WORKDIR /node_dependencies COPY servers/nextjs/package.json servers/nextjs/package-lock.json ./ RUN npm install @@ -37,7 +36,13 @@ RUN npx puppeteer browsers install chrome --install-deps COPY nginx.conf /etc/nginx/nginx.conf # Expose the port -EXPOSE 80 3000 8000 6379 +EXPOSE 80 3000 8000 # 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", "-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