Fix tests

Author: bram-pkg

README.md

@@ -50,6 +50,7 @@ See all available options, and their supported values, by running `php artisan d
 * `-p, --php-version` - PHP version for Docker image
 * `-e, --php-extensions` - PHP extensions (comma-separated) to include in Docker image
 * `-o, --optimize` - Run `php artisan optimize` on container start
+* `-a, --optimize` - Run `php artisan optimize` on container start
 * `-m, --node-package-manager` - Install Node dependencies using NPM or Yarn
 * `-b, --node-build-tool` - Run Vite.js or Laravel Mix build step
 

docker/nginx.Dockerfile

@@ -1,7 +1,7 @@
 {# import node partial, exposed as "node" layer #}
-{% include 'partials/node.dockerfile.twig' %}
+{% include 'partials/node-build-assets.dockerfile.twig' %}
 
-FROM nginx:1-alpine
+FROM nginx:1{{ alpine ? '-alpine' : '' }}
 
 WORKDIR /app/public
 

docker/php.Dockerfile

@@ -1,6 +1,6 @@
 {% if node_package_manager %}
 # built frontend assets with {{ node_package_manager }} and {{ node_build_tool }}
-FROM node:lts-alpine AS node
+FROM node:lts{{ alpine ? '-alpine' : '' }} AS node
 WORKDIR /app
 
 {# install node dependencies #}

docker/template/nginx.dockerfile.twig

@@ -1,5 +1,5 @@
 # Composer installation
-FROM php:{{ php_version }}-fpm-alpine AS composer
+FROM php:{{ php_version }}-fpm{{ alpine ? '-alpine' : '' }} AS composer
 WORKDIR /app
 
 ## install composer dependencies
@@ -9,10 +9,10 @@ COPY / /app
 RUN composer install --optimize-autoloader --no-dev
 
 {# import node partial, exposed as "node" layer #}
-{% include 'partials/node.dockerfile.twig' %}
+{% include 'partials/node-build-assets.dockerfile.twig' %}
 
 # build php-fpm image
-FROM php:{{ php_version }}-fpm-alpine
+FROM php:{{ php_version }}-fpm{{ alpine ? '-alpine' : '' }}
 WORKDIR /app
 
 # install required extensions

docker/template/partials/node.dockerfile.twig renamed to docker/template/partials/node-build-assets.dockerfile.twig

@@ -2,6 +2,7 @@
 
 namespace BlameButton\LaravelDockerBuilder\Commands;
 
+use BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\AlpineQuestion;
 use BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\ArtisanOptimizeQuestion;
 use BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\Choices\NodeBuildTool;
 use BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\Choices\NodePackageManager;
@@ -31,6 +32,7 @@ public function handle(): int
                 phpVersion: $phpVersion = app(PhpVersionQuestion::class)->getAnswer($this),
                 phpExtensions: app(PhpExtensionsQuestion::class)->getAnswer($this, $phpVersion),
                 artisanOptimize: app(ArtisanOptimizeQuestion::class)->getAnswer($this),
+                alpine: app(AlpineQuestion::class)->getAnswer($this),
                 nodePackageManager: $nodePackageManager = app(NodePackageManagerQuestion::class)->getAnswer($this),
                 nodeBuildTool: $nodePackageManager ? app(NodeBuildToolQuestion::class)->getAnswer($this) : false,
             );
@@ -72,6 +74,9 @@ public function printConfigurationTable(Configuration $config): void
             ['Artisan Optimize',
                 '<comment>'.json_encode($config->isArtisanOptimize()).'</comment>',
             ],
+            ['Alpine images',
+                '<comment>'.json_encode($config->isAlpine()).'</comment>',
+            ],
             ['Node Package Manager',
                 NodePackageManager::name($config->getNodePackageManager()),
             ],
@@ -95,6 +100,7 @@ private function saveDockerfiles(Configuration $config): void
             'php_version' => $config->getPhpVersion(),
             'php_extensions' => implode(' ', $config->getPhpExtensions()),
             'artisan_optimize' => $config->isArtisanOptimize(),
+            'alpine' => $config->isAlpine(),
             'node_package_manager' => $config->getNodePackageManager(),
             'node_build_tool' => $config->getNodeBuildTool(),
         ];
@@ -144,14 +150,15 @@ protected function getOptions(): array
                 mode: InputOption::VALUE_NEGATABLE,
                 description: 'Add "php artisan optimize" to entrypoint',
             ),
-            new InputOption(
+            new InputOption( // TODO: implement opcache extension
                 name: 'opcache',
                 mode: InputOption::VALUE_NEGATABLE,
                 description: 'Add "opcache" extension and configure it',
                 default: true,
             ),
             new InputOption(
                 name: 'alpine',
+                shortcut: 'a',
                 mode: InputOption::VALUE_NEGATABLE,
                 description: 'Use Alpine Linux based images',
                 default: true,

docker/template/php.dockerfile.twig

@@ -0,0 +1,24 @@
+<?php
+
+namespace BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions;
+
+use BlameButton\LaravelDockerBuilder\Commands\BaseCommand;
+
+class AlpineQuestion extends BaseQuestion
+{
+    public function getAnswer(BaseCommand $command): bool
+    {
+        if ($command->option('alpine') === false) {
+            return false;
+        }
+
+        if ($command->option('alpine') || $command->option('detect')) {
+            return true;
+        }
+
+        return $command->confirm(
+            question: 'Do you want to use "Alpine Linux" based images?',
+            default: true
+        );
+    }
+}

src/Commands/DockerGenerateCommand.php

@@ -3,7 +3,6 @@
 namespace BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions;
 
 use BlameButton\LaravelDockerBuilder\Commands\BaseCommand;
-use BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\Choices\ArtisanOptimize;
 
 class ArtisanOptimizeQuestion extends BaseQuestion
 {
@@ -13,12 +12,9 @@ public function getAnswer(BaseCommand $command): bool
             return true;
         }
 
-        $choice = $command->choice(
+        return $command->confirm(
             question: 'Do you want to run "php artisan optimize" when the image boots?',
-            choices: ArtisanOptimize::values(),
-            default: ArtisanOptimize::YES,
+            default: true,
         );
-
-        return ArtisanOptimize::YES === $choice;
     }
 }