Shiloh/lasthourcloud
Shiloh/lasthourcloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

fix: build image

Browse Source
This commit is contained in:
Andras Bacsai 2022-05-02 13:00:13 +02:00
parent 1905db16e8
commit b92bc9eebb
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/lib/buildPacks/common.ts
View File

@ -6,7 +6,17 @@ import { promises as fs } from 'fs';
import { staticDeployments } from '$lib/components/common'; import { staticDeployments } from '$lib/components/common';
const staticApps = ['static', 'react', 'vuejs', 'svelte', 'gatsby', 'astro', 'eleventy']; const staticApps = ['static', 'react', 'vuejs', 'svelte', 'gatsby', 'astro', 'eleventy'];
const nodeBased = ['react', 'vuejs', 'svelte', 'gatsby', 'php', 'astro', 'eleventy', 'node']; const nodeBased = [
'react',
'vuejs',
'svelte',
'gatsby',
'php',
'astro',
'eleventy',
'node',
'nestjs'
];
export function makeLabelForStandaloneApplication({ export function makeLabelForStandaloneApplication({
applicationId, applicationId,
@ -393,12 +403,7 @@ export function setDefaultBaseImage(buildPack) {
label: 'webdevops/php-nginx:7.1-alpine' label: 'webdevops/php-nginx:7.1-alpine'
} }
]; ];
const laravelVersions = [
{
value: 'webdevops/php-apache:8.0-alpine',
label: 'webdevops/php-apache:8.0-alpine'
}
];
let payload = { let payload = {
baseImage: null, baseImage: null,
baseBuildImage: null, baseBuildImage: null,
@ -408,6 +413,8 @@ export function setDefaultBaseImage(buildPack) {
if (nodeBased.includes(buildPack)) { if (nodeBased.includes(buildPack)) {
payload.baseImage = 'node:lts'; payload.baseImage = 'node:lts';
payload.baseImages = nodeVersions; payload.baseImages = nodeVersions;
payload.baseBuildImage = 'node:lts';
payload.baseBuildImages = nodeVersions;
} }
if (staticApps.includes(buildPack)) { if (staticApps.includes(buildPack)) {
payload.baseImage = 'webdevops/nginx:alpine'; payload.baseImage = 'webdevops/nginx:alpine';

5
src/lib/store.ts
View File

@ -1,3 +1,4 @@
import { browser } from '$app/env';
import { writable, type Writable, type Readable, readable } from 'svelte/store'; import { writable, type Writable, type Readable, readable } from 'svelte/store';
export const gitTokens: Writable<{ githubToken: string | null; gitlabToken: string | null }> = export const gitTokens: Writable<{ githubToken: string | null; gitlabToken: string | null }> =
@ -8,6 +9,6 @@ export const gitTokens: Writable<{ githubToken: string | null; gitlabToken: stri
export const disabledButton: Writable<boolean> = writable(false); export const disabledButton: Writable<boolean> = writable(false);
export const features: Readable<{ latestVersion: string; beta: boolean }> = readable({ export const features: Readable<{ latestVersion: string; beta: boolean }> = readable({
beta: window.localStorage.getItem('beta') === 'true', beta: browser && window.localStorage.getItem('beta') === 'true',
latestVersion: window.localStorage.getItem('latestVersion') latestVersion: browser && window.localStorage.getItem('latestVersion')
}); });