From 39ccf02b3cf945c37c87d8127b47ae8984ac2f84 Mon Sep 17 00:00:00 2001 From: oskarb Date: Sun, 31 Aug 2025 08:37:59 +0200 Subject: [PATCH] oskarb-patch-3 (#3) Reviewed-on: https://git.oskarmikael.com/oskarb/Scheduler/pulls/3 --- Dockerfile.prod | 19 ++++++++++++++++++- docker-compose.prod.yml | 7 +------ 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/Dockerfile.prod b/Dockerfile.prod index e295b3f..bc397f5 100644 --- a/Dockerfile.prod +++ b/Dockerfile.prod @@ -62,4 +62,21 @@ COPY --from=frontend /app/public ./public # Fix permissions for Laravel RUN chown -R www-data:www-data storage bootstrap/cache -CMD ["php-fpm"] +# ---------------------------- +# Stage 4: Nginx with built assets +# ---------------------------- +FROM nginx:1.27-alpine AS final-nginx + +WORKDIR /var/www/html + +# Copy built public folder from final PHP image +COPY --from=final-php /var/www/html/public ./public + +# Copy nginx config +COPY ./docker/nginx/nginx.conf /etc/nginx/conf.d/default.conf + +# Expose HTTP port +EXPOSE 80 + +# Start Nginx +CMD ["nginx", "-g", "daemon off;"] diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 7fd15d8..6333508 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -9,12 +9,7 @@ services: - laravel nginx: - image: nginx:1.27 - volumes: - - ./docker/nginx/nginx.conf:/etc/nginx/conf.d/default.conf:ro - - storage:/var/www/html/storage:ro - - bootstrap_cache:/var/www/html/bootstrap/cache:ro - - ./public:/var/www/html/public:ro + image: git.oskarmikael.com/oskarb/scheduler:latest ports: - '${APP_PORT:-80}:80' depends_on: