prehistoric-systems/coolify
1
0
Fork 0
mirror of https://github.com/coollabsio/coolify.git synced 2026-03-11 08:55:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'next' into fix-amd-on-arm-and-dep

Browse source
This commit is contained in:
🏔️ Peak 2024-11-28 15:00:49 +01:00 committed by GitHub
commit c8663bbc99
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
resources/views/livewire/project/application/source.blade.php
View file

@ -43,7 +43,7 @@
<h4 class="py-2 ">Select another Private Key</h4> <h4 class="py-2 ">Select another Private Key</h4>
<div class="flex flex-wrap gap-2"> <div class="flex flex-wrap gap-2">
@foreach ($privateKeys as $key) @foreach ($privateKeys as $key)
<x-forms.button wire:click.defer="setPrivateKey('{{ $key->id }}')">{{ $key->name }} <x-forms.button wire:click="setPrivateKey('{{ $key->id }}')">{{ $key->name }}
</x-forms.button> </x-forms.button>
@endforeach @endforeach
</div> </div>

5
scripts/install.sh
View file

@ -83,6 +83,11 @@ if [ "$OS_TYPE" = "manjaro" ] || [ "$OS_TYPE" = "manjaro-arm" ]; then
OS_TYPE="arch" OS_TYPE="arch"
fi fi
# Check if the OS is Endeavour OS, if so, change it to arch
if [ "$OS_TYPE" = "endeavouros" ]; then
OS_TYPE="arch"
fi
# Check if the OS is Asahi Linux, if so, change it to fedora # Check if the OS is Asahi Linux, if so, change it to fedora
if [ "$OS_TYPE" = "fedora-asahi-remix" ]; then if [ "$OS_TYPE" = "fedora-asahi-remix" ]; then
OS_TYPE="fedora" OS_TYPE="fedora"