Merge pull request #318 from CharcoalStyles/exposePort

Added expose port for applications

src/lib/components/common.ts

@@ -215,3 +215,11 @@ export const supportedServiceTypesAndVersions = [
 		}
 	}
 ];
+
+export const getServiceMainPort = (service: string) => {
+	const serviceType = supportedServiceTypesAndVersions.find((s) => s.name === service);
+	if (serviceType) {
+		return serviceType.ports.main;
+	}
+	return null;
+};

src/lib/database/applications.ts

@@ -278,6 +278,7 @@ export async function configureApplication({
 	name,
 	fqdn,
 	port,
+	exposePort,
 	installCommand,
 	buildCommand,
 	startCommand,
@@ -297,6 +298,7 @@ export async function configureApplication({
 	name: string;
 	fqdn: string;
 	port: number;
+	exposePort: number;
 	installCommand: string;
 	buildCommand: string;
 	startCommand: string;
@@ -318,6 +320,7 @@ export async function configureApplication({
 			buildPack,
 			fqdn,
 			port,
+			exposePort,
 			installCommand,
 			buildCommand,
 			startCommand,

src/lib/database/services.ts

@@ -327,35 +327,40 @@ export async function updatePlausibleAnalyticsService({
 	id,
 	fqdn,
 	email,
+	exposePort,
 	username,
 	name
 }: {
 	id: string;
 	fqdn: string;
+	exposePort?: number;
 	name: string;
 	email: string;
 	username: string;
 }): Promise<void> {
 	await prisma.plausibleAnalytics.update({ where: { serviceId: id }, data: { email, username } });
-	await prisma.service.update({ where: { id }, data: { name, fqdn } });
+	await prisma.service.update({ where: { id }, data: { name, fqdn, exposePort } });
 }
 
 export async function updateService({
 	id,
 	fqdn,
+	exposePort,
 	name
 }: {
 	id: string;
 	fqdn: string;
+	exposePort?: number;
 	name: string;
 }): Promise<Service> {
-	return await prisma.service.update({ where: { id }, data: { fqdn, name } });
+	return await prisma.service.update({ where: { id }, data: { fqdn, name, exposePort } });
 }
 
 export async function updateFiderService({
 	id,
 	fqdn,
 	name,
+	exposePort,
 	emailNoreply,
 	emailMailgunApiKey,
 	emailMailgunDomain,
@@ -368,6 +373,7 @@ export async function updateFiderService({
 }: {
 	id: string;
 	fqdn: string;
+	exposePort?: number;
 	name: string;
 	emailNoreply: string;
 	emailMailgunApiKey: string;
@@ -384,6 +390,7 @@ export async function updateFiderService({
 		data: {
 			fqdn,
 			name,
+			exposePort,
 			fider: {
 				update: {
 					emailNoreply,
@@ -405,18 +412,20 @@ export async function updateWordpress({
 	id,
 	fqdn,
 	name,
+	exposePort,
 	mysqlDatabase,
 	extraConfig
 }: {
 	id: string;
 	fqdn: string;
 	name: string;
+	exposePort?: number;
 	mysqlDatabase: string;
 	extraConfig: string;
 }): Promise<Service> {
 	return await prisma.service.update({
 		where: { id },
-		data: { fqdn, name, wordpress: { update: { mysqlDatabase, extraConfig } } }
+		data: { fqdn, name, exposePort, wordpress: { update: { mysqlDatabase, extraConfig } } }
 	});
 }
 
@@ -434,16 +443,18 @@ export async function updateGhostService({
 	id,
 	fqdn,
 	name,
+	exposePort,
 	mariadbDatabase
 }: {
 	id: string;
 	fqdn: string;
 	name: string;
+	exposePort?: number;
 	mariadbDatabase: string;
 }): Promise<Service> {
 	return await prisma.service.update({
 		where: { id },
-		data: { fqdn, name, ghost: { update: { mariadbDatabase } } }
+		data: { fqdn, name, exposePort, ghost: { update: { mariadbDatabase } } }
 	});
 }
 

src/lib/locales/en.json

@@ -204,6 +204,7 @@
 		"enable_automatic_deployment": "Enable Automatic Deployment",
 		"enable_auto_deploy_webhooks": "Enable automatic deployment through webhooks.",
 		"enable_mr_pr_previews": "Enable MR/PR Previews",
+		"expose_a_port": "Expose a port",
 		"enable_preview_deploy_mr_pr_requests": "Enable preview deployments from pull or merge requests.",
 		"debug_logs": "Debug Logs",
 		"enable_debug_log_during_build": "Enable debug logs during build phase.<br><span class='text-red-500 font-bold'>Sensitive information</span> could be visible and saved in logs.",

src/lib/locales/fr.json

@@ -61,6 +61,7 @@
 		"enable_debug_log_during_build": "Activez les journaux de débogage pendant la phase de build.<br><span class='text-red-500 font-bold'>Les informations sensibles</span> peuvent être visibles et enregistrées dans les journaux.",
 		"enable_mr_pr_previews": "Activer les aperçus MR/PR",
 		"enable_preview_deploy_mr_pr_requests": "Activez les déploiements de prévisualisation à partir de demandes d'extraction ou de fusion.",
+		"expose_a_port": "Exposer un port",
 		"features": "Caractéristiques",
 		"git_repository": "Dépôt Git",
 		"git_source": "Source Git",

src/lib/queues/builder.ts

@@ -48,6 +48,7 @@ export default async function (job: Job<BuilderJob, void, string>): Promise<void
 		pythonModule,
 		pythonVariable,
 		denoOptions,
+		exposePort,
 		baseImage,
 		baseBuildImage
 	} = job.data;
@@ -152,6 +153,7 @@ export default async function (job: Job<BuilderJob, void, string>): Promise<void
 					JSON.stringify({
 						buildPack,
 						port,
+						exposePort,
 						installCommand,
 						buildCommand,
 						startCommand,
@@ -207,7 +209,7 @@ export default async function (job: Job<BuilderJob, void, string>): Promise<void
 					tag,
 					workdir,
 					docker,
-					port,
+					port: exposePort ? `${exposePort}:${port}` : port,
 					installCommand,
 					buildCommand,
 					startCommand,
@@ -263,7 +265,7 @@ export default async function (job: Job<BuilderJob, void, string>): Promise<void
 			repository,
 			branch,
 			projectId,
-			port,
+			port: exposePort ? `${exposePort}:${port}` : port,
 			commit,
 			installCommand,
 			buildCommand,
@@ -298,6 +300,7 @@ export default async function (job: Job<BuilderJob, void, string>): Promise<void
 						labels,
 						depends_on: [],
 						restart: 'always',
+						...(exposePort ? { ports: [`${exposePort}:${port}`] } : {}),
 						// logging: {
 						// 	driver: 'fluentd',
 						// },

src/lib/types/builderJob.ts

@@ -12,6 +12,7 @@ export type BuilderJob = {
 	buildPack: BuildPackName;
 	projectId: number;
 	port: number;
+	exposePort?: number;
 	installCommand: string;
 	buildCommand?: string;
 	startCommand?: string;

src/lib/types/composeFile.ts

@@ -18,6 +18,7 @@ export type ComposeFileService = {
 	restart: ComposeFileRestartOption;
 	depends_on?: string[];
 	command?: string;
+	ports?: string[];
 	build?: {
 		context: string;
 		dockerfile: string;