Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

auto push image #38

Merged
merged 2 commits into from
Jan 11, 2024
Merged

auto push image #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04008f3
add auto push image
peng9808 Jan 11, 2024
e2130ff
auto ss
peng9808 Jan 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/release-drbd9-images.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:
branches: [ "main" ]
paths:
- 'docker-drbd9/**'
- "helm/drbd-adapter/Chart.yaml"
- '.github/workflow/release-drbd9-images.yml'

jobs:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/release-shipper-images.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:
branches: [ "main" ]
paths:
- 'docker-shipper/*'
- "helm/drbd-adapter/Chart.yaml"
- '.github/workflow/release-shipper-images.yml'

jobs:
Expand Down
2 changes: 1 addition & 1 deletion docker-drbd9/entry.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ if grep -q '^drbd ' /proc/modules; then

[[ $LB_FAIL_IF_USERMODE_HELPER_NOT_DISABLED == yes ]] && ! grep -qw disabled /sys/module/drbd/parameters/usermode_helper &&
die "- load the drbd module on the host with the module parameter 'usermode_helper=disabled' OR\n- let this container handle that for you by not already loading the drbd module on the host"

export DRBD_EXIST='yes'
exit 0
fi

Expand Down
5 changes: 5 additions & 0 deletions docker-shipper/entrypoint.adapter.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,17 @@ fi

## Main Logic
# If no shipped module is found, then compile from source
export DRBD_EXIST='no'
echo "OS_KERNEL:$1"
export OS_KERNEL=$1
if LB_HOW=shipped_modules bash -x /entry.sh ; then
echo "Successfully loaded shipped module"
elif LB_HOW=compile bash -x /entry.sh ; then
echo "Successfully loaded compiled module"
fi

echo "DRBD_EXIST:$DRBD_EXIST"
echo "DRBD_RMP_INSTALL:$DRBD_RMP_INSTALL"
#If the installation through rpm is successful, exit directly.
if [[ $DRBD_RMP_INSTALL == 'yes' ]];then
echo "Successfully installed rbd using rpm package"
Expand Down