diff --git a/.env.example b/.env.example index 5556d8dde..60a24519b 100644 --- a/.env.example +++ b/.env.example @@ -9,10 +9,10 @@ LOG_CHANNEL=stack L5_SWAGGER_GENERATE_ALWAYS=false DB_CONNECTION=mysql -DB_HOST=127.0.0.1 +DB_HOST=mysql_service DB_PORT=3306 DB_DATABASE=store -DB_USERNAME=root +DB_USERNAME=depth DB_PASSWORD=secret EMAIL_HOST=mail.example.com diff --git a/docker-compose.yaml b/docker-compose.yaml index b51baba95..405031b54 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -6,6 +6,7 @@ services: ports: - 80:80 volumes: + - vendor-volume:/usr/src/app/vendor - .:/usr/src/app command: - bash @@ -18,16 +19,21 @@ services: touch /usr/src/init fi exec apache2-foreground - mysql: + mysql_service: image: mysql:8.0 restart: always ports: - - 3306:3306 + - ${DB_PORT}:3306 environment: - MYSQL_ROOT_PASSWORD: secret - MYSQL_DATABASE: store + MYSQL_RANDOM_ROOT_PASSWORD: 'yes' + MYSQL_USER: ${DB_USERNAME} + MYSQL_PASSWORD: ${DB_PASSWORD} + MYSQL_DATABASE: ${DB_DATABASE} adminer: image: adminer restart: always ports: - - 81:8080 \ No newline at end of file + - 81:8080 + +volumes: + vendor-volume: \ No newline at end of file diff --git a/readme.md b/readme.md index 63c20f5d5..55c74639a 100644 --- a/readme.md +++ b/readme.md @@ -54,6 +54,11 @@ Wejście do kontenera (lub z aplikacji) docker exec -it depth(lub inna nazwa katalogu projektu)_app_1 bash ``` +Skasowanie środowiska +``` +docker-compose down -v +``` + ## Styl kodu Ustaw twoje IDE, zeby korzystało z pliku .editorconfig. W VS Code jest na to dodatek.