diff --git a/Makefile b/Makefile index 7397d1b..02ccf0c 100644 --- a/Makefile +++ b/Makefile @@ -10,5 +10,8 @@ init_vendor: init: docker exec -i awa-laravel-1 /scripts/init_laravel.sh +exec_container: + docker exec -i awa-laravel-1 bash + down: docker compose down -v \ No newline at end of file diff --git a/docker-compose.yaml b/docker-compose.yaml index cd1e2e5..f367bc9 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -9,7 +9,7 @@ services: ports: - "3306:3306" volumes: - - laravel_db_volume:/var/lib/mysql + - awa_db_volume:/var/lib/mysql laravel: build: @@ -26,4 +26,4 @@ services: - ./laravel:/app volumes: - laravel_db_volume: + awa_db_volume: diff --git a/images/Laravel_Dockerfile b/images/Laravel_Dockerfile index 9463131..684fde1 100644 --- a/images/Laravel_Dockerfile +++ b/images/Laravel_Dockerfile @@ -2,4 +2,6 @@ FROM bitnami/laravel COPY init_laravel.sh /scripts/init_laravel.sh -RUN chmod +x /scripts/init_laravel.sh \ No newline at end of file +RUN chmod +x /scripts/init_laravel.sh + +CMD composer i && php artisan serve --host=0.0.0.0 --port=8000 \ No newline at end of file diff --git a/images/db_init.sql b/images/db_init.sql index 7126bb4..5da81db 100644 --- a/images/db_init.sql +++ b/images/db_init.sql @@ -1,3 +1,5 @@ +CREATE DATABASE laravel_db; + CREATE USER laravel_user IDENTIFIED BY 'super_strong_password'; GRANT CREATE, ALTER, DROP, SELECT, INSERT, UPDATE, DELETE ON laravel_db.* TO laravel_user; \ No newline at end of file