Merge pull request #51 from connorabbas/develop

docker, database updates

Author: connorabbas

.devcontainer/devcontainer.json

@@ -12,6 +12,7 @@
     "customizations": {
         "vscode": {
             "extensions": [
+                "ms-azuretools.vscode-docker",
                 "absszero.vscode-laravel-goto",
                 "codingyu.laravel-goto-view",
                 "onecentlin.laravel-blade",

README.md

@@ -4,7 +4,7 @@ A basic starter kit using [Laravel](https://laravel.com/docs/master), [Intertia.
 Need an admin panel? [There's a branch for that.](https://github.com/connorabbas/laravel-inertia-primevue/tree/feature/admin-panel)
 
 ## Usage with Docker
-This starter kit is configured to use Docker Compose for local development with a few extra configuration steps. With this setup, you do not need PHP, Composer, MySQL/MariaDB, or Node.js installed on your machine to get up and running with this project.
+This starter kit is configured to use Docker Compose for local development with a few extra configuration steps. With this setup, you do not need PHP, Composer, MySQL or Node.js installed on your machine to get up and running with this project.
 
 ### Setup
 1. In a new directory (outside of your Laravel project) create a `docker-compose.yml` file to create a reverse proxy container using [Traefik](https://doc.traefik.io/traefik/getting-started/quick-start/). You can reference this [example implementation](https://github.com/connorabbas/traefik-docker-compose/blob/master/docker-compose.yml).
@@ -19,11 +19,11 @@ This starter kit is configured to use Docker Compose for local development with
     # Match with value used in docker-compose.local.yml
     APP_URL=http://primevue-inertia.localhost
 
-    DB_CONNECTION=mariadb
-    DB_HOST=mariadb # service name from container
+    DB_CONNECTION=mysql
+    DB_HOST=mysql
     DB_PORT=3306
     DB_DATABASE=laravel
-    DB_USERNAME=docker_mariadb
+    DB_USERNAME=sail
     DB_PASSWORD=password
 
     # Update as needed for running multiple projects

docker-compose.local.yml

@@ -1,6 +1,5 @@
 services:
   laravel:
-    container_name: primevue_inertia_laravel
     build:
       context: ./docker/local/php/8.3
       dockerfile: Dockerfile
@@ -28,28 +27,35 @@ services:
       - sail
       - proxy
     depends_on:
-      - mariadb
+      - mysql
 
-  mariadb:
-    container_name: primevue_inertia_mariadb
-    image: mariadb:11
+  mysql:
+    image: 'mysql/mysql-server:8.0'
     ports:
-      - "${FORWARD_DB_PORT:-3306}:3306"
+      - '${FORWARD_DB_PORT:-3306}:3306'
     environment:
       MYSQL_ROOT_PASSWORD: '${DB_PASSWORD}'
-      MYSQL_ROOT_HOST: "%"
+      MYSQL_ROOT_HOST: '%'
       MYSQL_DATABASE: '${DB_DATABASE}'
       MYSQL_USER: '${DB_USERNAME}'
       MYSQL_PASSWORD: '${DB_PASSWORD}'
-      MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
+      MYSQL_ALLOW_EMPTY_PASSWORD: 1
     volumes:
-      - primevue_inertia_mariadb_data:/var/lib/mysql
-      - ./docker/local/database/init.sql:/docker-entrypoint-initdb.d/init.sql
+      - 'primevue-inertia-mysql:/var/lib/mysql'
+      - './docker/local/database/mysql/create-testing-database.sh:/docker-entrypoint-initdb.d/10-create-testing-database.sh'
     networks:
       - sail
+    healthcheck:
+      test:
+        - CMD
+        - mysqladmin
+        - ping
+        - '-p${DB_PASSWORD}'
+      retries: 3
+      timeout: 5s
 
 volumes:
-  primevue_inertia_mariadb_data:
+  primevue-inertia-mysql:
     driver: local
 
 networks:

docker/local/database/init.sql

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+mysql --user=root --password="$MYSQL_ROOT_PASSWORD" <<-EOSQL
+    CREATE DATABASE IF NOT EXISTS testing;
+    GRANT ALL PRIVILEGES ON \`testing%\`.* TO '$MYSQL_USER'@'%';
+EOSQL