Unverified Commit fede4055 authored by Mark Phippard's avatar Mark Phippard Committed by GitHub

Add support for mariner (#344)

parent 9af65a01
...@@ -289,7 +289,7 @@ chmod +x /etc/profile.d/00-restore-env.sh ...@@ -289,7 +289,7 @@ chmod +x /etc/profile.d/00-restore-env.sh
# Get an adjusted ID independant of distro variants # Get an adjusted ID independant of distro variants
if [ "${ID}" = "debian" ] || [ "${ID_LIKE}" = "debian" ]; then if [ "${ID}" = "debian" ] || [ "${ID_LIKE}" = "debian" ]; then
ADJUSTED_ID="debian" 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" ADJUSTED_ID="rhel"
elif [ "${ID}" = "alpine" ]; then elif [ "${ID}" = "alpine" ]; then
ADJUSTED_ID="alpine" ADJUSTED_ID="alpine"
......
#!/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
...@@ -62,6 +62,13 @@ ...@@ -62,6 +62,13 @@
"common-utils": {} "common-utils": {}
} }
}, },
"mariner": {
"image": "mcr.microsoft.com/cbl-mariner/base/core:2.0",
"remoteUser": "devcontainer",
"features": {
"common-utils": {}
}
},
"alpine": { "alpine": {
"image": "alpine", "image": "alpine",
"remoteUser": "devcontainer", "remoteUser": "devcontainer",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment