Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
devcontainer-features
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
eazydevelop-devcontainer-temp
devcontainer-features
Commits
5258a80c
Unverified
Commit
5258a80c
authored
Jan 08, 2024
by
Eljo George
Committed by
GitHub
Jan 08, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Alpine - Install libssl1.1 only if available (#793)
parent
3ea4d6bb
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
29 additions
and
1 deletion
+29
-1
main.sh
src/common-utils/main.sh
+6
-1
alpine-3-18.sh
test/common-utils/alpine-3-18.sh
+16
-0
scenarios.json
test/common-utils/scenarios.json
+7
-0
No files found.
src/common-utils/main.sh
View file @
5258a80c
...
@@ -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
...
...
test/common-utils/alpine-3-18.sh
0 → 100755
View file @
5258a80c
#!/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
test/common-utils/scenarios.json
View file @
5258a80c
...
@@ -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"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment