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

Add docker configuration for gd library #816

Merged

Conversation

Amoifr
Copy link
Contributor

@Amoifr Amoifr commented Jul 31, 2024

Q A
License MIT

What's in this PR?

Add docker configuration for gd library

Why?

Because it wasn"t present when I need ;-)

@alexander-schranz alexander-schranz changed the base branch from 2.x to 2.5 July 31, 2024 14:55
@alexander-schranz
Copy link
Member

@Amoifr Thx for working on this. Can you please rebase your merge request to 2.5 version.

@Amoifr Amoifr force-pushed the Add_docker_configuration_for_gd_library branch from b92ff54 to 9121ff7 Compare July 31, 2024 15:41
@Amoifr
Copy link
Contributor Author

Amoifr commented Jul 31, 2024

I've rebased my branch

@alexander-schranz
Copy link
Member

In the rebase to 2.5 you need to drop the commits which are not yours:

git rebase --interactive origin/2.6 --onto origin/2.5

Should handle that if there still commits which are drop them and then do a force push to your branch:

git push <yourremote> --force

@Amoifr
Copy link
Contributor Author

Amoifr commented Aug 1, 2024

I do the rebase but I still have some changes not of my production

@alexander-schranz alexander-schranz force-pushed the Add_docker_configuration_for_gd_library branch from ffa1304 to 417ae3b Compare September 26, 2024 15:54
@alexander-schranz alexander-schranz force-pushed the Add_docker_configuration_for_gd_library branch from 417ae3b to 4c50526 Compare September 26, 2024 16:01
@alexander-schranz alexander-schranz enabled auto-merge (squash) September 26, 2024 16:02
@alexander-schranz alexander-schranz merged commit c0fdc08 into sulu:2.5 Sep 26, 2024
1 check passed
@alexander-schranz
Copy link
Member

@Amoifr Thx did the rebase. On 2.6 branch we support Avif if you want to update that docs also with a pull request it would be awesome.

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.

2 participants