From 674b096863a564d5dfe91e0a88ea0061fa79ae71 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Tue, 13 Sep 2022 17:15:51 -0700
Subject: Conda and Java: sync env variables (#153)

* conda script

* Adds JAVA_HOME

* Update src/conda/devcontainer-feature.json

Co-authored-by: Josh Spicer <joshspicer@github.com>

* modify containerEnv

* fix version

* bump python version

Co-authored-by: Josh Spicer <joshspicer@github.com>
---
 src/conda/devcontainer-feature.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/conda/devcontainer-feature.json')

diff --git a/src/conda/devcontainer-feature.json b/src/conda/devcontainer-feature.json
index 50b0940..fdc0d41 100644
--- a/src/conda/devcontainer-feature.json
+++ b/src/conda/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "conda",
-    "version": "1.0.1",
+    "version": "1.0.2",
     "name": "Conda - A cross-platform, language-agnostic binary package manager",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/conda",
     "options": {
@@ -22,6 +22,7 @@
     },
     "containerEnv": {
         "CONDA_DIR": "/opt/conda",
-        "PATH": "${PATH}:${CONDA_DIR}/bin:"
+        "CONDA_SCRIPT":"/opt/conda/etc/profile.d/conda.sh",
+        "PATH": "/opt/conda/bin:${PATH}"
     }
 }
-- 
cgit v1.2.3