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',