revert infra things

.env.development.example

@@ -1,31 +1,16 @@
-# Coolify Configuration
-APP_ENV=local
-APP_NAME="Coolify Development"
+APP_NAME=Coolify-localhost
 APP_ID=development
+APP_ENV=local
 APP_KEY=
+APP_DEBUG=true
 APP_URL=http://localhost
 APP_PORT=8000
-APP_DEBUG=true
 MUX_ENABLED=false
 
-# Enable Laravel Telescope for debugging
-TELESCOPE_ENABLED=false
-
-# Selenium Driver URL for Dusk
 DUSK_DRIVER_URL=http://selenium:4444
 
-# PostgreSQL Database Configuration
-DB_DATABASE=coolify
-DB_USERNAME=coolify
-DB_PASSWORD=password
-DB_HOST=host.docker.internal
-DB_PORT=5432
-
-#Set custom ray port
-RAY_PORT=
-
-# Special Keys for Andras
-# For cache purging
+## For Andras only
+# To purge cache
 BUNNY_API_KEY=
-# For asset uploads
+# To upload assets
 BUNNY_STORAGE_API_KEY=

.env.production

@@ -1,16 +1,10 @@
-# Coolify Configuration
 APP_ID=
+APP_NAME=Coolify
 APP_KEY=
 
-# PostgreSQL Database Configuration
-DB_DATABASE=coolify
-DB_USERNAME=
 DB_PASSWORD=
-
-# Redis Configuration
 REDIS_PASSWORD=
 
-# Pusher Configuration
 PUSHER_APP_ID=
 PUSHER_APP_KEY=
 PUSHER_APP_SECRET=

docker-compose.prod.yml

@@ -13,18 +13,19 @@ services:
       - /data/coolify/backups:/var/www/html/storage/app/backups
       - /data/coolify/webhooks-during-maintenance:/var/www/html/storage/app/webhooks-during-maintenance
     environment:
-      - APP_ENV=production
-      - APP_NAME=Coolify
+      - PHP_MEMORY_LIMIT
       - APP_ID
+      - APP_ENV=production
+      - APP_DEBUG
+      - APP_NAME
       - APP_KEY
       - APP_URL
-      - APP_DEBUG
+      - DB_CONNECTION
+      - DB_HOST
+      - DB_PORT
       - DB_DATABASE
       - DB_USERNAME
       - DB_PASSWORD
-      - DB_HOST
-      - DB_PORT
-      - DB_CONNECTION
       - QUEUE_CONNECTION
       - REDIS_HOST
       - REDIS_PASSWORD
@@ -33,7 +34,6 @@ services:
       - HORIZON_BALANCE_MAX_SHIFT
       - HORIZON_BALANCE_COOLDOWN
       - SSL_MODE=off
-      - PHP_MEMORY_LIMIT
       - PHP_PM_CONTROL=dynamic
       - PHP_PM_START_SERVERS=1
       - PHP_PM_MIN_SPARE_SERVERS=1
@@ -83,20 +83,18 @@ services:
         condition: service_healthy
       redis:
         condition: service_healthy
-      soketi:
-        condition: service_healthy
   postgres:
     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:-coolify}"
     healthcheck:
       test:
         [
           "CMD-SHELL",
-          "pg_isready -U ${DB_USERNAME}",
+          "pg_isready -U ${DB_USERNAME:-coolify}",
           "-d",
           "${DB_DATABASE:-coolify}"
         ]

docker-compose.windows.yml

@@ -71,14 +71,14 @@ 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:-coolify}"
     healthcheck:
       test:
         [
           "CMD-SHELL",
-          "pg_isready -U ${DB_USERNAME}",
+          "pg_isready -U ${DB_USERNAME:-coolify}",
           "-d",
           "${DB_DATABASE:-coolify}"
         ]

docker-compose.yml

@@ -10,7 +10,6 @@ services:
         depends_on:
             - postgres
             - redis
-            - soketi
     postgres:
         image: postgres:15-alpine
         container_name: coolify-db
@@ -33,4 +32,4 @@ networks:
     coolify:
         name: coolify
         driver: bridge
-        external: false
+        external: true

other/newcompose/.env.development.example

@@ -0,0 +1,31 @@
+# Coolify Configuration
+APP_ENV=local
+APP_NAME="Coolify Development"
+APP_ID=development
+APP_KEY=
+APP_URL=http://localhost
+APP_PORT=8000
+APP_DEBUG=true
+MUX_ENABLED=false
+
+# Enable Laravel Telescope for debugging
+TELESCOPE_ENABLED=false
+
+# Selenium Driver URL for Dusk
+DUSK_DRIVER_URL=http://selenium:4444
+
+# PostgreSQL Database Configuration
+DB_DATABASE=coolify
+DB_USERNAME=coolify
+DB_PASSWORD=password
+DB_HOST=host.docker.internal
+DB_PORT=5432
+
+#Set custom ray port
+RAY_PORT=
+
+# Special Keys for Andras
+# For cache purging
+BUNNY_API_KEY=
+# For asset uploads
+BUNNY_STORAGE_API_KEY=

other/newcompose/.env.production

@@ -0,0 +1,16 @@
+# Coolify Configuration
+APP_ID=
+APP_KEY=
+
+# PostgreSQL Database Configuration
+DB_DATABASE=coolify
+DB_USERNAME=
+DB_PASSWORD=
+
+# Redis Configuration
+REDIS_PASSWORD=
+
+# Pusher Configuration
+PUSHER_APP_ID=
+PUSHER_APP_KEY=
+PUSHER_APP_SECRET=

other/newcompose/docker-compose.prod.yml

@@ -0,0 +1,134 @@
+services:
+  coolify:
+    image: "ghcr.io/coollabsio/coolify:${LATEST_IMAGE:-latest}"
+    volumes:
+      - type: bind
+        source: /data/coolify/source/.env
+        target: /var/www/html/.env
+        read_only: true
+      - /data/coolify/ssh:/var/www/html/storage/app/ssh
+      - /data/coolify/applications:/var/www/html/storage/app/applications
+      - /data/coolify/databases:/var/www/html/storage/app/databases
+      - /data/coolify/services:/var/www/html/storage/app/services
+      - /data/coolify/backups:/var/www/html/storage/app/backups
+      - /data/coolify/webhooks-during-maintenance:/var/www/html/storage/app/webhooks-during-maintenance
+    environment:
+      - APP_ENV=production
+      - APP_NAME=Coolify
+      - APP_ID
+      - APP_KEY
+      - APP_URL
+      - APP_DEBUG
+      - DB_DATABASE
+      - DB_USERNAME
+      - DB_PASSWORD
+      - DB_HOST
+      - DB_PORT
+      - DB_CONNECTION
+      - QUEUE_CONNECTION
+      - REDIS_HOST
+      - REDIS_PASSWORD
+      - HORIZON_BALANCE
+      - HORIZON_MAX_PROCESSES
+      - HORIZON_BALANCE_MAX_SHIFT
+      - HORIZON_BALANCE_COOLDOWN
+      - SSL_MODE=off
+      - PHP_MEMORY_LIMIT
+      - PHP_PM_CONTROL=dynamic
+      - PHP_PM_START_SERVERS=1
+      - PHP_PM_MIN_SPARE_SERVERS=1
+      - PHP_PM_MAX_SPARE_SERVERS=10
+      - PUSHER_HOST
+      - PUSHER_BACKEND_HOST
+      - PUSHER_PORT
+      - PUSHER_BACKEND_PORT
+      - PUSHER_SCHEME
+      - PUSHER_APP_ID
+      - PUSHER_APP_KEY
+      - PUSHER_APP_SECRET
+      - AUTOUPDATE
+      - SELF_HOSTED
+      - SSH_MUX_PERSIST_TIME
+      - FEEDBACK_DISCORD_WEBHOOK
+      - WAITLIST
+      - SUBSCRIPTION_PROVIDER
+      - STRIPE_API_KEY
+      - STRIPE_WEBHOOK_SECRET
+      - STRIPE_PRICE_ID_BASIC_MONTHLY
+      - STRIPE_PRICE_ID_BASIC_YEARLY
+      - STRIPE_PRICE_ID_PRO_MONTHLY
+      - STRIPE_PRICE_ID_PRO_YEARLY
+      - STRIPE_PRICE_ID_ULTIMATE_MONTHLY
+      - STRIPE_PRICE_ID_ULTIMATE_YEARLY
+      - STRIPE_PRICE_ID_DYNAMIC_MONTHLY
+      - STRIPE_PRICE_ID_DYNAMIC_YEARLY
+      - STRIPE_PRICE_ID_BASIC_MONTHLY_OLD
+      - STRIPE_PRICE_ID_BASIC_YEARLY_OLD
+      - STRIPE_PRICE_ID_PRO_MONTHLY_OLD
+      - STRIPE_PRICE_ID_PRO_YEARLY_OLD
+      - STRIPE_PRICE_ID_ULTIMATE_MONTHLY_OLD
+      - STRIPE_PRICE_ID_ULTIMATE_YEARLY_OLD
+      - STRIPE_EXCLUDED_PLANS
+    ports:
+      - "${APP_PORT:-8000}:80"
+    expose:
+      - "${APP_PORT:-8000}"
+    healthcheck:
+      test: curl --fail http://127.0.0.1:80/api/health || exit 1
+      interval: 5s
+      retries: 10
+      timeout: 2s
+    depends_on:
+      postgres:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
+      soketi:
+        condition: service_healthy
+  postgres:
+    volumes:
+      - coolify-db:/var/lib/postgresql/data
+    environment:
+      POSTGRES_USER: "${DB_USERNAME}"
+      POSTGRES_PASSWORD: "${DB_PASSWORD}"
+      POSTGRES_DB: "${DB_DATABASE:-coolify}"
+    healthcheck:
+      test:
+        [
+          "CMD-SHELL",
+          "pg_isready -U ${DB_USERNAME}",
+          "-d",
+          "${DB_DATABASE:-coolify}"
+        ]
+      interval: 5s
+      retries: 10
+      timeout: 2s
+  redis:
+    command: redis-server --save 20 1 --loglevel warning --requirepass ${REDIS_PASSWORD}
+    environment:
+      REDIS_PASSWORD: "${REDIS_PASSWORD}"
+    volumes:
+      - coolify-redis:/data
+    healthcheck:
+      test: redis-cli ping
+      interval: 5s
+      retries: 10
+      timeout: 2s
+  soketi:
+    ports:
+      - "${SOKETI_PORT:-6001}:6001"
+    environment:
+      SOKETI_DEBUG: "${SOKETI_DEBUG:-false}"
+      SOKETI_DEFAULT_APP_ID: "${PUSHER_APP_ID}"
+      SOKETI_DEFAULT_APP_KEY: "${PUSHER_APP_KEY}"
+      SOKETI_DEFAULT_APP_SECRET: "${PUSHER_APP_SECRET}"
+    healthcheck:
+      test: wget -qO- http://127.0.0.1:6001/ready || exit 1
+      interval: 5s
+      retries: 10
+      timeout: 2s
+volumes:
+  coolify-db:
+    name: coolify-db
+  coolify-redis:
+    name: coolify-redis