Skip to content

Commit 90267a9

Browse files
andrasbacsaiandrasbacsai
authored
Merge pull request coollabsio#3263 from coollabsio/next
revert infra things
2 parents eee5539 + 5f0a8bc commit 90267a9

14 files changed

+769
-77
lines changed

‎.env.development.example

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,16 @@
1-
# Coolify Configuration
2-
APP_ENV=local
3-
APP_NAME="Coolify Development"
1+
APP_NAME=Coolify-localhost
42
APP_ID=development
3+
APP_ENV=local
54
APP_KEY=
5+
APP_DEBUG=true
66
APP_URL=http://localhost
77
APP_PORT=8000
8-
APP_DEBUG=true
98
MUX_ENABLED=false
109

11-
# Enable Laravel Telescope for debugging
12-
TELESCOPE_ENABLED=false
13-
14-
# Selenium Driver URL for Dusk
1510
DUSK_DRIVER_URL=http://selenium:4444
1611

17-
# PostgreSQL Database Configuration
18-
DB_DATABASE=coolify
19-
DB_USERNAME=coolify
20-
DB_PASSWORD=password
21-
DB_HOST=host.docker.internal
22-
DB_PORT=5432
23-
24-
#Set custom ray port
25-
RAY_PORT=
26-
27-
# Special Keys for Andras
28-
# For cache purging
12+
## For Andras only
13+
# To purge cache
2914
BUNNY_API_KEY=
30-
# For asset uploads
15+
# To upload assets
3116
BUNNY_STORAGE_API_KEY=

‎.env.production

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,10 @@
1-
# Coolify Configuration
21
APP_ID=
2+
APP_NAME=Coolify
33
APP_KEY=
44

5-
# PostgreSQL Database Configuration
6-
DB_DATABASE=coolify
7-
DB_USERNAME=
85
DB_PASSWORD=
9-
10-
# Redis Configuration
116
REDIS_PASSWORD=
127

13-
# Pusher Configuration
148
PUSHER_APP_ID=
159
PUSHER_APP_KEY=
1610
PUSHER_APP_SECRET=

‎docker-compose.prod.yml

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,19 @@ services:
1313
- /data/coolify/backups:/var/www/html/storage/app/backups
1414
- /data/coolify/webhooks-during-maintenance:/var/www/html/storage/app/webhooks-during-maintenance
1515
environment:
16-
- APP_ENV=production
17-
- APP_NAME=Coolify
16+
- PHP_MEMORY_LIMIT
1817
- APP_ID
18+
- APP_ENV=production
19+
- APP_DEBUG
20+
- APP_NAME
1921
- APP_KEY
2022
- APP_URL
21-
- APP_DEBUG
23+
- DB_CONNECTION
24+
- DB_HOST
25+
- DB_PORT
2226
- DB_DATABASE
2327
- DB_USERNAME
2428
- DB_PASSWORD
25-
- DB_HOST
26-
- DB_PORT
27-
- DB_CONNECTION
2829
- QUEUE_CONNECTION
2930
- REDIS_HOST
3031
- REDIS_PASSWORD
@@ -33,7 +34,6 @@ services:
3334
- HORIZON_BALANCE_MAX_SHIFT
3435
- HORIZON_BALANCE_COOLDOWN
3536
- SSL_MODE=off
36-
- PHP_MEMORY_LIMIT
3737
- PHP_PM_CONTROL=dynamic
3838
- PHP_PM_START_SERVERS=1
3939
- PHP_PM_MIN_SPARE_SERVERS=1
@@ -83,20 +83,18 @@ services:
8383
condition: service_healthy
8484
redis:
8585
condition: service_healthy
86-
soketi:
87-
condition: service_healthy
8886
postgres:
8987
volumes:
9088
- coolify-db:/var/lib/postgresql/data
9189
environment:
92-
POSTGRES_USER: "${DB_USERNAME}"
90+
POSTGRES_USER: "${DB_USERNAME:-coolify}"
9391
POSTGRES_PASSWORD: "${DB_PASSWORD}"
9492
POSTGRES_DB: "${DB_DATABASE:-coolify}"
9593
healthcheck:
9694
test:
9795
[
9896
"CMD-SHELL",
99-
"pg_isready -U ${DB_USERNAME}",
97+
"pg_isready -U ${DB_USERNAME:-coolify}",
10098
"-d",
10199
"${DB_DATABASE:-coolify}"
102100
]

