From 5c22dd35cf9e17febb4a03b92b2983a5f21c9231 Mon Sep 17 00:00:00 2001
From: Joao Patricio <ijpatricio@gmail.com>
Date: Sat, 18 Mar 2023 17:59:37 +0000
Subject: [PATCH] Environment setup

---
 .env.example        | 24 ++++--------------------
 docker-compose.yaml | 10 +++-------
 package-lock.json   |  2 +-
 3 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/.env.example b/.env.example
index ab8f68072..f6b965c91 100644
--- a/.env.example
+++ b/.env.example
@@ -1,8 +1,10 @@
 ############################################################################################################
 # Development Environment
 
-# Userid for the user that will run the application inside the container
+# User and group id for the user that will run the application inside the container
+# Run in your terminal: `id -u` and `id -g` and that's the results
 USERID=
+GROUPID=
 ############################################################################################################
 
 APP_NAME=Laravel
@@ -11,10 +13,6 @@ APP_KEY=
 APP_DEBUG=true
 APP_URL=http://localhost
 
-LOG_CHANNEL=stack
-LOG_DEPRECATIONS_CHANNEL=null
-LOG_LEVEL=debug
-
 DB_CONNECTION=pgsql
 DB_HOST=postgres
 DB_PORT=5432
@@ -22,18 +20,4 @@ DB_DATABASE=coolify
 DB_USERNAME=sail
 DB_PASSWORD=password
 
-BROADCAST_DRIVER=log
-CACHE_DRIVER=file
-FILESYSTEM_DISK=local
-QUEUE_CONNECTION=sync
-SESSION_DRIVER=file
-SESSION_LIFETIME=120
-
-MAIL_MAILER=smtp
-MAIL_HOST=mailpit
-MAIL_PORT=1025
-MAIL_USERNAME=null
-MAIL_PASSWORD=null
-MAIL_ENCRYPTION=null
-MAIL_FROM_ADDRESS="hello@example.com"
-MAIL_FROM_NAME="${APP_NAME}"
\ No newline at end of file
+QUEUE_CONNECTION=redis
diff --git a/docker-compose.yaml b/docker-compose.yaml
index dc02e3db8..b22e872fe 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -8,11 +8,11 @@ services:
       - "${APP_PORT:-8000}:80"
       - "${VITE_PORT:-5173}:${VITE_PORT:-5173}"
     environment:
-      PGID: "${USERID:-9999}"
       PUID: "${USERID:-9999}"
+      PGID: "${GROUPID:-9999}"
       SSL_MODE: 'off'
     volumes:
-      - .:/var/www/html:cached
+      - .:/var/www/html
   postgres:
     image: postgres:15-alpine
     ports:
@@ -34,11 +34,7 @@ services:
         ]
       retries: 3
       timeout: 5s
-  mailpit:
-    image: "axllent/mailpit:latest"
-    ports:
-      - "${FORWARD_MAILPIT_PORT:-1025}:1025"
-      - "${FORWARD_MAILPIT_DASHBOARD_PORT:-8025}:8025"
+
 volumes:
   db-coolify:
     driver: local
diff --git a/package-lock.json b/package-lock.json
index 63682f793..ece4b4d9c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,5 +1,5 @@
 {
-    "name": "html",
+    "name": "coolify",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {