Skip to content

Commit e065254

Browse files
committed
WIP docker:ci command
1 parent 9f9ed3a commit e065254

20 files changed

+71
-62
lines changed

.github/workflows/phpunit.yml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,22 @@ jobs:
1515
runs-on: ubuntu-latest
1616

1717
steps:
18-
- uses: actions/checkout@v3
18+
- uses: actions/checkout@v3
1919

20-
- name: Validate composer.json and composer.lock
21-
run: composer validate --strict
20+
- name: Validate composer.json and composer.lock
21+
run: composer validate --strict
2222

23-
- name: Cache Composer packages
24-
id: composer-cache
25-
uses: actions/cache@v3
26-
with:
27-
path: vendor
28-
key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
29-
restore-keys: |
30-
${{ runner.os }}-php-
23+
- name: Cache Composer packages
24+
id: composer-cache
25+
uses: actions/cache@v3
26+
with:
27+
path: vendor
28+
key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
29+
restore-keys: |
30+
${{ runner.os }}-php-
3131
32-
- name: Install dependencies
33-
run: composer install --prefer-dist --no-progress
32+
- name: Install dependencies
33+
run: composer install --prefer-dist --no-progress
3434

35-
- name: Run test suite
36-
run: vendor/bin/phpunit
35+
- name: Run test suite
36+
run: vendor/bin/phpunit

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ When `--detect` is passed to the `docker:generate` command, it will automaticall
2929

3030
* PHP version, detected using the `php` version in your `composer.json`
3131
* PHP extensions, detected using the configuration of your project:
32-
* Cache driver: Redis, Memcached, APC
33-
* Database driver: MySQL, Postgres, SQL Server
34-
* Broadcasting driver: Redis
35-
* Queue driver: Redis
36-
* Session driver: Redis, Memcached, APC
32+
* Cache driver: Redis, Memcached, APC
33+
* Database driver: MySQL, Postgres, SQL Server
34+
* Broadcasting driver: Redis
35+
* Queue driver: Redis
36+
* Session driver: Redis, Memcached, APC
3737
* Node package manager, detected using the existence of `package-lock.json` or `yarn.lock`
3838
* Node build tool, detected using the existence of `vite.config.js` or `webpack.mix.js`
3939