‎docker-compose.windows.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,14 @@ services:
7171
volumes:
7272
- coolify-db:/var/lib/postgresql/data
7373
environment:
74-
POSTGRES_USER: "${DB_USERNAME}"
74+
POSTGRES_USER: "${DB_USERNAME:-coolify}"
7575
POSTGRES_PASSWORD: "${DB_PASSWORD}"
7676
POSTGRES_DB: "${DB_DATABASE:-coolify}"
7777
healthcheck:
7878
test:
7979
[
8080
"CMD-SHELL",
81-
"pg_isready -U ${DB_USERNAME}",
81+
"pg_isready -U ${DB_USERNAME:-coolify}",
8282
"-d",
8383
"${DB_DATABASE:-coolify}"
8484
]

‎docker-compose.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ services:
1010
depends_on:
1111
- postgres
1212
- redis
13-
- soketi
1413
postgres:
1514
image: postgres:15-alpine
1615
container_name: coolify-db
@@ -33,4 +32,4 @@ networks:
3332
coolify:
3433
name: coolify
3534
driver: bridge
36-
external: false
35+
external: true

‎other/newcompose/.env.development.example

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# Coolify Configuration
2+
APP_ENV=local
3+
APP_NAME="Coolify Development"
4+
APP_ID=development
5+
APP_KEY=
6+
APP_URL=http://localhost
7+
APP_PORT=8000
8+
APP_DEBUG=true
9+
MUX_ENABLED=false
10+
11+
# Enable Laravel Telescope for debugging
12+
TELESCOPE_ENABLED=false
13+
14+
# Selenium Driver URL for Dusk
15+
DUSK_DRIVER_URL=http://selenium:4444
16+
17+
# PostgreSQL Database Configuration
18+
DB_DATABASE=coolify
19+
DB_USERNAME=coolify
20+
DB_PASSWORD=password
21+
DB_HOST=host.docker.internal
22+
DB_PORT=5432
23+
24+
#Set custom ray port
25+
RAY_PORT=
26+
27+
# Special Keys for Andras
28+
# For cache purging
29+
BUNNY_API_KEY=
30+
# For asset uploads
31+
BUNNY_STORAGE_API_KEY=

‎other/newcompose/.env.production

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# Coolify Configuration
2+
APP_ID=
3+
APP_KEY=
4+
5+
# PostgreSQL Database Configuration
6+
DB_DATABASE=coolify
7+
DB_USERNAME=
8+
DB_PASSWORD=
9+
10+
# Redis Configuration
11+
REDIS_PASSWORD=
12+
13+
# Pusher Configuration
14+
PUSHER_APP_ID=
15+
PUSHER_APP_KEY=
16+
PUSHER_APP_SECRET=

‎other/newcompose/docker-compose.prod.yml

