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
fede4055
Unverified
Commit
fede4055
authored
Dec 19, 2022
by
Mark Phippard
Committed by
GitHub
Dec 19, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add support for mariner (#344)
parent
9af65a01
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
1 deletion
+22
-1
main.sh
src/common-utils/main.sh
+1
-1
mariner.sh
test/common-utils/mariner.sh
+14
-0
scenarios.json
test/common-utils/scenarios.json
+7
-0
No files found.
src/common-utils/main.sh
View file @
fede4055
...
...
@@ -289,7 +289,7 @@ chmod +x /etc/profile.d/00-restore-env.sh
# Get an adjusted ID independant of distro variants
if
[
"
${
ID
}
"
=
"debian"
]
||
[
"
${
ID_LIKE
}
"
=
"debian"
]
;
then
ADJUSTED_ID
=
"debian"
elif
[[
"
${
ID
}
"
=
"rhel"
||
"
${
ID
}
"
=
"fedora"
||
"
${
ID
_LIKE
}
"
=
*
"rhel"
*
||
"
${
ID_LIKE
}
"
=
*
"fedora
"
*
]]
;
then
elif
[[
"
${
ID
}
"
=
"rhel"
||
"
${
ID
}
"
=
"fedora"
||
"
${
ID
}
"
=
"mariner"
||
"
${
ID_LIKE
}
"
=
*
"rhel"
*
||
"
${
ID_LIKE
}
"
=
*
"fedora"
*
||
"
${
ID_LIKE
}
"
=
*
"mariner
"
*
]]
;
then
ADJUSTED_ID
=
"rhel"
elif
[
"
${
ID
}
"
=
"alpine"
]
;
then
ADJUSTED_ID
=
"alpine"
...
...
test/common-utils/mariner.sh
0 → 100755
View file @
fede4055
#!/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
}
"
=
"mariner"
# Report result
reportResults
\ No newline at end of file
test/common-utils/scenarios.json
View file @
fede4055
...
...
@@ -62,6 +62,13 @@
"common-utils"
:
{}
}
},
"mariner"
:
{
"image"
:
"mcr.microsoft.com/cbl-mariner/base/core:2.0"
,
"remoteUser"
:
"devcontainer"
,
"features"
:
{
"common-utils"
:
{}
}
},
"alpine"
:
{
"image"
:
"alpine"
,
"remoteUser"
:
"devcontainer"
,
...
...
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