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

Match PHP docker image to production #621

Merged
merged 1 commit into from
Aug 21, 2023

Conversation

jerico
Copy link
Contributor

@jerico jerico commented Aug 18, 2023

Fixes #620

@jerico jerico requested review from joehoyle and a team August 18, 2023 09:17
@hm-backport
Copy link

hm-backport bot commented Aug 21, 2023

The backport to v14-branch failed:

Commits ["3dd25ae7c0207619840d7fa9c593c1e398c79d83"] could not be cherry-picked on top of v14-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 v14-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 3dd25ae7c0207619840d7fa9c593c1e398c79d83
# Create a new branch with these backported commits.
git checkout -b backport-621-to-v14-branch
# Push it to GitHub.
git push --set-upstream origin backport-621-to-v14-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 v14-branch and the compare/head branch is backport-621-to-v14-branch.

@hm-backport
Copy link

hm-backport bot commented Aug 21, 2023

The backport to v13-branch failed:

Commits ["3dd25ae7c0207619840d7fa9c593c1e398c79d83"] could not be cherry-picked on top of v13-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 v13-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 3dd25ae7c0207619840d7fa9c593c1e398c79d83
# Create a new branch with these backported commits.
git checkout -b backport-621-to-v13-branch
# Push it to GitHub.
git push --set-upstream origin backport-621-to-v13-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 v13-branch and the compare/head branch is backport-621-to-v13-branch.

@joehoyle
Copy link
Member

@jerico I had to manually backport to v14 & 13, as we don't have PHP 8.2 support there it caused a conflict. Could you review #625 and #624

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.

PHP images version should be up to date with infrastructure version
2 participants