Lines changed: 134 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,134 @@
1+
services:
2+
coolify:
3+
image: "ghcr.io/coollabsio/coolify:${LATEST_IMAGE:-latest}"
4+
volumes:
5+
- type: bind
6+
source: /data/coolify/source/.env
7+
target: /var/www/html/.env
8+
read_only: true
9+
- /data/coolify/ssh:/var/www/html/storage/app/ssh
10+
- /data/coolify/applications:/var/www/html/storage/app/applications
11+
- /data/coolify/databases:/var/www/html/storage/app/databases
12+
- /data/coolify/services:/var/www/html/storage/app/services
13+
- /data/coolify/backups:/var/www/html/storage/app/backups
14+
- /data/coolify/webhooks-during-maintenance:/var/www/html/storage/app/webhooks-during-maintenance
15+
environment:
16+
- APP_ENV=production
17+
- APP_NAME=Coolify
18+
- APP_ID
19+
- APP_KEY
20+
- APP_URL
21+
- APP_DEBUG
22+
- DB_DATABASE
23+
- DB_USERNAME
24+
- DB_PASSWORD
25+
- DB_HOST
26+
- DB_PORT
27+
- DB_CONNECTION
28+
- QUEUE_CONNECTION
29+
- REDIS_HOST
30+
- REDIS_PASSWORD
31+
- HORIZON_BALANCE
32+
- HORIZON_MAX_PROCESSES
33+
- HORIZON_BALANCE_MAX_SHIFT
34+
- HORIZON_BALANCE_COOLDOWN
35+
- SSL_MODE=off
36+
- PHP_MEMORY_LIMIT
37+
- PHP_PM_CONTROL=dynamic
38+
- PHP_PM_START_SERVERS=1
39+
- PHP_PM_MIN_SPARE_SERVERS=1
40+
- PHP_PM_MAX_SPARE_SERVERS=10
41+
- PUSHER_HOST
42+
- PUSHER_BACKEND_HOST
43+
- PUSHER_PORT
44+
- PUSHER_BACKEND_PORT
45+
- PUSHER_SCHEME
46+
- PUSHER_APP_ID
47+
- PUSHER_APP_KEY
48+
- PUSHER_APP_SECRET
49+
- AUTOUPDATE
50+
- SELF_HOSTED
51+
- SSH_MUX_PERSIST_TIME
52+
- FEEDBACK_DISCORD_WEBHOOK
53+
- WAITLIST
54+
- SUBSCRIPTION_PROVIDER
55+
- STRIPE_API_KEY
56+
- STRIPE_WEBHOOK_SECRET
57+
- STRIPE_PRICE_ID_BASIC_MONTHLY
58+
- STRIPE_PRICE_ID_BASIC_YEARLY
59+
- STRIPE_PRICE_ID_PRO_MONTHLY
60+
- STRIPE_PRICE_ID_PRO_YEARLY
61+
- STRIPE_PRICE_ID_ULTIMATE_MONTHLY
62+
- STRIPE_PRICE_ID_ULTIMATE_YEARLY
63+
- STRIPE_PRICE_ID_DYNAMIC_MONTHLY
64+
- STRIPE_PRICE_ID_DYNAMIC_YEARLY
65+
- STRIPE_PRICE_ID_BASIC_MONTHLY_OLD
66+
- STRIPE_PRICE_ID_BASIC_YEARLY_OLD
67+
- STRIPE_PRICE_ID_PRO_MONTHLY_OLD
68+
- STRIPE_PRICE_ID_PRO_YEARLY_OLD
69+
- STRIPE_PRICE_ID_ULTIMATE_MONTHLY_OLD
70+
- STRIPE_PRICE_ID_ULTIMATE_YEARLY_OLD
71+
- STRIPE_EXCLUDED_PLANS
72+
ports:
73+
- "${APP_PORT:-8000}:80"
74+
expose:
75+
- "${APP_PORT:-8000}"
76+
healthcheck:
77+
test: curl --fail http://127.0.0.1:80/api/health || exit 1
78+
interval: 5s
79+
retries: 10
80+
timeout: 2s
81+
depends_on:
82+
postgres:
83+
condition: service_healthy
84+
redis:
85+
condition: service_healthy
86+
soketi:
87+
condition: service_healthy
88+
postgres:
89+
volumes:
90+
- coolify-db:/var/lib/postgresql/data
91+
environment:
92+
POSTGRES_USER: "${DB_USERNAME}"
93+
POSTGRES_PASSWORD: "${DB_PASSWORD}"
94+
POSTGRES_DB: "${DB_DATABASE:-coolify}"
95+
healthcheck:
96+
test:
97+
[
98+
"CMD-SHELL",
99+
"pg_isready -U ${DB_USERNAME}",
100+
"-d",
101+
"${DB_DATABASE:-coolify}"
102+
]
103+
interval: 5s
104+
retries: 10
105+
timeout: 2s
106+
redis:
107+
command: redis-server --save 20 1 --loglevel warning --requirepass ${REDIS_PASSWORD}
108+
environment:
109+
REDIS_PASSWORD: "${REDIS_PASSWORD}"
110+
volumes:
111+
- coolify-redis:/data
112+
healthcheck:
113+
test: redis-cli ping
114+
interval: 5s
115+
retries: 10
116+
timeout: 2s
117+
soketi:
118+
ports:
119+
- "${SOKETI_PORT:-6001}:6001"
120+
environment:
121+
SOKETI_DEBUG: "${SOKETI_DEBUG:-false}"
122+
SOKETI_DEFAULT_APP_ID: "${PUSHER_APP_ID}"
123+
SOKETI_DEFAULT_APP_KEY: "${PUSHER_APP_KEY}"
124+
SOKETI_DEFAULT_APP_SECRET: "${PUSHER_APP_SECRET}"
125+
healthcheck:
126+
test: wget -qO- http://127.0.0.1:6001/ready || exit 1
127+
interval: 5s
128+
retries: 10
129+
timeout: 2s
130+
volumes:
131+
coolify-db:
132+
name: coolify-db
133+
coolify-redis:
134+
name: coolify-redis

0 commit comments

Comments
 (0)