From 188bb0a868d837973cec9074ce3c891a5a0276a1 Mon Sep 17 00:00:00 2001 From: Refactorian Date: Wed, 3 Jan 2024 00:40:32 +0900 Subject: [PATCH] Update (#14) --- .docker/phpmyadmin/.gitignore | 2 ++ .env.example | 6 +++--- README.md | 12 +++++++++++- composer.json | 1 + docker-compose.yml | 22 +++++++++++++++++++--- 5 files changed, 36 insertions(+), 7 deletions(-) create mode 100644 .docker/phpmyadmin/.gitignore diff --git a/.docker/phpmyadmin/.gitignore b/.docker/phpmyadmin/.gitignore new file mode 100644 index 0000000..d6b7ef3 --- /dev/null +++ b/.docker/phpmyadmin/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore diff --git a/.env.example b/.env.example index 01aed6c..35e6624 100644 --- a/.env.example +++ b/.env.example @@ -11,9 +11,9 @@ LOG_LEVEL=debug DB_CONNECTION=mysql DB_HOST=db DB_PORT=3306 -DB_DATABASE=laravel_db_name -DB_USERNAME=laravel_db_user -DB_PASSWORD=laravel_db_pass +DB_DATABASE=refactorian +DB_USERNAME=refactorian +DB_PASSWORD=refactorian BROADCAST_DRIVER=log CACHE_DRIVER=file diff --git a/README.md b/README.md index f6d8541..590fe90 100644 --- a/README.md +++ b/README.md @@ -2,9 +2,10 @@ # Laravel Docker Starter Kit - Laravel v10.x -- PHP v8.2.10 +- PHP v8.2.x - MySQL v8.1 - MariaDB v10.11 +- phpMyAdmin v5.2.1 - Mailpit v1.8.4 - Node.js v18.17.1 - NPM v10.1.0 @@ -28,6 +29,15 @@ # Notes +### Laravel App +- URL: http://localhost + +### phpMyAdmin +- URL: http://localhost:8080 +- Username: `root` +- Password: `root` +- Database: `refactorian` + ### Basic docker compose commands - Build or rebuild services - `docker compose build` diff --git a/composer.json b/composer.json index 26a3125..0ea8d79 100644 --- a/composer.json +++ b/composer.json @@ -51,6 +51,7 @@ "php -r \"file_exists('.env') || copy('.env.example', '.env');\"", "php artisan key:generate", "php artisan config:cache", + "php artisan migrate", "npm install", "npm run build" ] diff --git a/docker-compose.yml b/docker-compose.yml index 9c9da17..053cc5a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -41,9 +41,9 @@ services: - .docker/db/sql:/docker-entrypoint-initdb.d environment: MYSQL_ROOT_PASSWORD: root - MYSQL_DATABASE: laravel_db_name - MYSQL_USER: laravel_db_user - MYSQL_PASSWORD: laravel_db_pass + MYSQL_DATABASE: refactorian + MYSQL_USER: refactorian + MYSQL_PASSWORD: refactorian # #################################################################################################### # # DATABASE (MariaDB) @@ -63,6 +63,22 @@ services: # MYSQL_USER: laravel_db_user # MYSQL_PASSWORD: laravel_db_pass + #################################################################################################### + # phpMyAdmin + #################################################################################################### + phpmyadmin: + image: phpmyadmin/phpmyadmin + ports: + - 8080:80 + links: + - db + environment: + PMA_HOST: db + PMA_PORT: 3306 + PMA_ARBITRARY: 1 + volumes: + - .docker/phpmyadmin/sessions:/sessions + #################################################################################################### # Mailpit ####################################################################################################