From fede4055495a9d44efbb65848eb7799771d23f9b Mon Sep 17 00:00:00 2001
From: Mark Phippard <markphip@gmail.com>
Date: Mon, 19 Dec 2022 11:25:32 -0500
Subject: [PATCH] Add support for mariner (#344)

---
 src/common-utils/main.sh         |  2 +-
 test/common-utils/mariner.sh     | 14 ++++++++++++++
 test/common-utils/scenarios.json |  7 +++++++
 3 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100755 test/common-utils/mariner.sh

diff --git a/src/common-utils/main.sh b/src/common-utils/main.sh
index 63f64ab..f0fedcf 100644
--- a/src/common-utils/main.sh
+++ b/src/common-utils/main.sh
@@ -289,7 +289,7 @@ chmod +x /etc/profile.d/00-restore-env.sh
 # Get an adjusted ID independant of distro variants
 if [ "${ID}" = "debian" ] || [ "${ID_LIKE}" = "debian" ]; then
     ADJUSTED_ID="debian"
-elif [[ "${ID}" = "rhel" || "${ID}" = "fedora" || "${ID_LIKE}" = *"rhel"* || "${ID_LIKE}" = *"fedora"* ]]; then
+elif [[ "${ID}" = "rhel" || "${ID}" = "fedora" || "${ID}" = "mariner" || "${ID_LIKE}" = *"rhel"* || "${ID_LIKE}" = *"fedora"* || "${ID_LIKE}" = *"mariner"* ]]; then
     ADJUSTED_ID="rhel"
 elif [ "${ID}" = "alpine" ]; then
     ADJUSTED_ID="alpine"
diff --git a/test/common-utils/mariner.sh b/test/common-utils/mariner.sh
new file mode 100755
index 0000000..ab6cb6e
--- /dev/null
+++ b/test/common-utils/mariner.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+. /etc/os-release
+check "non-root user" test "$(whoami)" = "devcontainer"
+check "distro" test "${ID}" = "mariner"
+
+# Report result
+reportResults
\ No newline at end of file
diff --git a/test/common-utils/scenarios.json b/test/common-utils/scenarios.json
index 9b0bc85..bc1c784 100644
--- a/test/common-utils/scenarios.json
+++ b/test/common-utils/scenarios.json
@@ -62,6 +62,13 @@
             "common-utils": {}
         }
     },
+    "mariner": {
+        "image": "mcr.microsoft.com/cbl-mariner/base/core:2.0",
+        "remoteUser": "devcontainer",
+        "features": {
+            "common-utils": {}
+        }
+    },
     "alpine": {
         "image": "alpine",
         "remoteUser": "devcontainer",