Merge remote-tracking branch 'origin/main'

Author: bram-pkg

README.md

@@ -6,10 +6,32 @@
 composer require --dev blamebutton/laravel-docker-builder
 ```
 
+## Configuration
+
+Two environment variables need to be set:
+
+* `DOCKER_NGINX_TAG`
+* `DOCKER_PHP_TAG`
+
+This can be done either by adding them to your `.env` file or passing them to the build command.
+
+### Option 1: `.env`
+
+```
+DOCKER_NGINX_TAG=laravel-app:nginx
+DOCKER_PHP_TAG=laravel-app:php
+```
+
+### Option 2: CLI
+
+```shell
+DOCKER_NGINX_TAG=laravel-app:nginx DOCKER_PHP_TAG=laravel-app:php vendor/bin/docker-build
+```
+
 ## Usage
 
-Add `DOCKER_IMAGE_TAG` to your `.env` and run:
+Set the `DOCKER_NGINX_TAG` and `DOCKER_PHP_TAG` environment variables and run:
 
 ```shell
-vendor/bin/docker/build
-```
+vendor/bin/docker-build
+```

docker/php.Dockerfile

@@ -5,7 +5,7 @@ WORKDIR /app
 COPY --from=mlocati/php-extension-installer /usr/bin/install-php-extensions /usr/local/bin/
 RUN install-php-extensions @composer
 ## Install dependencies
-COPY / /app
+COPY / /app/
 RUN composer install --optimize-autoloader --no-dev
 
 # Vite.js build
@@ -28,7 +28,7 @@ RUN install-php-extensions bcmath pdo_pgsql redis
 
 WORKDIR /app
 
-COPY / /app
+COPY / /app/
 COPY --from=node /app/public/build/ /app/public/build/
 COPY --from=composer /app/vendor/ /app/vendor/
 
@@ -37,4 +37,4 @@ RUN chown --recursive www-data:www-data /app/storage
 RUN echo "php artisan optimize --no-ansi && php-fpm" >> /usr/bin/entrypoint.sh && \
     chmod +x /usr/bin/entrypoint.sh
 
-CMD ["/usr/bin/entrypoint.sh"]
+CMD ["/usr/bin/entrypoint.sh"]