diff --git a/src/user/ServiceManager.ts b/src/user/ServiceManager.ts index b595149..9c86239 100644 --- a/src/user/ServiceManager.ts +++ b/src/user/ServiceManager.ts @@ -166,12 +166,29 @@ class ServiceManager { .getAppsDataStore() .getAppDefinition(appName) .then(function (app) { + const envVars = app.envVars + + const includesGitCommitEnvVar = envVars.find( + (envVar) => envVar.key === 'CAPROVER_GIT_COMMIT_SHA' + ) + const gitHash = + source.captainDefinitionContentSource?.gitHash || + source.uploadedTarPathSource?.gitHash + if (gitHash && !includesGitCommitEnvVar) { + if (gitHash) { + envVars.push({ + key: 'CAPROVER_GIT_COMMIT_SHA', + value: gitHash, + }) + } + } + return self.imageMaker.ensureImage( source, appName, app.captainDefinitionRelativeFilePath, appVersion, - app.envVars + envVars ) }) })