diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index d906938e..e13b5b10 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -3,6 +3,7 @@ on: pull_request: branches: - main + - canary jobs: build: runs-on: ubuntu-20.04 diff --git a/components/dashboard/application/domains/add-domain.tsx b/components/dashboard/application/domains/add-domain.tsx index a910ea3e..40aba88d 100644 --- a/components/dashboard/application/domains/add-domain.tsx +++ b/components/dashboard/application/domains/add-domain.tsx @@ -210,7 +210,7 @@ export const AddDomain = ({
HTTPS - Automatically will have SSL Certificate. + Automatically provision SSL Certificate.
diff --git a/components/dashboard/application/domains/update-domain.tsx b/components/dashboard/application/domains/update-domain.tsx index f0896e6b..aae05b05 100644 --- a/components/dashboard/application/domains/update-domain.tsx +++ b/components/dashboard/application/domains/update-domain.tsx @@ -228,7 +228,7 @@ export const UpdateDomain = ({ domainId }: Props) => {
HTTPS - Automatically will have SSL Certificate. + Automatically provision SSL Certificate.
diff --git a/server/utils/builders/heroku.ts b/server/utils/builders/heroku.ts index bf598c42..bd2ed543 100644 --- a/server/utils/builders/heroku.ts +++ b/server/utils/builders/heroku.ts @@ -6,35 +6,35 @@ import type { WriteStream } from "node:fs"; // TODO: integrate in the vps sudo chown -R $(whoami) ~/.docker export const buildHeroku = async ( - application: ApplicationNested, - writeStream: WriteStream, + application: ApplicationNested, + writeStream: WriteStream, ) => { - const { env, appName } = application; - const buildAppDirectory = getBuildAppDirectory(application); - const envVariables = prepareEnvironmentVariables(env); - try { - const args = [ - "build", - appName, - "--path", - buildAppDirectory, - "--builder", - "heroku/builder:22", - ]; + const { env, appName } = application; + const buildAppDirectory = getBuildAppDirectory(application); + const envVariables = prepareEnvironmentVariables(env); + try { + const args = [ + "build", + appName, + "--path", + buildAppDirectory, + "--builder", + "heroku/builder:22", + ]; - for (const env in envVariables) { - args.push("--env", env); - } + for (const env of envVariables) { + args.push("--env", env); + } - await spawnAsync("pack", args, (data) => { - if (writeStream.writable) { - writeStream.write(data); - } - // Stream the data - console.log(data); - }); - return true; - } catch (e) { - throw e; - } + await spawnAsync("pack", args, (data) => { + if (writeStream.writable) { + writeStream.write(data); + } + // Stream the data + console.log(data); + }); + return true; + } catch (e) { + throw e; + } }; diff --git a/server/utils/builders/nixpacks.ts b/server/utils/builders/nixpacks.ts index 798fac33..d3439faa 100644 --- a/server/utils/builders/nixpacks.ts +++ b/server/utils/builders/nixpacks.ts @@ -6,25 +6,26 @@ import type { WriteStream } from "node:fs"; // TODO: integrate in the vps sudo chown -R $(whoami) ~/.docker export const buildNixpacks = async ( - application: ApplicationNested, - writeStream: WriteStream, + application: ApplicationNested, + writeStream: WriteStream, ) => { - const { env, appName } = application; - const buildAppDirectory = getBuildAppDirectory(application); - const envVariables = prepareEnvironmentVariables(env); - try { - const args = ["build", buildAppDirectory, "--name", appName]; + const { env, appName } = application; + const buildAppDirectory = getBuildAppDirectory(application); + const envVariables = prepareEnvironmentVariables(env); + try { + const args = ["build", buildAppDirectory, "--name", appName]; - for (const env in envVariables) { - args.push("--env", env); - } - await spawnAsync("nixpacks", args, (data) => { - if (writeStream.writable) { - writeStream.write(data); - } - }); - return true; - } catch (e) { - throw e; - } + for (const env of envVariables) { + args.push("--env", env); + } + + await spawnAsync("nixpacks", args, (data) => { + if (writeStream.writable) { + writeStream.write(data); + } + }); + return true; + } catch (e) { + throw e; + } }; diff --git a/server/utils/builders/paketo.ts b/server/utils/builders/paketo.ts index 8baf90a2..b1b9b0a9 100644 --- a/server/utils/builders/paketo.ts +++ b/server/utils/builders/paketo.ts @@ -6,33 +6,33 @@ import { prepareEnvironmentVariables } from "../docker/utils"; // TODO: integrate in the vps sudo chown -R $(whoami) ~/.docker export const buildPaketo = async ( - application: ApplicationNested, - writeStream: WriteStream, + application: ApplicationNested, + writeStream: WriteStream, ) => { - const { env, appName } = application; - const buildAppDirectory = getBuildAppDirectory(application); - const envVariables = prepareEnvironmentVariables(env); - try { - const args = [ - "build", - appName, - "--path", - buildAppDirectory, - "--builder", - "paketobuildpacks/builder-jammy-full", - ]; + const { env, appName } = application; + const buildAppDirectory = getBuildAppDirectory(application); + const envVariables = prepareEnvironmentVariables(env); + try { + const args = [ + "build", + appName, + "--path", + buildAppDirectory, + "--builder", + "paketobuildpacks/builder-jammy-full", + ]; - for (const env in envVariables) { - args.push("--env", env); - } + for (const env of envVariables) { + args.push("--env", env); + } - await spawnAsync("pack", args, (data) => { - if (writeStream.writable) { - writeStream.write(data); - } - }); - return true; - } catch (e) { - throw e; - } + await spawnAsync("pack", args, (data) => { + if (writeStream.writable) { + writeStream.write(data); + } + }); + return true; + } catch (e) { + throw e; + } };