diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/common-utils/devcontainer-feature.json | 2 | ||||
| -rw-r--r-- | src/common-utils/main.sh | 18 |
2 files changed, 16 insertions, 4 deletions
diff --git a/src/common-utils/devcontainer-feature.json b/src/common-utils/devcontainer-feature.json index d708482..4eaef21 100644 --- a/src/common-utils/devcontainer-feature.json +++ b/src/common-utils/devcontainer-feature.json @@ -1,6 +1,6 @@ { "id": "common-utils", - "version": "2.1.0", + "version": "2.1.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.", diff --git a/src/common-utils/main.sh b/src/common-utils/main.sh index d3f7ef2..3731994 100644 --- a/src/common-utils/main.sh +++ b/src/common-utils/main.sh @@ -175,6 +175,11 @@ install_redhat_packages() { man-db \ strace" + local install_cmd=dnf + if ! type dnf > /dev/null 2>&1; then + install_cmd=yum + fi + # rockylinux:9 installs 'curl-minimal' which clashes with 'curl' # Install 'curl' for every OS except this rockylinux:9 if [[ "${ID}" = "rocky" ]] && [[ "${VERSION}" != *"9."* ]]; then @@ -201,16 +206,23 @@ install_redhat_packages() { package_list="${package_list} zsh" fi - local install_cmd=dnf - if ! type dnf > /dev/null 2>&1; then - install_cmd=yum + # Install EPEL repository if needed (required to install 'jq' for CentOS) + local remove_epel="false" + if ! ${install_cmd} -q list jq >/dev/null 2>&1; then + ${install_cmd} -y install epel-release + remove_epel="true" fi + ${install_cmd} -y install ${package_list} # Get to latest versions of all packages if [ "${UPGRADE_PACKAGES}" = "true" ]; then ${install_cmd} upgrade -y fi + + if [[ "${remove_epel}" = "true" ]]; then + ${install_cmd} -y remove epel-release + fi } # Alpine Linux packages |