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.

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

Do not remove or stop proxy unless indicated #391

Merged
merged 1 commit into from
Dec 7, 2021

Conversation

roborourke
Copy link
Contributor

Fixes #262

@roborourke roborourke merged commit 120d430 into master Dec 7, 2021
@roborourke roborourke deleted the add-proxy-container-flag branch December 7, 2021 13:36
@hm-backport
Copy link

hm-backport bot commented Dec 7, 2021

The backport to v6-branch failed:

Commits ["9fa9a3b78cb3822cdec9960d1f99a050fa69ea77"] could not be cherry-picked on top of v6-branch

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub.
git fetch
# Create new working tree.
git worktree add .worktrees/backport v6-branch
# Navigate to the new directory.
cd .worktrees/backport
# Cherry-pick all the commits of this pull request and resolve the likely conflicts.
git cherry-pick 9fa9a3b78cb3822cdec9960d1f99a050fa69ea77
# Create a new branch with these backported commits.
git checkout -b backport-391-to-v6-branch
# Push it to GitHub.
git push --set-upstream origin backport-391-to-v6-branch
# Go back to the original working tree.
cd ../..
# Delete the working tree.
git worktree remove .worktrees/backport

Then, create a pull request where the base branch is v6-branch and the compare/head branch is backport-391-to-v6-branch.

@hm-backport
Copy link

hm-backport bot commented Dec 7, 2021

The backport to v7-branch failed:

Commits ["9fa9a3b78cb3822cdec9960d1f99a050fa69ea77"] could not be cherry-picked on top of v7-branch

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub.
git fetch
# Create new working tree.
git worktree add .worktrees/backport v7-branch
# Navigate to the new directory.
cd .worktrees/backport
# Cherry-pick all the commits of this pull request and resolve the likely conflicts.
git cherry-pick 9fa9a3b78cb3822cdec9960d1f99a050fa69ea77
# Create a new branch with these backported commits.
git checkout -b backport-391-to-v7-branch
# Push it to GitHub.
git push --set-upstream origin backport-391-to-v7-branch
# Go back to the original working tree.
cd ../..
# Delete the working tree.
git worktree remove .worktrees/backport

Then, create a pull request where the base branch is v7-branch and the compare/head branch is backport-391-to-v7-branch.

@hm-backport
Copy link

hm-backport bot commented Dec 7, 2021

The backport to v8-branch failed:

Commits ["9fa9a3b78cb3822cdec9960d1f99a050fa69ea77"] could not be cherry-picked on top of v8-branch

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub.
git fetch
# Create new working tree.
git worktree add .worktrees/backport v8-branch
# Navigate to the new directory.
cd .worktrees/backport
# Cherry-pick all the commits of this pull request and resolve the likely conflicts.
git cherry-pick 9fa9a3b78cb3822cdec9960d1f99a050fa69ea77
# Create a new branch with these backported commits.
git checkout -b backport-391-to-v8-branch
# Push it to GitHub.
git push --set-upstream origin backport-391-to-v8-branch
# Go back to the original working tree.
cd ../..
# Delete the working tree.
git worktree remove .worktrees/backport

Then, create a pull request where the base branch is v8-branch and the compare/head branch is backport-391-to-v8-branch.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Shared services, like docker proxy, should not be destroyed by default when a destroy action is run
2 participants