From d1972b4d8d2dc75370c236c9dafe505ea42590f2 Mon Sep 17 00:00:00 2001
From: Chuck Lantz <clantz@microsoft.com>
Date: Mon, 28 Nov 2022 17:07:38 -0600
Subject: Use _REMOTE_USER when available (#264)

* Use _REMOTE_USER when available

* Update src/python/install.sh

Co-authored-by: Samruddhi Khandale <skhandale@microsoft.com>

* Update src/python/install.sh

Co-authored-by: Samruddhi Khandale <skhandale@microsoft.com>

* Fix java test issue - JDK 18 not available for the "open" distro

* Bump breakfix numbers

Co-authored-by: Samruddhi Khandale <skhandale@microsoft.com>
Co-authored-by: Josh Spicer <joshspicer@github.com>
---
 src/conda/devcontainer-feature.json | 2 +-
 src/conda/install.sh                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/conda')

diff --git a/src/conda/devcontainer-feature.json b/src/conda/devcontainer-feature.json
index da4c674..8ff6499 100644
--- a/src/conda/devcontainer-feature.json
+++ b/src/conda/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "conda",
-    "version": "1.0.5",
+    "version": "1.0.6",
     "name": "Conda",
     "description": "A cross-platform, language-agnostic binary package manager",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/conda",
diff --git a/src/conda/install.sh b/src/conda/install.sh
index 9b51bbd..6e90882 100644
--- a/src/conda/install.sh
+++ b/src/conda/install.sh
@@ -7,7 +7,7 @@
 VERSION=${VERSION:-"latest"}
 ADD_CONDA_FORGE=$ADDCONDAFORGE
 
-USERNAME="automatic"
+USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
 UPDATE_RC="true"
 CONDA_DIR="/opt/conda"
 
-- 
cgit v1.2.3