Unverified Commit e67f4dc0 authored by Samruddhi Khandale's avatar Samruddhi Khandale Committed by GitHub

Common-utils: Fix build failures for alpine 3.14 & 3.15 (#393)

* Common-utils: Fix build failures for alpine 3.14 & 3.15

* version bump
parent c8f5c3cb
{
"id": "common-utils",
"version": "2.0.5",
"version": "2.0.6",
"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.",
......
......@@ -407,6 +407,8 @@ if [ "${RC_SNIPPET_ALREADY_ADDED}" != "true" ]; then
;;
"alpine")
global_rc_path="/etc/bash/bashrc"
# /etc/bash/bashrc does not exist in alpine 3.14 & 3.15
mkdir -p /etc/bash
;;
esac
cat "${FEATURE_DIR}/scripts/rc_snippet.sh" >> ${global_rc_path}
......
#!/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}" = "alpine"
check "bashrc" ls /etc/bash/bashrc
# Report result
reportResults
\ No newline at end of file
#!/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}" = "alpine"
check "bashrc" ls /etc/bash/bashrc
# Report result
reportResults
\ No newline at end of file
......@@ -115,6 +115,20 @@
}
}
},
"alpine-3-14": {
"image": "alpine:3.14",
"remoteUser": "devcontainer",
"features": {
"common-utils": {}
}
},
"alpine-3-15": {
"image": "alpine:3.15",
"remoteUser": "devcontainer",
"features": {
"common-utils": {}
}
},
"devcontainer-info": {
"build": {
"dockerfile": "Dockerfile"
......
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