Merge remote-tracking branch 'upstream/next' into feature/glitchtip-service

# Conflicts:
#	apps/api/prisma/schema.prisma
#	apps/api/src/lib/common.ts
#	apps/api/src/lib/serviceFields.ts
#	apps/api/src/routes/api/v1/services/handlers.ts

apps/ui/src/lib/common.ts

@@ -148,6 +148,17 @@ export const supportedServiceTypesAndVersions = [
 			main: 3000
 		}
 	},
+	{
+		name: 'appwrite',
+		fancyName: 'Appwrite',
+		baseImage: 'appwrite/appwrite',
+		images: ['mariadb:10.7', 'redis:6.2-alpine', 'appwrite/telegraf:1.4.0'],
+		versions: ['latest', '0.15.3'],
+		recommendedVersion: '0.15.3',
+		ports: {
+			main: 80
+		}
+	}
 	// {
 	//     name: 'moodle',
 	//     fancyName: 'Moodle',

apps/ui/src/lib/components/svg/services/index.ts

@@ -13,5 +13,6 @@ export { default as MeiliSearch }  from './MeiliSearch.svelte';
 export { default as Umami }  from './Umami.svelte';
 export { default as Hasura }  from './Hasura.svelte';
 export { default as Fider }  from './Fider.svelte';
+export { default as Appwrite }  from './Moodle.svelte';
 export { default as Moodle }  from './Moodle.svelte';
 export { default as GlitchTip }  from './GlitchTip.svelte';

apps/ui/src/lib/templates.ts

@@ -292,8 +292,7 @@ export const buildPacks = [
 		fancyName: 'Deno',
 		hoverColor: 'hover:bg-green-700',
 		color: 'bg-green-700'
-	}
-	// },
+	},
     // {
     //     name: 'heroku',
 	// 	fancyName: 'Heroku Buildpack',