fix: allow devfile env vars to reference $PROJECT_SOURCE & $PROJECT_ROOT

Environment variables defined in a kubernetes container can only reference other environment variables that are declared earlier in the list of container environment variables. This change ensures that the $PROJECT_SOURCE and $PROJECT_ROOT devfile environment variables are the first environment variables defined in all workspace pod containers so that devfile environment variables can reference $PROJECT_SOURCE and $PROJECT_ROOT. Fix #1274 Signed-off-by: Andrew Obuchowicz <[email protected]>
devfile · Jun 28, 2024 · ae31bc4 · ae31bc4
1 parent 1360f21
commit ae31bc4
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/pkg/library/container/mountSources.go b/pkg/library/container/mountSources.go
@@ -81,13 +81,17 @@ func handleMountSources(k8sContainer *corev1.Container, devfileContainer *dw.Con
 		return err
 	}
 
-	k8sContainer.Env = append(k8sContainer.Env, corev1.EnvVar{
-		Name:  devfileConstants.ProjectsRootEnvVar,
-		Value: sourceMapping,
-	}, corev1.EnvVar{
-		Name:  devfileConstants.ProjectsSourceEnvVar,
-		Value: path.Join(sourceMapping, projectsSourcePath),
-	})
+	// The $PROJECT_ROOT and $PROJECT_SOURCE environment variables must be the first
+	// environment variables defined in the container so that other environment variables can reference them.
+	k8sContainer.Env = append([]corev1.EnvVar{
+		{
+			Name:  devfileConstants.ProjectsRootEnvVar,
+			Value: sourceMapping,
+		},
+		{
+			Name:  devfileConstants.ProjectsSourceEnvVar,
+			Value: path.Join(sourceMapping, projectsSourcePath),
+		}}, k8sContainer.Env...)
 
 	return nil
 }