diff --git a/docker-compose.yml b/docker-compose.yml index a70a67a..af71cbd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -17,12 +17,24 @@ services: container_name: resource-provider ports: - "3000:3000" # Node.js API - - "3005:80" # Nginx static files environment: - NODE_ENV=production - PORT=3000 volumes: - - ./static-files:/static-files + - ./static-files:/app/static-files + networks: + - app-network + restart: unless-stopped + + static-provider: + build: + context: ./static-provider + dockerfile: Dockerfile + container_name: static-provider + ports: + - "3005:80" # Nginx static files + volumes: + - ./static-files:/usr/share/nginx/html networks: - app-network restart: unless-stopped diff --git a/resource-provider/Dockerfile b/resource-provider/Dockerfile index b4780be..dea117d 100644 --- a/resource-provider/Dockerfile +++ b/resource-provider/Dockerfile @@ -1,9 +1,6 @@ -# Resource Provider (Node.js + Nginx) Dockerfile +# Resource Provider (Node.js) Dockerfile FROM node:20-alpine -# Install nginx -RUN apk add --no-cache nginx - # Set working directory WORKDIR /app @@ -18,16 +15,9 @@ RUN pnpm install --frozen-lockfile # Copy the rest of the application COPY . . -COPY nginx.conf /etc/nginx/http.d/default.conf -# Just fix nginx permissions - let nginx create what it needs -RUN chown -R nginx:nginx /var/lib/nginx /var/log/nginx +# Expose port +EXPOSE 3000 -# Create static files directory -RUN mkdir -p /static-files - -# Expose ports -EXPOSE 3000 80 - -# Start both nginx and node -CMD ["sh", "-c", "nginx && node server.js"] +# Start the Node.js application +CMD ["node", "server.js"] diff --git a/resource-provider/nginx.conf b/static-provider/nginx.conf similarity index 100% rename from resource-provider/nginx.conf rename to static-provider/nginx.conf