Cleaned up redundant files.

Author: dmsemenov

.gitignore

@@ -1,3 +1,4 @@
+.DS_Store
 .idea
 .cache
 .config

.provision/nginx/conf.d/vhost.prod.conf renamed to .provision/nginx/conf.d/vhost.conf

@@ -1,5 +1,4 @@
 server {
-
     client_max_body_size 5m;
 
     listen 80;
@@ -8,7 +7,6 @@ server {
 
     location / {
         try_files $uri $uri/ /index.php?$query_string;
-
         #auth_basic "Restricted Content";
         #auth_basic_user_file /etc/nginx/.htpasswd;
     }
@@ -21,4 +19,4 @@ server {
         fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
         fastcgi_param PATH_INFO $fastcgi_path_info;
     }
-}
+}

.provision/nginx/conf.d/vhost.local.conf

@@ -1,15 +1,15 @@
+# Laravel docker environment
 ### Introduction
 Docker environment configuration for Laravel development.
 Contains settings for local development for new project or already existing.   
 >Repository provides:
-- Laravel ^8.0
+- Laravel ^6.0 || ^7.0 || ^8.0
 - PHP 7.4
 - Nginx: stable
 - MySql 8.0
 - Xdebug 2.9.8
 - Redis
 - Node: latest
-- LetsEncrypt for production
 
 ### Installation
 **Note:** Local environment tested on Ubuntu and macOS. Feel free to create an Issue for other OS.   
@@ -30,7 +30,7 @@ Contains settings for local development for new project or already existing.
 3. **Configure main `docker-compose.yml` file**
    ````
    # Local development
-   cp docker-compose.yml.local docker-compose.yml
+   cp docker-compose.yml.example docker-compose.yml
    ````
    Set variables for mysql container. Docker will create database and user at first UP.
    ````
@@ -75,24 +75,4 @@ Contains settings for local development for new project or already existing.
 
    docker-compose exec -uwww-data php-fpm composer install
    ````
-6. **Launch http://localhost:8989/register**   
-   
-### Production and LetsEncrypt 
-Repository do not show full flow how to deploy docker application with build and docker registry, 
-it can be used with simple git pull from your repository.  
-For production without https you can use `develop` branch and production files.
-   ````
-   # Production
-   cp docker-compose.yml.prod docker-compose.yml #this compose file use nginx production config 
-   ````
-If you are going to use LetsEncrypt at production look at branch 'letsencrypt' this repository.
-Branch contains ready to use configuration for letsEncrypt in production based on great article [Nginx and Let’s Encrypt with Docker in Less Than 5 Minutes](https://medium.com/@pentacent/nginx-and-lets-encrypt-with-docker-in-less-than-5-minutes-b4b8a60d3a71).  
-
-To use letsEncrypt at production just follow steps below:
-1. Initial settings   
-   Open ``./init-letsencrypt.sh`` add your domains instead `{YOUR_DOMAIN}` www.`{YOUR_DOMAIN}` and set `{YOUR_EMAIL}`.   
-   Run ``./init-letsencrypt.sh``. It will create initial settings.  
-   Note: don't forget to add A DNS record for domain with www. 
-2. Nginx settings  
-   At `.provision/nginx/conf.d/vhost.prod.conf` set `{YOUR_DOMAIN}` variable.
-Certificates stored at .provision folder and will be renew as described in article.
+6. **Launch http://localhost:8989/register**

README.md

@@ -6,11 +6,10 @@ services:
         build: .provision/nginx
         volumes:
             - ./${PROJECT_FOLDER}:/var/www
-            - .provision/nginx/conf.d/vhost.prod.conf:/etc/nginx/conf.d/default.conf
+            - .provision/nginx/conf.d/vhost.conf:/etc/nginx/conf.d/default.conf
             # - .provision/nginx/.htpasswd:/etc/nginx/.htpasswd
         ports:
-            - "80:80"
-            - "443:443"
+            - "8989:80"
         links:
             - php-fpm