resolve conflict main

devcontainers · Jan 27, 2024 · 70cfdfe · 70cfdfe
2 parents 0bd3add + 3e0c0ae
commit 70cfdfe
Show file tree

Hide file tree

Showing 8 changed files with 97 additions and 16 deletions.
diff --git a/src/common-utils/devcontainer-feature.json b/src/common-utils/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "common-utils",
-    "version": "2.4.0",
+    "version": "2.4.1",
     "name": "Common Utilities",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/common-utils",
     "description": "Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-root user.",
@@ -66,4 +66,4 @@
             "description": "Add packages from non-free Debian repository? (Debian only)"
         }
     }
-}
+}
diff --git a/src/common-utils/main.sh b/src/common-utils/main.sh
@@ -155,9 +155,12 @@ install_debian_packages() {
 install_redhat_packages() {
     local package_list=""
     local remove_epel="false"
-    local install_cmd=dnf
-    if ! type dnf > /dev/null 2>&1; then
-        install_cmd=yum
+    local install_cmd=microdnf
+    if ! type microdnf > /dev/null 2>&1; then
+        install_cmd=dnf
+        if ! type dnf > /dev/null 2>&1; then
+            install_cmd=yum
+        fi
     fi
 
     if [ "${PACKAGES_ALREADY_INSTALLED}" != "true" ]; then

diff --git a/test/common-utils/alma-8-minimal.sh b/test/common-utils/alma-8-minimal.sh
@@ -0,0 +1,16 @@
+#!/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 "${PLATFORM_ID}" = "platform:el8"
+check "curl" curl --version
+check "jq" jq  --version
+
+# Report result
+reportResults
diff --git a/test/common-utils/alma-8.sh b/test/common-utils/alma-8.sh
@@ -8,7 +8,7 @@ source dev-container-features-test-lib
 # Definition specific tests
 . /etc/os-release
 check "non-root user" test "$(whoami)" = "devcontainer"
-check "distro" test "${PLATFORM_ID}" = "platform:el9"
+check "distro" test "${PLATFORM_ID}" = "platform:el8"
 check "curl" curl --version
 check "jq" jq  --version
 

diff --git a/test/common-utils/alma-9-minimal.sh b/test/common-utils/alma-9-minimal.sh
@@ -0,0 +1,16 @@
+#!/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 "${PLATFORM_ID}" = "platform:el9"
+check "curl" curl --version
+check "jq" jq  --version
+
+# Report result
+reportResults
diff --git a/test/common-utils/rocky-8-minimal.sh b/test/common-utils/rocky-8-minimal.sh
@@ -0,0 +1,16 @@
+#!/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 "${PLATFORM_ID}" = "platform:el8"
+check "curl" curl --version
+check "jq" jq  --version
+
+# Report result
+reportResults
diff --git a/test/common-utils/rocky-9-minimal.sh b/test/common-utils/rocky-9-minimal.sh
@@ -0,0 +1,16 @@
+#!/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 "${PLATFORM_ID}" = "platform:el9"
+check "curl" curl --version
+check "jq" jq  --version
+
+# Report result
+reportResults
diff --git a/test/common-utils/scenarios.json b/test/common-utils/scenarios.json
@@ -41,29 +41,29 @@
             "common-utils": {}
         }
     },
-    "alma-minimal-8": {
-        "image": "almalinux:8-minimal",
+    "alma-8": {
+        "image": "almalinux:8",
         "remoteUser": "devcontainer",
         "features": {
             "common-utils": {}
         }
     },
-    "alma-minimal-9": {
-        "image": "almalinux:9-minimal",
+    "alma-9": {
+        "image": "almalinux:9",
         "remoteUser": "devcontainer",
         "features": {
             "common-utils": {}
         }
     },
-    "alma-8": {
-        "image": "almalinux:8",
+    "alma-8-minimal": {
+        "image": "almalinux:8-minimal",
         "remoteUser": "devcontainer",
         "features": {
             "common-utils": {}
         }
     },
-    "alma-9": {
-        "image": "almalinux:9",
+    "alma-9-minimal": {
+        "image": "almalinux:9-minimal",
         "remoteUser": "devcontainer",
         "features": {
             "common-utils": {}
@@ -76,13 +76,27 @@
             "common-utils": {}
         }
     },
-   "rocky-9": {
+    "rocky-9": {
         "image": "rockylinux:9",
         "remoteUser": "devcontainer",
         "features": {
             "common-utils": {}
         }
     },
+    "rocky-8-minimal": {
+        "image": "rockylinux:8-minimal",
+        "remoteUser": "devcontainer",
+        "features": {
+            "common-utils": {}
+        }
+    },
+    "rocky-9-minimal": {
+        "image": "rockylinux:9-minimal",
+        "remoteUser": "devcontainer",
+        "features": {
+            "common-utils": {}
+        }
+    },
     "fedora": {
         "image": "fedora",
         "remoteUser": "devcontainer",
@@ -237,4 +251,4 @@
             "common-utils": {}
         }
     }
-}
+}