Commit graph

13 commits

Author SHA1 Message Date
Karol
756c01ed96
[UPMERGE] 1.13 -> 2.0 (#16119)
This PR has been generated automatically.
For more details see
[upmerge_pr.yaml](/Sylius/Sylius/blob/1.13/.github/workflows/upmerge_pr.yaml).

**Remember!** The upmerge should always be merged with using `Merge pull
request` button.

In case of conflicts, please resolve them manually with usign the
following commands:
```
git fetch upstream
gh pr checkout <this-pr-number>
git merge upstream/2.0 -m "Resolve conflicts between 1.13 and 2.0"
```

If you use other name for the upstream remote, please replace `upstream`
with the name of your remote pointing to the `Sylius/Sylius` repository.

Once the conflicts are resolved, please run `git merge --continue` and
push the changes to this PR.
2024-04-15 10:38:52 +02:00
mihaichitic
60a9434a7f
Update php-entrypoint to give www-data permissions to public/media 2024-04-11 11:21:15 +03:00
Jacob Tobiasz
23760915a2
Resolve conflicts between 1.13 and 2.0 2024-03-14 09:43:51 +01:00
Jan Góralski
7d351c13fe
minor #15992 Provide some Bunnyshell images improvements (jakubtobiasz)
This PR was merged into the 1.13 branch.

Discussion
----------

- env autorefreshing every hour
- hide notices/deprecations in the logs
- add generating keypair for jwt signing

Commits
-------
  maintenance(Bunnyshell): disable logging notices, strict errors and deprecations
  maintenance(Bunnyshell): add refreshing the environment every hour
  maintenance(Bunnyshell): add generating keypair for generating JWT tokens
2024-03-14 09:33:17 +01:00
Jacob Tobiasz
6fe35a215f
maintenance(Bunnyshell): add generating keypair for generating JWT tokens 2024-03-14 09:23:07 +01:00
Jacob Tobiasz
3320384ed6
maintenance(Bunnyshell): add refreshing the environment every hour 2024-03-14 09:21:26 +01:00
Jacob Tobiasz
2ee42d6374
maintenance(Bunnyshell): disable logging notices, strict errors and deprecations 2024-03-14 09:21:12 +01:00
Jacob Tobiasz
867bed80ec
Change the default NODE_VERSION to 18 2024-03-13 14:25:13 +01:00
Aris Buzachis
70f29a6b00 [Bunnyshell] Bump the PHP version to 8.2 in the php Dockerfile
Signed-off-by: Aris Buzachis <aris.buzachis@bunnyshell.com>
2023-09-29 09:43:59 +02:00
Aris Buzachis
1a5b08e8c8
[Bunnyshell] Adjust the workflows for Fork PRs
Signed-off-by: Aris Buzachis <aris.buzachis@bunnyshell.com>
2023-07-06 09:19:45 +02:00
Aris Buzachis
d127ae15dc [Bunnyshell] Adjust the workflows for Fork PRs
Signed-off-by: Aris Buzachis <aris.buzachis@bunnyshell.com>
2023-06-30 12:42:49 +03:00
Jakub Tobiasz
85a94c9f41
Revert "Add support for Bunnyshell (#15134)"
This reverts commit 8ad42c9a1b.
2023-06-30 09:20:08 +02:00
Jacob Tobiasz
8ad42c9a1b
Add support for Bunnyshell (#15134)
Co-authored-by: Aris Buzachis <aris.buzachis@bunnyshell.com>
Co-authored-by: Aris Buzachis <114920449+aris-bunnyshell@users.noreply.github.com>
Co-authored-by: Mihai Chitic <m.chitic+github@gmail.com>
2023-06-29 09:20:06 +02:00