xx-info: oracle linux support #53
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
crazy-max
force-pushed
the
oraclelinux
branch
from
7fa66b8
to
5d98157
Compare
crazy-max
commented
Nov 14, 2021
base/Dockerfile
Outdated
Comment on lines
37
to
46
| RUN <<EOT | ||
| #!/usr/bin/env bash | ||
| if ! yum install -y epel-release; then | ||
| if . /etc/os-release 2>/dev/null; then | ||
| if [ "$ID" != "fedora" ]; then | ||
| yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-${VERSION:0:1}.noarch.rpm | ||
| fi | ||
| fi | ||
| fi | ||
| EOT |
There was a problem hiding this comment.
This instruction has been added to be able to install epel-release (extra packages) to make sure bats is available.
tonistiigi
reviewed
Nov 15, 2021
base/test-info-rhel.bats
Outdated
| @@ -2,8 +2,19 @@ | |||
|
|
|||
| load "assert" | |||
|
|
|||
| vendor="rhel" | |||
| if grep <"/etc/redhat-release" "Fedora" 2>/dev/null >/dev/null; then | |||
There was a problem hiding this comment.
maybe put all these inside -f /etc/redhat-release condition.
base/Dockerfile
Outdated
| @@ -33,6 +34,16 @@ RUN --mount=type=cache,target=/pkg-cache \ | |||
| WORKDIR /work | |||
|
|
|||
| FROM ${TEST_BASE_IMAGE} AS test-base-rhel | |||
| RUN <<EOT | |||
| #!/usr/bin/env bash | |||
There was a problem hiding this comment.
why the shebang? and no set -ex
crazy-max
force-pushed
the
oraclelinux
branch
from
5d98157
to
899590c
Compare
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
crazy-max
force-pushed
the
oraclelinux
branch
from
899590c
to
b75e80b
Compare
|
rebased |
tonistiigi
approved these changes
Nov 18, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
follow-up #52 with oracle linux support that was missing
second commit add tests against currently supported rhel distribs (just xx-info test atm)