Unverified Commit 5258a80c authored by Eljo George's avatar Eljo George Committed by GitHub

Alpine - Install libssl1.1 only if available (#793)

parent 3ea4d6bb
...@@ -265,7 +265,6 @@ install_alpine_packages() { ...@@ -265,7 +265,6 @@ install_alpine_packages() {
libstdc++ \ libstdc++ \
krb5-libs \ krb5-libs \
libintl \ libintl \
libssl1.1 \
lttng-ust \ lttng-ust \
tzdata \ tzdata \
userspace-rcu \ userspace-rcu \
...@@ -279,6 +278,12 @@ install_alpine_packages() { ...@@ -279,6 +278,12 @@ install_alpine_packages() {
shadow \ shadow \
strace strace
# # Include libssl1.1 if available (not available for 3.19 and newer)
LIBSSL1_PKG=libssl1.1
if [[ $(apk search --no-cache -a $LIBSSL1_PKG | grep $LIBSSL1_PKG) ]]; then
apk add --no-cache $LIBSSL1_PKG
fi
# Install man pages - package name varies between 3.12 and earlier versions # Install man pages - package name varies between 3.12 and earlier versions
if apk info man > /dev/null 2>&1; then if apk info man > /dev/null 2>&1; then
apk add --no-cache man man-pages apk add --no-cache man man-pages
......
#!/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
check "libssl1.1 is installed" grep "libssl1.1" <(apk list --no-cache libssl1.1)
# Report result
reportResults
\ No newline at end of file
...@@ -162,6 +162,13 @@ ...@@ -162,6 +162,13 @@
"common-utils": {} "common-utils": {}
} }
}, },
"alpine-3-18": {
"image": "alpine:3.18",
"remoteUser": "devcontainer",
"features": {
"common-utils": {}
}
},
"devcontainer-info": { "devcontainer-info": {
"build": { "build": {
"dockerfile": "Dockerfile" "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