Skip to content

Update docker.md#2375

Merged
Naarcha-AWS merged 1 commit intoopensearch-project:mainfrom
justinhyou:patch-1
Jan 24, 2023
Merged

Update docker.md#2375
Naarcha-AWS merged 1 commit intoopensearch-project:mainfrom
justinhyou:patch-1

Conversation

@justinhyou
Copy link
Contributor

@justinhyou justinhyou commented Jan 11, 2023

Description

Fixes a typo.

Issues Resolved

N/A

Checklist

  • By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license and subject to the Developers Certificate of Origin.
    For more information on following Developer Certificate of Origin and signing off your commits, please check here.

@justinhyou justinhyou requested a review from a team as a code owner January 11, 2023 04:39
@Naarcha-AWS Naarcha-AWS added backport 1.3 PR: Backport label for v1.3.x backport 2.0 PR: Backport label for v2.0.x backport 2.1 PR: Backport label for 2.1 backport 2.2 PR: Backport label for 2.2 backport 2.3 PR: Backport label for 2.3 backport 2.4 PR: Backport label for 2.4 backport 2.5 PR: Backport label for 2.5 labels Jan 24, 2023
@Naarcha-AWS Naarcha-AWS merged commit 9343387 into opensearch-project:main Jan 24, 2023
@opensearch-trigger-bot
Copy link
Contributor

The backport to 1.3 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-1.3 1.3
# Navigate to the new working tree
cd .worktrees/backport-1.3
# Create a new branch
git switch --create backport/backport-2375-to-1.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 93433871c4ab416d73ab5768cbb2b37ca82ae3a3
# Push it to GitHub
git push --set-upstream origin backport/backport-2375-to-1.3
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.3

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

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.0 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.0 2.0
# Navigate to the new working tree
cd .worktrees/backport-2.0
# Create a new branch
git switch --create backport/backport-2375-to-2.0
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 93433871c4ab416d73ab5768cbb2b37ca82ae3a3
# Push it to GitHub
git push --set-upstream origin backport/backport-2375-to-2.0
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.0

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

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.1 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.1 2.1
# Navigate to the new working tree
cd .worktrees/backport-2.1
# Create a new branch
git switch --create backport/backport-2375-to-2.1
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 93433871c4ab416d73ab5768cbb2b37ca82ae3a3
# Push it to GitHub
git push --set-upstream origin backport/backport-2375-to-2.1
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.1

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

opensearch-trigger-bot bot pushed a commit that referenced this pull request Jan 24, 2023
(cherry picked from commit 9343387)
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jan 24, 2023
(cherry picked from commit 9343387)
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jan 24, 2023
(cherry picked from commit 9343387)
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jan 24, 2023
(cherry picked from commit 9343387)
Naarcha-AWS pushed a commit that referenced this pull request Jan 24, 2023
(cherry picked from commit 9343387)

Co-authored-by: Hyobin (Justin) You <hy002014@mymail.pomona.edu>
Naarcha-AWS pushed a commit that referenced this pull request Jan 24, 2023
(cherry picked from commit 9343387)

Co-authored-by: Hyobin (Justin) You <hy002014@mymail.pomona.edu>
Naarcha-AWS pushed a commit that referenced this pull request Jan 24, 2023
(cherry picked from commit 9343387)

Co-authored-by: Hyobin (Justin) You <hy002014@mymail.pomona.edu>
Naarcha-AWS pushed a commit that referenced this pull request Jan 24, 2023
(cherry picked from commit 9343387)

Co-authored-by: Hyobin (Justin) You <hy002014@mymail.pomona.edu>
vagimeli pushed a commit that referenced this pull request Jan 25, 2023
vagimeli added a commit that referenced this pull request Jan 26, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport 1.3 PR: Backport label for v1.3.x backport 2.0 PR: Backport label for v2.0.x backport 2.1 PR: Backport label for 2.1 backport 2.2 PR: Backport label for 2.2 backport 2.3 PR: Backport label for 2.3 backport 2.4 PR: Backport label for 2.4 backport 2.5 PR: Backport label for 2.5

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants