Merge branch 'v2.x' of https://github.com/leafsphp/cli into v2.x

Author: mychidarko

src/CreateCommand.php

@@ -181,7 +181,13 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
         if ($process->isSuccessful()) {
             if ($this->getAppDockPreset($input, $output)) {
-                FS::superCopy(__DIR__ . '/themes/docker', $directory);
+                $dockerThemeFolder = __DIR__ . '/themes/docker';
+
+                if ($preset === 'mvc' || $preset === 'api') {
+                    $dockerThemeFolder = __DIR__ . '/themes/mvc/docker';
+                }
+                
+                FS::superCopy($dockerThemeFolder, $directory);
                 $output->write("\n🚀  Docker environment scaffolded successfully");
             }
 

src/themes/docker/docker/000-default.conf

@@ -3,7 +3,7 @@
     DocumentRoot /var/www
 
     <Directory /var/www>
-        Options Indexes FollowSymLinks
+        Options FollowSymLinks
         AllowOverride All
         Require all granted
     </Directory>

src/themes/mvc/docker/docker-compose.yml

@@ -0,0 +1,9 @@
+version: '3.1'
+services:
+  application:
+    build: ./docker
+    image: leafphp/docker
+    ports:
+      - '8080:80'
+    volumes:
+      - .:/var/www

src/themes/mvc/docker/docker/000-default.conf

@@ -0,0 +1,11 @@
+<VirtualHost *:80>
+    ServerAdmin webmaster@localhost
+    ServerName localhost
+    DocumentRoot /var/www/public
+
+    <Directory /var/www/public>
+        Options FollowSymLinks
+        AllowOverride All
+        Require all granted
+    </Directory>
+</VirtualHost>

src/themes/mvc/docker/docker/Dockerfile

@@ -0,0 +1,32 @@
+FROM php:8.1-apache
+
+COPY 000-default.conf /etc/apache2/sites-available/000-default.conf
+
+RUN a2enmod rewrite
+
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    libzip-dev \
+    wget \
+    git \
+    unzip
+
+RUN docker-php-ext-install zip pdo pdo_mysql
+
+RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+
+RUN composer global require leafs/cli
+
+RUN ln -s /root/.composer/vendor/bin/leaf /usr/local/bin/leaf
+
+COPY ./php.ini /usr/local/etc/php/php.ini
+
+RUN apt-get purge -y g++ \
+    && apt-get autoremove -y \
+    && rm -rf /var/lib/apt/lists/* \
+    && rm -rf /tmp/*
+
+WORKDIR /var/www
+
+RUN chown -R www-data:www-data /var/www
+
+CMD ["apache2-foreground"]

src/themes/mvc/docker/docker/php.ini

@@ -0,0 +1,3 @@
+; General
+upload_max_filesize = 200M
+post_max_size = 220M