Merge pull request #875 from rushtehrani/fix/main-container

fix: Add ONEPANEL_MAIN_CONTAINER env var to all Workspaces

Author: Vafilor

db/yaml/workspaces/jupyterlab/20210129142057.yaml

@@ -8,6 +8,8 @@ containers:
         value: "'{'headers':{'Content-Security-Policy':\"frame-ancestors\ *\ 'self'\"}}'"
       - name: TENSORBOARD_PROXY_URL
         value: '//$(ONEPANEL_RESOURCE_UID)--$(ONEPANEL_RESOURCE_NAMESPACE).$(ONEPANEL_DOMAIN)/tensorboard'
+      - name: ONEPANEL_MAIN_CONTAINER
+        value: 'true'
     ports:
       - containerPort: 8888
         name: jupyterlab

db/yaml/workspaces/vscode/20210129152427.yaml

@@ -2,6 +2,9 @@ containers:
   - name: vscode
     image: onepanel/vscode:1.0.0
     command: ["/bin/bash", "-c", "pip install onepanel-sdk && /usr/bin/entrypoint.sh --bind-addr 0.0.0.0:8080 --auth none ."]
+    env:
+      - name: ONEPANEL_MAIN_CONTAINER
+        value: 'true'
     ports:
       - containerPort: 8080
         name: vscode

pkg/workspace.go

@@ -315,11 +315,6 @@ func (c *Client) addRuntimeFieldsToWorkspaceTemplate(t wfv1.Template, workspace
 	}
 
 	mainContainerIndex := -1
-	if len(containers) == 2 {
-		// It's 1 because we prepend the node capture container and we want the other container to be main
-		mainContainerIndex = 1
-	}
-
 	for i := range containers {
 		container := containers[i]