Merge DockerFiles

Author: kduma

.dockerignore

@@ -20,6 +20,23 @@ bootstrap/cache/*
 public/hot/*
 public/storage/*
 storage/*.key
+storage/app/*
+!storage/app/public
+storage/app/public/*
+storage/logs/*
+storage/framework/compiled.php
+storage/framework/config.php
+storage/framework/down
+storage/framework/events.scanned.php
+storage/framework/maintenance.php
+storage/framework/routes.php
+storage/framework/routes.scanned.php
+storage/framework/schedule-*
+storage/framework/services.json
+storage/framework/cache/*
+storage/framework/sessions/*
+storage/framework/testing/*
+storage/framework/views/*
 .env.backup
 .env.production
 Homestead.json

.github/workflows/docker-publish.yml

@@ -28,11 +28,14 @@ jobs:
   build-and-push-image:
     strategy:
       fail-fast: false
+      max-parallel: 1
       matrix:
         include:
-          - dockerfile: ./ngnix.Dockerfile
+          - dockerfile: ./Dockerfile
+            target: nginx
             image: ghcr.io/kduma-oss/webprint-server/nginx
-          - dockerfile: ./php.Dockerfile
+          - dockerfile: ./Dockerfile
+            target: fpm
             image: ghcr.io/kduma-oss/webprint-server/fpm
 
     runs-on: ubuntu-latest
@@ -88,6 +91,7 @@ jobs:
         with:
           context: ${{ matrix.context }}
           file: ${{ matrix.dockerfile }}
+          target: ${{ matrix.target }}
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

php.Dockerfile Dockerfilephp.Dockerfile renamed to Dockerfile

@@ -1,33 +1,49 @@
+FROM php:8.1-cli-alpine AS composer_stage
+
+WORKDIR /var/www/html
+
+COPY --from=composer /usr/bin/composer /usr/bin/composer
+
+COPY composer.json composer.lock ./
+RUN composer install --ignore-platform-reqs --prefer-dist --no-scripts --no-progress --no-interaction --no-dev --no-autoloader
+
+COPY . ./
+RUN composer dump-autoload --optimize --apcu --no-dev
+RUN php artisan view:cache
+
+
 FROM node:19-alpine AS vite_stage
 
 WORKDIR /var/www/html
 
 COPY package.json package-lock.json ./
 RUN npm ci
 
+COPY --from=composer_stage /var/www/html/vendor /var/www/html/vendor
+COPY --from=composer_stage /var/www/html/storage/framework/views/ /var/www/html/storage/framework/views/
 COPY postcss.config.js tailwind.config.js vite.config.js ./
 COPY resources ./resources
 RUN npm run build
 
 
 
 
-
-FROM php:8.1-cli-alpine AS composer_stage
+FROM nginx:alpine AS ngnix
 
 WORKDIR /var/www/html
 
-COPY --from=composer /usr/bin/composer /usr/bin/composer
+COPY docker/nginx/default.conf /etc/nginx/conf.d
+
+COPY --from=vite_stage /var/www/html/public/build /var/www/html/public/build
+
+COPY ./ /var/www/html/
+
 
-COPY composer.json composer.lock ./
-RUN composer install --ignore-platform-reqs --prefer-dist --no-scripts --no-progress --no-interaction --no-dev --no-autoloader
 
-COPY . ./
-RUN composer dump-autoload --optimize --apcu --no-dev
 
 
 
-FROM php:8.1-fpm-alpine
+FROM php:8.1-fpm-alpine AS fpm
 
 WORKDIR /var/www/html
 

docker-compose-prod.yml

@@ -3,7 +3,8 @@ services:
   nginx:
     build:
       context: .
-      dockerfile: ngnix.Dockerfile
+      dockerfile: Dockerfile
+      target: ngnix
     image: ghcr.io/kduma-oss/webprint-server/nginx
     restart: always
     ports:
@@ -16,7 +17,8 @@ services:
   php:
     build:
       context: .
-      dockerfile: php.Dockerfile
+      dockerfile: Dockerfile
+      target: fpm
     image: ghcr.io/kduma-oss/webprint-server/fpm
     restart: always
     networks:
@@ -31,6 +33,8 @@ services:
       - DB_USERNAME=webprint_server
       - DB_PASSWORD=${DB_PASSWORD}
 
+      - APP_DEBUG=true
+      - LOG_LEVEL=errorlog
       - APP_KEY=${APP_KEY}
 
   db: