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.

Sign up for GitHub

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

Jump to bottom

Apple m1 adjustments #225

Closed
wants to merge 26 commits into from
Closed

Apple m1 adjustments #225

wants to merge 26 commits into from

Conversation

volhov
Copy link

@volhov volhov commented Aug 1, 2021 •
edited by eduard-melnytskyi
Loading

PR Description

Extend tool to support apple M1

Changes allow to run Spryker on Arm architecture.

Taking to account that not all vendors provide docker images for arm architecture couple of customization were added related to the images.

  1. Base spryker image (also was extended with make, g++, gcc and python2 to be able to build all required dependencies required for frontend build)
  2. RabbitMq
  3. Jenkins
  4. Mailhog
  5. Elasticsearch

Custom images hosted in volhovm docker hub account.

Setup extended with 2 additional mount options.

  1. delegated
  2. cached

In development mode:

  1. Timeout extended to 5min.
  2. max_execution_time to 180
  3. request_terminate_timeout to 5min

During configuration generation for arm architecture base image automatically replaced with arm related image.

Requirements

  1. Update mutagen to beta 4 to be able to use sidecar image with proper architecture

Change log

  1. Extended generator logic
  2. Adjusted twig templates
  3. Added custom docker image

Checklist

  • I agree with the Code Contribution License Agreement in CONTRIBUTING.md

Open questions

  1. Decide where to put customised images

How to try it

  1. Clone docker/sdk according to instruction
  2. Switch to the apple-m1-adjustments branch
  3. Boot and up the project.

Test mount modes

  1. Adjust deploy.dev.jml and replace mutagen with delegated or cached
  2. Boot and up the project.

@eduard-melnytskyi
Adjust docker/sdk with arm architecture support.
1f73aa3 
- add platform cli option
- extedn docker compose with platform property
- add swtich to custom images that suport arm architecture
- Until main image will be updated it is necessary to updated deploy jml
  and replace  spryker/php:7.4-alpine3.12 with  volhovm/php:7.4-alpine3.13-arm or volhovm/php:7.3-alpine3.12-arm
@eduard-melnytskyi
Add possibility to use docker cached mount mode.
f785903
@eduard-melnytskyi
Adjust documentation and remove debug info.
2dc80f9 
- adjust list of mount modes
- extend temporary timeouts for php execution.
@eduard-melnytskyi
Merge branch 'master' into apple-m1-adjustments
03ec8ab
@eduard-melnytskyi
Extend generator with fallback logic for base image depends on platfo…
fa36a6d 
…rm architecture.
@eduard-melnytskyi
Adjust generation logic and increase script execution timeouts for de…
ca14a36 
…velopment mode.
@eduard-melnytskyi
Merge branch 'master' into apple-m1-adjustments
3c9ae6d
@alexanderM91 alexanderM91 mentioned this pull request Oct 25, 2021
Closed
a-bobkov and others added 13 commits December 6, 2021 14:55
@a-bobkov @alexanderM91 @eduard-melnytskyi
To avoid sync issue on MAC OS - delete mutagen sessions with obsolete…
e31b592 
… docker id (#254)

* To avoid sync issue - delete mutagen sessions with obsolete docker id

* Rename method to be more clear.

Co-authored-by: Aleksandr Myrnyi <oleksandr.myrnyi@spryker.com>

* More clear messages for a user.

Co-authored-by: Aleksandr Myrnyi <oleksandr.myrnyi@spryker.com>

* That was a bug, thanks to alexanderM91

Co-authored-by: Aleksandr Myrnyi <oleksandr.myrnyi@spryker.com>

Co-authored-by: Andrey Bobkov <andrey.bobkov@mediawave.de>
Co-authored-by: Aleksandr Myrnyi <oleksandr.myrnyi@spryker.com>
@alexanderM91 @eduard-melnytskyi
SC-7499: Troubleshooting
f9273c4
@eduard-melnytskyi
Fix typo in debug.default.conf.twig, variable zedEndpoint is not exis…
815edea 
…ting (#264)
@eduard-melnytskyi
Merge branch 'master' into apple-m1-adjustments
6fb93f5
@zyuzka
Merge branch 'master' into apple-m1-adjustments
59fa2ec
@zyuzka
Merge branch 'master' into apple-m1-adjustments
c4f5687
@eduard-melnytskyi
Merge branch 'master' into apple-m1-adjustments
7159960
@eduard-melnytskyi
Merge branch 'master' into apple-m1-adjustments
f79c9d3
@eduard-melnytskyi
Merge branch 'master' into apple-m1-adjustments
3adf550
@eduard-melnytskyi
Remove platform specification for mysql container, becasue mysql does…
218dea0 
… not support arm.
@eduard-melnytskyi
Add m1 support for redis-commander.
62ca2f9
@eduard-melnytskyi
Remove platform specification for phantomjs.
9e2de9d
@eduard-melnytskyi
Add arm image for swagger ui.
0a9850b
@alexanderM91
Copy link
Collaborator

alexanderM91 commented May 5, 2022 •
edited
Loading

Hi,
we have officially released M1 support.
You can find more information here -
#192 (comment).

Note: The current temporary branch will not be supported anymore.

Thank you.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sprymiker sprymiker Awaiting requested review from sprymiker

Assignees

@sprymiker sprymiker

Labels
experiment
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@volhov @alexanderM91 @sprymiker @eduard-melnytskyi @a-bobkov @zyuzka