From 62be3cea1b51900e95474a0699f3cd0605f6a8c7 Mon Sep 17 00:00:00 2001 From: Pedro Gomes Date: Sun, 28 Oct 2018 11:08:32 +0100 Subject: [PATCH] Use default .env file --- .env | 17 +++++++++++++++++ .gitignore | 1 - README.md | 4 ---- resources/docker/app.dockerfile | 3 +++ 4 files changed, 20 insertions(+), 5 deletions(-) create mode 100644 .env diff --git a/.env b/.env new file mode 100644 index 0000000..0ff782e --- /dev/null +++ b/.env @@ -0,0 +1,17 @@ +APP_ENV=local +APP_DEBUG=true +APP_KEY= +APP_TIMEZONE=UTC + +LOG_CHANNEL=stack +LOG_SLACK_WEBHOOK_URL= + +DB_CONNECTION=mysql +DB_HOST=localhost +DB_PORT=3306 +DB_DATABASE=homestead +DB_USERNAME=root +DB_PASSWORD=secret + +CACHE_DRIVER=array +QUEUE_DRIVER=sync diff --git a/.gitignore b/.gitignore index d7d5464..8e0c7f7 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,5 @@ /.idea Homestead.json Homestead.yaml -.env *.sqlite composer\.lock diff --git a/README.md b/README.md index 8f049e3..358a42e 100644 --- a/README.md +++ b/README.md @@ -52,10 +52,6 @@ Build the containers `docker-compose up --build -d` -Use default config file - -`docker-compose exec app cp .env.example .env` - Run database migrations `docker-compose exec app php artisan migrate --seed` diff --git a/resources/docker/app.dockerfile b/resources/docker/app.dockerfile index 74b6978..68e9f32 100644 --- a/resources/docker/app.dockerfile +++ b/resources/docker/app.dockerfile @@ -1,2 +1,5 @@ +# Base minimal image with FPM FROM php:7.2-fpm-alpine + +# Install dependencies RUN docker-php-ext-install mysqli pdo pdo_mysql