diff --git a/src/Commands/SailonlagoonCommand.php b/src/Commands/SailonlagoonCommand.php index 0e3f3d7..d62a774 100644 --- a/src/Commands/SailonlagoonCommand.php +++ b/src/Commands/SailonlagoonCommand.php @@ -60,6 +60,8 @@ class SailonlagoonCommand extends Command /** * Execute the console command. + * + * @throws \Exception */ public function handle() { @@ -212,7 +214,6 @@ public function loadExisting($baseDir) { * @param Collection $services * @param string $stubsRootPath * @param string $yamlFile - * @param mixed $dockerComposeFile * @return array */ public function generateDockerCompose(Collection $services, string $stubsRootPath, string $yamlFile): mixed diff --git a/src/Commands/sailonLagoonAssets/.lagoon.yml b/src/Commands/sailonLagoonAssets/.lagoon.yml index 26c67e2..d0c99f2 100644 --- a/src/Commands/sailonLagoonAssets/.lagoon.yml +++ b/src/Commands/sailonLagoonAssets/.lagoon.yml @@ -6,7 +6,7 @@ project: %projectName% tasks: post-rollout: - run: - name: Prepare Storage + name: Prepare storage command: mkdir -p /app/storage/framework/sessions /app/storage/framework/views /app/storage/framework/cache /app/storage/framework/cache/data service: cli shell: bash @@ -16,7 +16,7 @@ tasks: service: cli shell: bash - run: - name: Clear Caches + name: Clear caches command: php artisan -n cache:clear && php artisan -n route:clear && php artisan -n view:cache service: cli shell: bash diff --git a/src/Commands/sailonLagoonAssets/Lagoon/01-entry-point-setup-laravel.sh b/src/Commands/sailonLagoonAssets/Lagoon/01-entry-point-setup-laravel.sh index 4c5f7b3..9ec950e 100644 --- a/src/Commands/sailonLagoonAssets/Lagoon/01-entry-point-setup-laravel.sh +++ b/src/Commands/sailonLagoonAssets/Lagoon/01-entry-point-setup-laravel.sh @@ -3,7 +3,7 @@ # Loading environment variables from .env and friends source /lagoon/entrypoints/50-dotenv.sh -# Generate some additional enviornment variables +# Generate some additional environment variables source /lagoon/entrypoints/55-generate-env.sh if [ -z "$APP_URL" ]; then @@ -32,8 +32,8 @@ if [ "$APP_ENV" == "local" ]; then fi fi -if [ -z $APP_ENVA ]; then - echo "Settng empty APP_ENV to $LAGOON_ENVIRONMENT" +if [ -z "$APP_ENVA" ]; then + echo "Setting empty APP_ENV to $LAGOON_ENVIRONMENT" export APP_ENV=$LAGOON_ENVIRONMENT if [ -f "/app/.env" ]; then @@ -94,7 +94,7 @@ fi if [ -f "artisan" ] && [ -z "$APP_KEY" ]; then APP_KEY=`php artisan key:generate --show --no-ansi` - echo "Settng APP_KEY to $APP_KEY" + echo "Setting APP_KEY to $APP_KEY" export APP_KEY=$APP_KEY if [ -f "/app/.env" ]; then diff --git a/src/Commands/sailonLagoonAssets/Lagoon/nginx-laravel.conf b/src/Commands/sailonLagoonAssets/Lagoon/nginx-laravel.conf index 0caf85f..98397fc 100644 --- a/src/Commands/sailonLagoonAssets/Lagoon/nginx-laravel.conf +++ b/src/Commands/sailonLagoonAssets/Lagoon/nginx-laravel.conf @@ -14,7 +14,7 @@ server { try_files /dev/null @php; } - ## Direct Access to .php files is not alled and is sent to laravel instead + ## Direct Access to .php files is not allowed and is sent to laravel instead location ~* ^.+\.php$ { try_files /dev/null @php; } diff --git a/src/Commands/sailonLagoonAssets/Lagoon/nginx.dockerfile b/src/Commands/sailonLagoonAssets/Lagoon/nginx.dockerfile index d17e163..8112cca 100644 --- a/src/Commands/sailonLagoonAssets/Lagoon/nginx.dockerfile +++ b/src/Commands/sailonLagoonAssets/Lagoon/nginx.dockerfile @@ -1,6 +1,6 @@ ARG CLI_IMAGE FROM ${CLI_IMAGE} as cli -FROM amazeeio/nginx +FROM uselagoon/nginx ####################################################### # Customize Nginx to Laravel Land diff --git a/src/Commands/sailonLagoonAssets/Lagoon/tasks/post-rollout-non-prod b/src/Commands/sailonLagoonAssets/Lagoon/tasks/post-rollout-non-prod index 716de31..df99592 100644 --- a/src/Commands/sailonLagoonAssets/Lagoon/tasks/post-rollout-non-prod +++ b/src/Commands/sailonLagoonAssets/Lagoon/tasks/post-rollout-non-prod @@ -8,11 +8,11 @@ cd /app # Loading environment variables from .env and friends source /lagoon/entrypoints/50-dotenv.sh -# Generate some additional enviornment variables +# Generate some additional environment variables source /lagoon/entrypoints/55-generate-env.sh -# NB: See /app/lagoon/entry-point-setup-laravel.sh for more insight into -# container startup scripts that cache views, run migrations, load the db +# NB: See /app/lagoon/entry-point-setup-laravel.sh for more insight into +# container startup scripts that cache views, run migrations, load the db # if it is blank, etc, etc ### Additional Post Rollout diff --git a/src/Commands/sailonLagoonAssets/Lagoon/tasks/post-rollout-prod b/src/Commands/sailonLagoonAssets/Lagoon/tasks/post-rollout-prod index db3ecc1..f8d0174 100644 --- a/src/Commands/sailonLagoonAssets/Lagoon/tasks/post-rollout-prod +++ b/src/Commands/sailonLagoonAssets/Lagoon/tasks/post-rollout-prod @@ -8,7 +8,7 @@ cd /app # Loading environment variables from .env and friends source /lagoon/entrypoints/50-dotenv.sh -# Generate some additional enviornment variables +# Generate some additional environment variables source /lagoon/entrypoints/55-generate-env.sh # Run production migrations automatically in prod diff --git a/src/Commands/sailonLagoonAssets/envstubs/cli.stub b/src/Commands/sailonLagoonAssets/envstubs/cli.stub index 8b13789..aa04cbd 100644 --- a/src/Commands/sailonLagoonAssets/envstubs/cli.stub +++ b/src/Commands/sailonLagoonAssets/envstubs/cli.stub @@ -1 +1 @@ - +# No environment vars diff --git a/src/Commands/sailonLagoonAssets/envstubs/php.stub b/src/Commands/sailonLagoonAssets/envstubs/php.stub index 581afc1..aa04cbd 100644 --- a/src/Commands/sailonLagoonAssets/envstubs/php.stub +++ b/src/Commands/sailonLagoonAssets/envstubs/php.stub @@ -1 +1 @@ -# No Env Vars +# No environment vars diff --git a/src/Commands/sailonLagoonAssets/stubs/README.md b/src/Commands/sailonLagoonAssets/stubs/README.md index e7d8315..4a4a655 100644 --- a/src/Commands/sailonLagoonAssets/stubs/README.md +++ b/src/Commands/sailonLagoonAssets/stubs/README.md @@ -1,4 +1,4 @@ -# Sailon Lagoon Stubs +# SailonLagoon Stubs Essentially inspired by (stolen from?) Sail's implementation, this directory contains a number of stubs used to generate the Lagoon specific docker-compose file. diff --git a/src/Commands/sailonLagoonAssets/stubs/mariadb.stub b/src/Commands/sailonLagoonAssets/stubs/mariadb.stub index c4afacf..b5edd59 100644 --- a/src/Commands/sailonLagoonAssets/stubs/mariadb.stub +++ b/src/Commands/sailonLagoonAssets/stubs/mariadb.stub @@ -1,5 +1,5 @@ mariadb: - image: amazeeio/mariadb + image: uselagoon/mariadb labels: lagoon.type: mariadb environment: diff --git a/src/Commands/sailonLagoonAssets/stubs/mysql.stub b/src/Commands/sailonLagoonAssets/stubs/mysql.stub index c4afacf..b5edd59 100644 --- a/src/Commands/sailonLagoonAssets/stubs/mysql.stub +++ b/src/Commands/sailonLagoonAssets/stubs/mysql.stub @@ -1,5 +1,5 @@ mariadb: - image: amazeeio/mariadb + image: uselagoon/mariadb labels: lagoon.type: mariadb environment: diff --git a/src/Commands/sailonLagoonAssets/stubs/redis.stub b/src/Commands/sailonLagoonAssets/stubs/redis.stub index fce391b..8796efb 100644 --- a/src/Commands/sailonLagoonAssets/stubs/redis.stub +++ b/src/Commands/sailonLagoonAssets/stubs/redis.stub @@ -2,6 +2,6 @@ build: context: . dockerfile: lagoon/redis.dockerfile - image: amazeeio/redis-persistent + image: uselagoon/redis-persistent labels: lagoon.type: redis-persistent diff --git a/tests/Unit/assets/stubs/mariadb.stub b/tests/Unit/assets/stubs/mariadb.stub index c4afacf..b5edd59 100644 --- a/tests/Unit/assets/stubs/mariadb.stub +++ b/tests/Unit/assets/stubs/mariadb.stub @@ -1,5 +1,5 @@ mariadb: - image: amazeeio/mariadb + image: uselagoon/mariadb labels: lagoon.type: mariadb environment: diff --git a/tests/Unit/assets/stubs/mysql.stub b/tests/Unit/assets/stubs/mysql.stub index c4afacf..b5edd59 100644 --- a/tests/Unit/assets/stubs/mysql.stub +++ b/tests/Unit/assets/stubs/mysql.stub @@ -1,5 +1,5 @@ mariadb: - image: amazeeio/mariadb + image: uselagoon/mariadb labels: lagoon.type: mariadb environment: