From ca21545d7bacec0af4578c8587b76a1d1386d6c8 Mon Sep 17 00:00:00 2001 From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com> Date: Fri, 20 Sep 2024 15:01:34 +0200 Subject: [PATCH 1/8] Fix: Typo --- other/nightly/install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/other/nightly/install.sh b/other/nightly/install.sh index 61acbd333..4df5b3c41 100755 --- a/other/nightly/install.sh +++ b/other/nightly/install.sh @@ -480,9 +480,9 @@ syncSshKeys() { } set +e -IS_COOLIFY_VOLUME_EXISTS=$(docker volume ls | grep coolify-db | wc -l) +IF_COOLIFY_VOLUME_EXISTS=$(docker volume ls | grep coolify-db | wc -l) set -e -if [ "$IS_COOLIFY_VOLUME_EXISTS" -eq 0 ]; then +if [ "$IF_COOLIFY_VOLUME_EXISTS" -eq 0 ]; then echo " - Generating SSH key." ssh-keygen -t ed25519 -a 100 -f /data/coolify/ssh/keys/id.$CURRENT_USER@host.docker.internal -q -N "" -C coolify chown 9999 /data/coolify/ssh/keys/id.$CURRENT_USER@host.docker.internal From cc77775f20eef9fe1322c1cbb4ab2702e1bfe3c6 Mon Sep 17 00:00:00 2001 From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com> Date: Fri, 20 Sep 2024 15:32:56 +0200 Subject: [PATCH 2/8] Remove not needed seeders to make management simpler --- database/seeders/EnvironmentSeeder.php | 13 ------------- database/seeders/KubernetesSeeder.php | 16 ---------------- database/seeders/LocalFileVolumeSeeder.php | 16 ---------------- database/seeders/ServiceApplicationSeeder.php | 16 ---------------- database/seeders/ServiceDatabaseSeeder.php | 16 ---------------- database/seeders/ServiceSeeder.php | 16 ---------------- database/seeders/SubscriptionSeeder.php | 16 ---------------- database/seeders/WaitlistSeeder.php | 16 ---------------- database/seeders/WebhookSeeder.php | 16 ---------------- 9 files changed, 141 deletions(-) delete mode 100644 database/seeders/EnvironmentSeeder.php delete mode 100644 database/seeders/KubernetesSeeder.php delete mode 100644 database/seeders/LocalFileVolumeSeeder.php delete mode 100644 database/seeders/ServiceApplicationSeeder.php delete mode 100644 database/seeders/ServiceDatabaseSeeder.php delete mode 100644 database/seeders/ServiceSeeder.php delete mode 100644 database/seeders/SubscriptionSeeder.php delete mode 100644 database/seeders/WaitlistSeeder.php delete mode 100644 database/seeders/WebhookSeeder.php diff --git a/database/seeders/EnvironmentSeeder.php b/database/seeders/EnvironmentSeeder.php deleted file mode 100644 index 1c6d562a9..000000000 --- a/database/seeders/EnvironmentSeeder.php +++ /dev/null @@ -1,13 +0,0 @@ - Date: Fri, 20 Sep 2024 15:42:06 +0200 Subject: [PATCH 3/8] Remove commented out seeders --- database/seeders/ApplicationPreviewSeeder.php | 20 ----------- .../seeders/EnvironmentVariableSeeder.php | 21 ------------ database/seeders/GitSeeder.php | 26 --------------- database/seeders/ProjectSettingSeeder.php | 15 --------- ...ScheduledDatabaseBackupExecutionSeeder.php | 28 ---------------- .../seeders/ScheduledDatabaseBackupSeeder.php | 33 ------------------- database/seeders/SwarmDockerSeeder.php | 20 ----------- 7 files changed, 163 deletions(-) delete mode 100644 database/seeders/ApplicationPreviewSeeder.php delete mode 100644 database/seeders/EnvironmentVariableSeeder.php delete mode 100644 database/seeders/GitSeeder.php delete mode 100644 database/seeders/ProjectSettingSeeder.php delete mode 100644 database/seeders/ScheduledDatabaseBackupExecutionSeeder.php delete mode 100644 database/seeders/ScheduledDatabaseBackupSeeder.php delete mode 100644 database/seeders/SwarmDockerSeeder.php diff --git a/database/seeders/ApplicationPreviewSeeder.php b/database/seeders/ApplicationPreviewSeeder.php deleted file mode 100644 index 764939073..000000000 --- a/database/seeders/ApplicationPreviewSeeder.php +++ /dev/null @@ -1,20 +0,0 @@ - $application_1->id, - // 'pull_request_id' => 1 - // ]); - } -} diff --git a/database/seeders/EnvironmentVariableSeeder.php b/database/seeders/EnvironmentVariableSeeder.php deleted file mode 100644 index b09ff705e..000000000 --- a/database/seeders/EnvironmentVariableSeeder.php +++ /dev/null @@ -1,21 +0,0 @@ - 'NODE_ENV', - // 'value' => 'production', - // 'is_build_time' => true, - // 'application_id' => 1, - // ]); - } -} diff --git a/database/seeders/GitSeeder.php b/database/seeders/GitSeeder.php deleted file mode 100644 index c8dc3ab6d..000000000 --- a/database/seeders/GitSeeder.php +++ /dev/null @@ -1,26 +0,0 @@ - 'https://api.github.com', - // 'html_url' => 'https://github.com', - // 'is_public' => false, - // 'private_key_id' => $private_key_1->id, - // 'project_id' => $project->id, - // ]); - } -} diff --git a/database/seeders/ProjectSettingSeeder.php b/database/seeders/ProjectSettingSeeder.php deleted file mode 100644 index 2a8cdfdb4..000000000 --- a/database/seeders/ProjectSettingSeeder.php +++ /dev/null @@ -1,15 +0,0 @@ -settings->wildcard_domain = 'wildcard.example.com'; - // $first_project->settings->save(); - } -} diff --git a/database/seeders/ScheduledDatabaseBackupExecutionSeeder.php b/database/seeders/ScheduledDatabaseBackupExecutionSeeder.php deleted file mode 100644 index 7e4c33764..000000000 --- a/database/seeders/ScheduledDatabaseBackupExecutionSeeder.php +++ /dev/null @@ -1,28 +0,0 @@ - 'success', - // 'message' => 'Backup created successfully.', - // 'size' => '10243467789556', - // 'scheduled_database_backup_id' => 1, - // ]); - // ScheduledDatabaseBackupExecution::create([ - // 'status' => 'failed', - // 'message' => 'Backup failed.', - // 'size' => '10243456', - // 'scheduled_database_backup_id' => 1, - // ]); - } -} diff --git a/database/seeders/ScheduledDatabaseBackupSeeder.php b/database/seeders/ScheduledDatabaseBackupSeeder.php deleted file mode 100644 index fefbada0d..000000000 --- a/database/seeders/ScheduledDatabaseBackupSeeder.php +++ /dev/null @@ -1,33 +0,0 @@ - true, - // 'frequency' => '* * * * *', - // 'number_of_backups_locally' => 2, - // 'database_id' => 1, - // 'database_type' => 'App\Models\StandalonePostgresql', - // 's3_storage_id' => 1, - // 'team_id' => 0, - // ]); - // ScheduledDatabaseBackup::create([ - // 'enabled' => true, - // 'frequency' => '* * * * *', - // 'number_of_backups_locally' => 3, - // 'database_id' => 1, - // 'database_type' => 'App\Models\StandalonePostgresql', - // 'team_id' => 0, - // ]); - } -} diff --git a/database/seeders/SwarmDockerSeeder.php b/database/seeders/SwarmDockerSeeder.php deleted file mode 100644 index 85d31b140..000000000 --- a/database/seeders/SwarmDockerSeeder.php +++ /dev/null @@ -1,20 +0,0 @@ - 'Swarm Docker 1', - // 'server_id' => 1, - // ]); - } -} From 000a348c900b193fd4971043886bb9002920775c Mon Sep 17 00:00:00 2001 From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com> Date: Fri, 20 Sep 2024 15:42:24 +0200 Subject: [PATCH 4/8] remove team seeders --- database/seeders/TeamSeeder.php | 23 ---------------- database/seeders/TestTeamSeeder.php | 42 ----------------------------- 2 files changed, 65 deletions(-) delete mode 100644 database/seeders/TeamSeeder.php delete mode 100644 database/seeders/TestTeamSeeder.php diff --git a/database/seeders/TeamSeeder.php b/database/seeders/TeamSeeder.php deleted file mode 100644 index 67c5ec489..000000000 --- a/database/seeders/TeamSeeder.php +++ /dev/null @@ -1,23 +0,0 @@ -description = 'The root team'; - $root_user_personal_team->save(); - - $normal_user_in_root_team->teams()->attach($root_user_personal_team); - $normal_user_not_in_root_team = User::find(2); - $normal_user_in_root_team_personal_team = Team::find(1); - $normal_user_not_in_root_team->teams()->attach($normal_user_in_root_team_personal_team, ['role' => 'admin']); - } -} diff --git a/database/seeders/TestTeamSeeder.php b/database/seeders/TestTeamSeeder.php deleted file mode 100644 index 940c45cc5..000000000 --- a/database/seeders/TestTeamSeeder.php +++ /dev/null @@ -1,42 +0,0 @@ -create([ - 'name' => '1 personal, 1 other team, owner, no other members', - 'email' => '1@example.com', - ]); - $team = Team::create([ - 'name' => '1@example.com', - 'personal_team' => false, - 'show_boarding' => true, - ]); - $user->teams()->attach($team, ['role' => 'owner']); - - // User has 2 teams, 1 personal, 1 other where it is the owner and 1 other member is in the team - $user = User::factory()->create([ - 'name' => 'owner: 1 personal, 1 other team, owner, 1 other member', - 'email' => '2@example.com', - ]); - $team = Team::create([ - 'name' => '2@example.com', - 'personal_team' => false, - 'show_boarding' => true, - ]); - $user->teams()->attach($team, ['role' => 'owner']); - $user = User::factory()->create([ - 'name' => 'member: 1 personal, 1 other team, owner, 1 other member', - 'email' => '3@example.com', - ]); - $team->members()->attach($user, ['role' => 'member']); - } -} From 768b39dd25a5423e89eb6e52104053d776a08c99 Mon Sep 17 00:00:00 2001 From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com> Date: Fri, 20 Sep 2024 15:45:18 +0200 Subject: [PATCH 5/8] Revert "remove team seeders" This reverts commit 000a348c900b193fd4971043886bb9002920775c. --- database/seeders/TeamSeeder.php | 23 ++++++++++++++++ database/seeders/TestTeamSeeder.php | 42 +++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+) create mode 100644 database/seeders/TeamSeeder.php create mode 100644 database/seeders/TestTeamSeeder.php diff --git a/database/seeders/TeamSeeder.php b/database/seeders/TeamSeeder.php new file mode 100644 index 000000000..67c5ec489 --- /dev/null +++ b/database/seeders/TeamSeeder.php @@ -0,0 +1,23 @@ +description = 'The root team'; + $root_user_personal_team->save(); + + $normal_user_in_root_team->teams()->attach($root_user_personal_team); + $normal_user_not_in_root_team = User::find(2); + $normal_user_in_root_team_personal_team = Team::find(1); + $normal_user_not_in_root_team->teams()->attach($normal_user_in_root_team_personal_team, ['role' => 'admin']); + } +} diff --git a/database/seeders/TestTeamSeeder.php b/database/seeders/TestTeamSeeder.php new file mode 100644 index 000000000..940c45cc5 --- /dev/null +++ b/database/seeders/TestTeamSeeder.php @@ -0,0 +1,42 @@ +create([ + 'name' => '1 personal, 1 other team, owner, no other members', + 'email' => '1@example.com', + ]); + $team = Team::create([ + 'name' => '1@example.com', + 'personal_team' => false, + 'show_boarding' => true, + ]); + $user->teams()->attach($team, ['role' => 'owner']); + + // User has 2 teams, 1 personal, 1 other where it is the owner and 1 other member is in the team + $user = User::factory()->create([ + 'name' => 'owner: 1 personal, 1 other team, owner, 1 other member', + 'email' => '2@example.com', + ]); + $team = Team::create([ + 'name' => '2@example.com', + 'personal_team' => false, + 'show_boarding' => true, + ]); + $user->teams()->attach($team, ['role' => 'owner']); + $user = User::factory()->create([ + 'name' => 'member: 1 personal, 1 other team, owner, 1 other member', + 'email' => '3@example.com', + ]); + $team->members()->attach($user, ['role' => 'member']); + } +} From b0635327a178bf857a1150af4c00d4f14b36bd4e Mon Sep 17 00:00:00 2001 From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com> Date: Wed, 25 Sep 2024 00:00:26 +0200 Subject: [PATCH 6/8] Revert "Fix: Typo" This reverts commit ca21545d7bacec0af4578c8587b76a1d1386d6c8. --- other/nightly/install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/other/nightly/install.sh b/other/nightly/install.sh index 4df5b3c41..61acbd333 100755 --- a/other/nightly/install.sh +++ b/other/nightly/install.sh @@ -480,9 +480,9 @@ syncSshKeys() { } set +e -IF_COOLIFY_VOLUME_EXISTS=$(docker volume ls | grep coolify-db | wc -l) +IS_COOLIFY_VOLUME_EXISTS=$(docker volume ls | grep coolify-db | wc -l) set -e -if [ "$IF_COOLIFY_VOLUME_EXISTS" -eq 0 ]; then +if [ "$IS_COOLIFY_VOLUME_EXISTS" -eq 0 ]; then echo " - Generating SSH key." ssh-keygen -t ed25519 -a 100 -f /data/coolify/ssh/keys/id.$CURRENT_USER@host.docker.internal -q -N "" -C coolify chown 9999 /data/coolify/ssh/keys/id.$CURRENT_USER@host.docker.internal From 39015e7d6df2c11e09272c965bb1093111afd951 Mon Sep 17 00:00:00 2001 From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com> Date: Fri, 27 Sep 2024 12:17:54 +0200 Subject: [PATCH 7/8] Fix: Typo in install script --- other/nightly/install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/other/nightly/install.sh b/other/nightly/install.sh index 020e7d45b..8f318f7a7 100755 --- a/other/nightly/install.sh +++ b/other/nightly/install.sh @@ -399,10 +399,10 @@ if [ ! -f ~/.ssh/authorized_keys ]; then fi set +e -IS_COOLIFY_VOLUME_EXISTS=$(docker volume ls | grep coolify-db | wc -l) +IF_COOLIFY_VOLUME_EXISTS=$(docker volume ls | grep coolify-db | wc -l) set -e -if [ "$IS_COOLIFY_VOLUME_EXISTS" -eq 0 ]; then +if [ "$IF_COOLIFY_VOLUME_EXISTS" -eq 0 ]; then echo " - Generating SSH key." ssh-keygen -t ed25519 -a 100 -f /data/coolify/ssh/keys/id.$CURRENT_USER@host.docker.internal -q -N "" -C coolify chown 9999 /data/coolify/ssh/keys/id.$CURRENT_USER@host.docker.internal From 5541c737b7be3372b95e9b1196aa8555a32f0090 Mon Sep 17 00:00:00 2001 From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com> Date: Fri, 27 Sep 2024 12:24:58 +0200 Subject: [PATCH 8/8] Remove all deleted seeders --- database/seeders/DatabaseSeeder.php | 8 -------- 1 file changed, 8 deletions(-) diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php index 874762aef..be5083108 100644 --- a/database/seeders/DatabaseSeeder.php +++ b/database/seeders/DatabaseSeeder.php @@ -17,22 +17,14 @@ class DatabaseSeeder extends Seeder ServerSeeder::class, ServerSettingSeeder::class, ProjectSeeder::class, - ProjectSettingSeeder::class, - EnvironmentSeeder::class, StandaloneDockerSeeder::class, - SwarmDockerSeeder::class, - KubernetesSeeder::class, GithubAppSeeder::class, GitlabAppSeeder::class, ApplicationSeeder::class, ApplicationSettingsSeeder::class, - ApplicationPreviewSeeder::class, - EnvironmentVariableSeeder::class, LocalPersistentVolumeSeeder::class, S3StorageSeeder::class, StandalonePostgresqlSeeder::class, - ScheduledDatabaseBackupSeeder::class, - ScheduledDatabaseBackupExecutionSeeder::class, OauthSettingSeeder::class, ]); }