chore: Update Coolify version to 4.0.0-beta.324 and fix file paths in upgrade script

This commit is contained in:
Andras Bacsai
2024-08-31 00:01:34 +02:00
parent 59c95c483a
commit c6df243623
12 changed files with 68 additions and 82 deletions

View File

@@ -1,10 +1,10 @@
# Coolify Configuration
APP_ID=
APP_NAME=Coolify
APP_KEY=
# PostgreSQL Database Configuration
DB_DATABASE=coolify
DB_USERNAME=
DB_USERNAME=coolify
DB_PASSWORD=
# Redis Configuration

View File

@@ -14,7 +14,7 @@ services:
- /data/coolify/webhooks-during-maintenance:/var/www/html/storage/app/webhooks-during-maintenance
environment:
- APP_ENV=production
- APP_NAME=Coolify
- APP_NAME
- APP_ID
- APP_KEY
- APP_URL
@@ -93,13 +93,7 @@ services:
POSTGRES_PASSWORD: "${DB_PASSWORD}"
POSTGRES_DB: "${DB_DATABASE:-coolify}"
healthcheck:
test:
[
"CMD-SHELL",
"pg_isready -U ${DB_USERNAME}",
"-d",
"${DB_DATABASE:-coolify}"
]
test: [ "CMD-SHELL", "pg_isready -U ${DB_USERNAME}", "-d", "${DB_DATABASE:-coolify}" ]
interval: 5s
retries: 10
timeout: 2s
@@ -132,3 +126,7 @@ volumes:
name: coolify-db
coolify-redis:
name: coolify-redis
networks:
coolify:
external: true

View File

@@ -9,7 +9,7 @@ set -o pipefail # Cause a pipeline to return the status of the last command that
VERSION="1.3.4"
DOCKER_VERSION="26.0"
CDN="https://cdn.coollabs.io/coolify"
CDN="https://cdn.coollabs.io/coolify-nightly"
OS_TYPE=$(grep -w "ID" /etc/os-release | cut -d "=" -f 2 | tr -d '"')
ENV_FILE="/data/coolify/source/.env"
@@ -70,7 +70,7 @@ fi
echo -e "-------------"
echo -e "Welcome to Coolify v4 beta installer!"
echo -e "This script will install everything for you."
echo -e "(Source code: https://github.com/coollabsio/coolify/blob/main/scripts/install.sh )\n"
echo -e "Source code: https://github.com/coollabsio/coolify/blob/main/scripts/install.sh\n"
echo -e "-------------"
echo "OS: $OS_TYPE $OS_VERSION"
@@ -296,7 +296,8 @@ if [ ! -f $ENV_FILE ]; then
sed -i "s|^APP_KEY=.*|APP_KEY=base64:$(openssl rand -base64 32)|" "$ENV_FILE"
# Generate a secure Postgres DB username and password
sed -i "s|^DB_USERNAME=.*|DB_USERNAME=$(openssl rand -hex 16)|" "$ENV_FILE"
# Causes issues: database "random-user" does not exist
# sed -i "s|^DB_USERNAME=.*|DB_USERNAME=$(openssl rand -hex 16)|" "$ENV_FILE"
sed -i "s|^DB_PASSWORD=.*|DB_PASSWORD=$(openssl rand -base64 32)|" "$ENV_FILE"
# Generate a secure Redis password

View File

@@ -2,7 +2,7 @@
## Do not modify this file. You will lose the ability to autoupdate!
VERSION="1.0.6"
CDN="https://cdn.coollabs.io/coolify"
CDN="https://cdn.coollabs.io/coolify-nightly"
curl -fsSL $CDN/docker-compose.yml -o /data/coolify/source/docker-compose.yml
curl -fsSL $CDN/docker-compose.prod.yml -o /data/coolify/source/docker-compose.prod.yml
@@ -26,7 +26,7 @@ fi
# Make sure coolify network exists
# It is created when starting Coolify with docker compose
# docker network create --attachable coolify 2>/dev/null
docker network create --attachable coolify 2>/dev/null
# docker network create --attachable --driver=overlay coolify-overlay 2>/dev/null
if [ -f /data/coolify/source/docker-compose.custom.yml ]; then

View File

@@ -0,0 +1,10 @@
{
"coolify": {
"v4": {
"version": "4.0.0-beta.324"
},
"nightly": {
"version": "4.0.0-beta.324"
}
}
}

View File

@@ -1,11 +0,0 @@
$handle = fopen("/tmp/export.csv", "w");
App\Models\Team::chunk(100, function ($teams) use ($handle) {
foreach ($teams as $team) {
if ($team->subscription->stripe_invoice_paid == true) {
foreach ($team->members as $member) {
fputcsv($handle, [$member->email, $member->name], ",");
}
}
}
});
fclose($handle);