From aab29f9077b557da878e9a41fa1e86eb58872dbf Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 3 May 2023 08:31:50 +0200 Subject: [PATCH 1/3] force migrate in nightly --- docker/coolify-builder/Dockerfile | 11 +++-------- .../prod-ssu/etc/s6-overlay/s6-rc.d/db-migration/up | 9 ++++++++- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/docker/coolify-builder/Dockerfile b/docker/coolify-builder/Dockerfile index 806cf2169..2b310a5e9 100644 --- a/docker/coolify-builder/Dockerfile +++ b/docker/coolify-builder/Dockerfile @@ -17,20 +17,15 @@ WORKDIR /artifacts RUN apk add --no-cache bash curl git git-lfs openssh-client tar tini RUN mkdir -p ~/.docker/cli-plugins RUN if [[ ${TARGETPLATFORM} == 'linux/amd64' ]]; then \ - curl -SL https://github.com/docker/buildx/releases/download/v${DOCKER_BUILDX_VERSION}/buildx-v${DOCKER_BUILDX_VERSION}.linux-amd64 -o ~/.docker/cli-plugins/docker-buildx && \ - curl -SL https://github.com/docker/compose/releases/download/v${DOCKER_COMPOSE_VERSION}/docker-compose-linux-x86_64 -o ~/.docker/cli-plugins/docker-compose && \ + curl -sSL https://github.com/docker/buildx/releases/download/v${DOCKER_BUILDX_VERSION}/buildx-v${DOCKER_BUILDX_VERSION}.linux-amd64 -o ~/.docker/cli-plugins/docker-buildx && \ + curl -sSL https://github.com/docker/compose/releases/download/v${DOCKER_COMPOSE_VERSION}/docker-compose-linux-x86_64 -o ~/.docker/cli-plugins/docker-compose && \ (curl -sSL https://download.docker.com/linux/static/stable/x86_64/docker-${DOCKER_VERSION}.tgz | tar -C /usr/bin/ --no-same-owner -xzv --strip-components=1 docker/docker) && \ (curl -sSL https://github.com/buildpacks/pack/releases/download/v${PACK_VERSION}/pack-v${PACK_VERSION}-linux.tgz | tar -C /usr/local/bin/ --no-same-owner -xzv pack) && \ curl -sSL https://nixpacks.com/install.sh | bash && \ chmod +x ~/.docker/cli-plugins/docker-compose /usr/bin/docker /usr/local/bin/pack /root/.docker/cli-plugins/docker-buildx \ ;fi RUN -# RUN curl -SL https://cdn.coollabs.io/bin/$TARGETPLATFORM/docker-$DOCKER_VERSION -o /usr/bin/docker -# RUN curl -SL https://cdn.coollabs.io/bin/$TARGETPLATFORM/docker-compose-linux-$DOCKER_COMPOSE_VERSION -o ~/.docker/cli-plugins/docker-compose -# RUN curl -SL https://cdn.coollabs.io/bin/$TARGETPLATFORM/pack-$PACK_VERSION -o /usr/local/bin/pack -# RUN curl -sSL https://nixpacks.com/install.sh | bash -# RUN chmod +x ~/.docker/cli-plugins/docker-compose /usr/bin/docker /usr/local/bin/pack ENTRYPOINT ["/sbin/tini", "--"] -CMD ["sh", "-c", "while true; do sleep 3600; done"] +CMD ["sh", "-c", "while true; do sleep 3600 && exit 0; done"] diff --git a/docker/prod-ssu/etc/s6-overlay/s6-rc.d/db-migration/up b/docker/prod-ssu/etc/s6-overlay/s6-rc.d/db-migration/up index 250d5d8b1..8618a7e8c 100644 --- a/docker/prod-ssu/etc/s6-overlay/s6-rc.d/db-migration/up +++ b/docker/prod-ssu/etc/s6-overlay/s6-rc.d/db-migration/up @@ -1,2 +1,9 @@ #!/command/execlineb -P -php /var/www/html/artisan migrate --force --isolated +VERSION=$(php bootstrap/getVersion.php) + +if echo "$VERSION" | grep -q "nightly"; then + php /var/www/html/artisan migrate:fresh --force + php /var/www/html/artisan db:seed --class ProductionSeeder --force +else + php /var/www/html/artisan migrate --force --isolated +fi From 22028e23e3d724b7d07f11b41cacd9284687fde9 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 3 May 2023 08:53:00 +0200 Subject: [PATCH 2/3] redirect if no deployment found --- app/Http/Controllers/ApplicationController.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/ApplicationController.php b/app/Http/Controllers/ApplicationController.php index 877ca3254..f477549db 100644 --- a/app/Http/Controllers/ApplicationController.php +++ b/app/Http/Controllers/ApplicationController.php @@ -57,7 +57,13 @@ class ApplicationController extends Controller return redirect()->route('dashboard'); } $activity = Activity::where('properties->type_uuid', '=', $deployment_uuid)->first(); - + if (!$activity) { + return redirect()->route('project.application.deployments', [ + 'project_uuid' => $project->uuid, + 'environment_name' => $environment->name, + 'application_uuid' => $application->uuid, + ]); + } return view('project.application.deployment', [ 'application' => $application, 'activity' => $activity, From e20cdd83f887772adb45cdbcbc18d3f761bea668 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 3 May 2023 08:55:03 +0200 Subject: [PATCH 3/3] fix: read env from config, bc of cache --- app/Http/Livewire/Project/New/PublicGitRepository.php | 2 +- resources/views/livewire/project/application/deploy.blade.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Livewire/Project/New/PublicGitRepository.php b/app/Http/Livewire/Project/New/PublicGitRepository.php index 736d85c69..b676b463c 100644 --- a/app/Http/Livewire/Project/New/PublicGitRepository.php +++ b/app/Http/Livewire/Project/New/PublicGitRepository.php @@ -38,7 +38,7 @@ class PublicGitRepository extends Component ]; public function mount() { - if (env('APP_ENV') === 'local') { + if (config('app.env') === 'local') { $this->public_repository_url = 'https://github.com/coollabsio/coolify-examples/tree/nodejs-fastify'; $this->port = 3000; } diff --git a/resources/views/livewire/project/application/deploy.blade.php b/resources/views/livewire/project/application/deploy.blade.php index 06e71bf55..8237c0ce7 100644 --- a/resources/views/livewire/project/application/deploy.blade.php +++ b/resources/views/livewire/project/application/deploy.blade.php @@ -18,7 +18,7 @@ @if (data_get($application, 'ports_mappings_array')) @foreach ($application->ports_mappings_array as $port) - @if (env('APP_ENV') === 'local') + @if (config('app.env') === 'local') Open {{ explode(':', $port)[0] }} @else