From 6077a1c448da4e8735150d7693f27f8fef28e3b5 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 12 Jun 2023 17:49:11 +0200
Subject: [PATCH] fix

---
 .env.development.example  | 22 +---------------------
 config/sentry.php         |  4 ++--
 docker-compose.prod.yml   |  8 ++++----
 docker/dev-ssu/Dockerfile |  2 +-
 4 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/.env.development.example b/.env.development.example
index 55457a6d6..61ff261c7 100644
--- a/.env.development.example
+++ b/.env.development.example
@@ -1,4 +1,3 @@
-SELF_HOSTED=true
 ############################################################################################################
 # Development Environment
 
@@ -6,33 +5,14 @@ SELF_HOSTED=true
 # Run in your terminal: `id -u` and `id -g` and that's the results
 USERID=
 GROUPID=
-PROJECT_PATH_ON_HOST=/Users/your-username-here/code/coollabsio/coolify
-SERVEO_URL=<for receiving webhooks locally https://serveo.net/>
-MUX_ENABLED=false
-# If you are using the included Buggregator
-RAY_HOST=ray@host.docker.internal
-RAY_PORT=8001
 ############################################################################################################
 
-APP_NAME=Coolify
 APP_ENV=local
 APP_KEY=
 APP_DEBUG=true
+APP_URL=http://localhost
 APP_PORT=8000
 
-MAIL_MAILER=smtp
-MAIL_HOST=coolify-mail
-MAIL_PORT=1025
-
-SESSION_DRIVER=database
 DUSK_DRIVER_URL=http://selenium:4444
 
-DB_CONNECTION=pgsql
-DB_HOST=postgres
-DB_PORT=5432
-DB_DATABASE=coolify
-DB_USERNAME=coolify
 DB_PASSWORD=password
-
-QUEUE_CONNECTION=redis
-REDIS_HOST=coolify-redis
diff --git a/config/sentry.php b/config/sentry.php
index a1e21463f..9c9ef0b6f 100644
--- a/config/sentry.php
+++ b/config/sentry.php
@@ -7,10 +7,10 @@
 
     // The release version of your application
     // Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD'))
-    'release' => config('version'),
+    'release' => trim(exec('jq -r .coolify.v4.version ../versions.json')),
 
     // When left empty or `null` the Laravel environment will be used
-    'environment' => env('SENTRY_ENVIRONMENT'),
+    'environment' => config('app.env'),
 
     'breadcrumbs' => [
         // Capture Laravel logs in breadcrumbs
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index d7944b922..49b0487dc 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -44,16 +44,16 @@ services:
     volumes:
       - coolify-db:/var/lib/postgresql/data
     environment:
-      POSTGRES_USER: "${DB_USERNAME}"
+      POSTGRES_USER: "${DB_USERNAME:-coolify}"
       POSTGRES_PASSWORD: "${DB_PASSWORD}"
-      POSTGRES_DB: "${DB_DATABASE}"
+      POSTGRES_DB: "${DB_DATABASE:-coolify}"
     healthcheck:
       test:
         [
           "CMD-SHELL",
-          "pg_isready -U ${DB_USERNAME}",
+          "pg_isready -U ${DB_USERNAME:-coolify}",
           "-d",
-          "${DB_DATABASE}"
+          "${DB_DATABASE:-coolify}"
         ]
       interval: 2s
       retries: 5
diff --git a/docker/dev-ssu/Dockerfile b/docker/dev-ssu/Dockerfile
index 4236dd993..37cffb530 100644
--- a/docker/dev-ssu/Dockerfile
+++ b/docker/dev-ssu/Dockerfile
@@ -1,6 +1,6 @@
 FROM serversideup/php:8.2-fpm-nginx
 ARG POSTGRES_VERSION=15
-RUN apt-get update && apt-get install -y php-pgsql openssh-client git git-lfs postgresql-client
+RUN apt-get update && apt-get install -y php-pgsql openssh-client git git-lfs jq
 RUN apt-get -y autoremove && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*
 
 COPY docker/dev-ssu/nginx.conf /etc/nginx/conf.d/custom.conf