- Fix restart_policy in Service config.
- Tweaked the upgrade process a bit. REVERTED.
- Refactor and cosmetic surgery here and there.
- Track Service config changes and allow redeploy if it changes.
This commit is contained in:
Andras Bacsai
2021-03-30 23:35:22 +02:00
committed by GitHub
parent a1cccd479e
commit 767c65ab10
16 changed files with 122 additions and 116 deletions

View File

@@ -19,8 +19,9 @@
initConf,
} from "@store";
import { toast } from "@zerodevx/svelte-toast";
import packageJson from "../../package.json";
import { onMount } from "svelte";
import compareVersions from 'compare-versions';
import packageJson from "../../package.json";
let upgradeAvailable = false;
let upgradeDisabled = false;
@@ -73,18 +74,14 @@
}
}
async function checkUpgrade() {
const branch = process.env.NODE_ENV === 'production' && window.location.hostname !== 'test.andrasbacsai.dev' ? 'main' : 'next'
latest = await window
.fetch(
"https://raw.githubusercontent.com/coollabsio/coolify/main/package.json",
`https://raw.githubusercontent.com/coollabsio/coolify/${branch}/package.json`,
{ cache: "no-cache" },
)
.then(r => r.json());
if (
latest.version.split(".").join("") >
packageJson.version.split(".").join("")
) {
return true;
}
return compareVersions(latest.version,packageJson.version)
}
</script>
@@ -214,24 +211,24 @@
<div
class="cursor-pointer text-xs font-bold text-warmGray-400 py-2 hover:bg-warmGray-700 w-full text-center"
>
v{packageJson.version}
{packageJson.version}
</div>
</div>
</nav>
{/if}
{#if upgradeAvailable}
<footer
class="absolute top-0 right-0 p-2 w-auto rounded-tl text-white "
class="absolute bottom-0 right-0 p-4 px-6 w-auto rounded-tl text-white "
>
<div class="flex items-center">
<div></div>
<div class="flex-1"></div>
{#if !upgradeDisabled}
<button
class="bg-gradient-to-r from-purple-500 via-pink-500 to-red-500 font-bold text-xs rounded px-2 py-2"
class="bg-gradient-to-r from-purple-500 via-pink-500 to-red-500 text-xs font-bold rounded px-2 py-2"
disabled="{upgradeDisabled}"
on:click="{upgrade}"
>New version available. <br>Click here to upgrade!</button
>New version available, <br>click here to upgrade!</button
>
{:else if upgradeDone}
<button