Skip to content

Commit

Permalink
Typo fixes. Move to uselagoon for images. A few linting issues.
Browse files Browse the repository at this point in the history
  • Loading branch information
seanhamlin committed Jun 20, 2024
1 parent 207d224 commit fe20040
Show file tree
Hide file tree
Showing 15 changed files with 22 additions and 21 deletions.
3 changes: 2 additions & 1 deletion src/Commands/SailonlagoonCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ class SailonlagoonCommand extends Command

/**
* Execute the console command.
*
* @throws \Exception
*/
public function handle()
{
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/Commands/sailonLagoonAssets/.lagoon.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/Commands/sailonLagoonAssets/Lagoon/nginx-laravel.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion src/Commands/sailonLagoonAssets/Lagoon/nginx.dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG CLI_IMAGE
FROM ${CLI_IMAGE} as cli
FROM amazeeio/nginx
FROM uselagoon/nginx

#######################################################
# Customize Nginx to Laravel Land
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/Commands/sailonLagoonAssets/envstubs/cli.stub
Original file line number Diff line number Diff line change
@@ -1 +1 @@

# No environment vars
2 changes: 1 addition & 1 deletion src/Commands/sailonLagoonAssets/envstubs/php.stub
Original file line number Diff line number Diff line change
@@ -1 +1 @@
# No Env Vars
# No environment vars
2 changes: 1 addition & 1 deletion src/Commands/sailonLagoonAssets/stubs/README.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/Commands/sailonLagoonAssets/stubs/mariadb.stub
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
mariadb:
image: amazeeio/mariadb
image: uselagoon/mariadb
labels:
lagoon.type: mariadb
environment:
Expand Down
2 changes: 1 addition & 1 deletion src/Commands/sailonLagoonAssets/stubs/mysql.stub
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
mariadb:
image: amazeeio/mariadb
image: uselagoon/mariadb
labels:
lagoon.type: mariadb
environment:
Expand Down
2 changes: 1 addition & 1 deletion src/Commands/sailonLagoonAssets/stubs/redis.stub
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
build:
context: .
dockerfile: lagoon/redis.dockerfile
image: amazeeio/redis-persistent
image: uselagoon/redis-persistent
labels:
lagoon.type: redis-persistent
2 changes: 1 addition & 1 deletion tests/Unit/assets/stubs/mariadb.stub
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
mariadb:
image: amazeeio/mariadb
image: uselagoon/mariadb
labels:
lagoon.type: mariadb
environment:
Expand Down
2 changes: 1 addition & 1 deletion tests/Unit/assets/stubs/mysql.stub
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
mariadb:
image: amazeeio/mariadb
image: uselagoon/mariadb
labels:
lagoon.type: mariadb
environment:
Expand Down

0 comments on commit fe20040

Please sign in to comment.