composer.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,13 @@
33
"description": "Production ready Docker files for Laravel",
44
"license": "MIT",
55
"type": "library",
6-
"keywords": ["laravel", "docker", "image","generate", "kubernetes"],
6+
"keywords": [
7+
"laravel",
8+
"docker",
9+
"image",
10+
"generate",
11+
"kubernetes"
12+
],
713
"authors": [
814
{
915
"name": "Bram Ceulemans",

src/Commands/DockerCiCommand.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@ class DockerCiCommand extends BaseCommand
1515
public function handle(): int
1616
{
1717
if ($argument = $this->argument('ci-platform')) {
18-
if (!in_array($argument, CiPlatform::values())) {
18+
if (! in_array($argument, CiPlatform::values())) {
1919
$this->error("Invalid value [$argument] for argument [ci-platform].");
20+
2021
return self::FAILURE;
2122
}
2223

tests/Feature/Commands/DockerGenerateCommandTest.php

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,19 @@
1313
* @uses \BlameButton\LaravelDockerBuilder\Detectors\PhpExtensionsDetector
1414
* @uses \BlameButton\LaravelDockerBuilder\Detectors\NodePackageManagerDetector
1515
* @uses \BlameButton\LaravelDockerBuilder\Detectors\NodeBuildToolDetector
16+
* @uses \BlameButton\LaravelDockerBuilder\Commands\BaseCommand::optionalChoice
17+
* @uses \BlameButton\LaravelDockerBuilder\Commands\DockerCiCommand::getArguments()
18+
* @uses \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\Choices\PhpVersion
19+
* @uses \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\PhpVersionQuestion
20+
* @uses \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\Choices\PhpExtensions
21+
* @uses \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\PhpExtensionsQuestion
22+
* @uses \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\ArtisanOptimizeQuestion
23+
* @uses \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\AlpineQuestion
24+
* @uses \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\Choices\NodePackageManager
25+
* @uses \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\NodePackageManagerQuestion
26+
* @uses \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\Choices\NodeBuildTool
27+
* @uses \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\NodeBuildToolQuestion
1628
* @uses package_path()
17-
* @uses \BlameButton\LaravelDockerBuilder\Commands\BaseCommand::optionalChoice
18-
* @uses \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\Choices\PhpVersion
19-
* @uses \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\PhpVersionQuestion
20-
* @uses \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\Choices\PhpExtensions
21-
* @uses \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\PhpExtensionsQuestion
22-
* @uses \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\ArtisanOptimizeQuestion
23-
* @uses \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\AlpineQuestion
24-
* @uses \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\Choices\NodePackageManager
25-
* @uses \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\NodePackageManagerQuestion
26-
* @uses \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\Choices\NodeBuildTool
27-
* @uses \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\NodeBuildToolQuestion
2829
*
2930
* @covers \BlameButton\LaravelDockerBuilder\Objects\Configuration
3031
* @covers \BlameButton\LaravelDockerBuilder\Commands\DockerGenerateCommand
@@ -117,19 +118,19 @@ public function provideInvalidOptions(): array
117118
{
118119
return [
119120
'php version' => [
120-
'Invalid value [unsupported] for option [php-version]',
121+
'Invalid value [unsupported] for option [php-version].',
121122
'docker:generate -n -p unsupported -e bcmath -o -a -m npm -b vite',
122123
],
123124
'php extensions' => [
124125
'Extension [unsupported] is not supported.',
125126
'docker:generate -n -p 8.2 -e bcmath,unsupported -o -a -m npm -b vite',
126127
],
127128
'node package manager' => [
128-
'Invalid value [unsupported] for option [node-package-manager]',
129+
'Invalid value [unsupported] for option [node-package-manager].',
129130
'docker:generate -n -p 8.2 -e bcmath -o -a -m unsupported -b vite',
130131
],
131132
'node build tool' => [
132-
'Invalid value [unsupported] for option [node-build-tool]',
133+
'Invalid value [unsupported] for option [node-build-tool].',
133134
'docker:generate -n -p 8.2 -e bcmath -o -a -m npm -b unsupported',
134135
],
135136
];

tests/Unit/Commands/BaseDockerCommandTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
use Symfony\Component\Process\Process;
99

1010
/**
11-
* @uses \BlameButton\LaravelDockerBuilder\DockerServiceProvider
11+
* @uses \BlameButton\LaravelDockerBuilder\DockerServiceProvider
1212
*
1313
* @covers \BlameButton\LaravelDockerBuilder\Commands\BaseDockerCommand
1414
*/

tests/Unit/Commands/DockerBuildCommandTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
use Symfony\Component\Process\Process;
88

99
/**
10-
* @uses \BlameButton\LaravelDockerBuilder\DockerServiceProvider
11-
* @uses package_path()
10+
* @uses \BlameButton\LaravelDockerBuilder\DockerServiceProvider
11+
* @uses package_path()
1212
*
1313
* @covers \BlameButton\LaravelDockerBuilder\Commands\DockerBuildCommand
1414
*/

tests/Unit/Commands/DockerPushCommandTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
use Symfony\Component\Process\Process;
88

99
/**
10-
* @uses \BlameButton\LaravelDockerBuilder\DockerServiceProvider
11-
* @uses package_path()
10+
* @uses \BlameButton\LaravelDockerBuilder\DockerServiceProvider
11+
* @uses package_path()
1212
*
1313
* @covers \BlameButton\LaravelDockerBuilder\Commands\DockerPushCommand
1414
*/

tests/Unit/Commands/GenerateQuestions/AlpineQuestionTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
use BlameButton\LaravelDockerBuilder\Tests\TestCase;
88

99
/**
10-
* @uses \BlameButton\LaravelDockerBuilder\DockerServiceProvider
10+
* @uses \BlameButton\LaravelDockerBuilder\DockerServiceProvider
1111
*
1212
* @covers \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\AlpineQuestion
1313
*/

tests/Unit/Commands/GenerateQuestions/ArtisanOptimizeQuestionTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
use BlameButton\LaravelDockerBuilder\Tests\TestCase;
88

99
/**
10-
* @uses \BlameButton\LaravelDockerBuilder\DockerServiceProvider
10+
* @uses \BlameButton\LaravelDockerBuilder\DockerServiceProvider
1111
*
1212
* @covers \BlameButton\LaravelDockerBuilder\Commands\GenerateQuestions\ArtisanOptimizeQuestion
1313
*/

0 commit comments

Comments
 (0)