Merge branch 'canary' into 3197-requests-page-started-showing-my-own-dashboard-requests

packages/server/src/utils/backups/index.ts

@@ -25,7 +25,7 @@ export const initCronJobs = async () => {
 		return;
 	}
 
-	if (admin.user.enableDockerCleanup) {
+	if (admin?.user?.enableDockerCleanup) {
 		scheduleJob("docker-cleanup", "0 0 * * *", async () => {
 			console.log(
 				`Docker Cleanup ${new Date().toLocaleString()}]  Running docker cleanup`,

packages/server/src/utils/builders/docker-file.ts

@@ -8,6 +8,7 @@ import {
 	getDockerContextPath,
 } from "../filesystem/directory";
 import type { ApplicationNested } from ".";
+import { createEnvFileCommand } from "./utils";
 
 export const getDockerCommand = (application: ApplicationNested) => {
 	const {
@@ -18,6 +19,7 @@ export const getDockerCommand = (application: ApplicationNested) => {
 		buildSecrets,
 		dockerBuildStage,
 		cleanCache,
+		createEnvFile,
 	} = application;
 	const dockerFilePath = getBuildAppDirectory(application);
 
@@ -60,6 +62,21 @@ export const getDockerCommand = (application: ApplicationNested) => {
 			.map(([key, value]) => `${key}=${quote([value])}`)
 			.join(" ");
 
+		/*
+			Do not generate an environment file when publishDirectory is specified,
+			as it could be publicly exposed.
+			Also respect the createEnvFile flag.
+		*/
+		let command = "";
+		if (!publishDirectory && createEnvFile) {
+			command += createEnvFileCommand(
+				dockerFilePath,
+				env,
+				application.environment.project.env,
+				application.environment.env,
+			);
+		}
+
 		for (const key in secrets) {
 			// Although buildx is smart enough to know we may be referring to an environment variable name,
 			// we still make sure it doesn't fall back to `type=file`.
@@ -67,7 +84,7 @@ export const getDockerCommand = (application: ApplicationNested) => {
 			commandArgs.push("--secret", `type=env,id=${key}`);
 		}
 
-		const command = `
+		command += `
 echo "Building ${appName}" ;
 cd ${dockerContextPath} || { 
   echo "❌ The path ${dockerContextPath} does not exist" ;