Skip to content

Commit

Permalink
Adjustments for Apple M1 #47
Browse files Browse the repository at this point in the history
Adjustments needed to make magento2docker operational on Apple M1;
  • Loading branch information
glo47154 authored Dec 15, 2022
2 parents 647be06 + 6696242 commit 89b2c5f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 1 deletion.
2 changes: 2 additions & 0 deletions env/additional/elasticsearch6/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ version: '2'
services:
elasticsearch:
container_name: magento2elastic6
# for ES 6 there is no official image for arm-v8 (Apple M1) so we need to force different platform and image will work with emulation (WARNING: will be slow)
platform: linux/x86_64
environment:
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"
build: .
Expand Down
2 changes: 1 addition & 1 deletion env/additional/elasticsearch7/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# https://www.elastic.co/guide/en/elasticsearch/reference/6.5/docker.html#docker
FROM docker.elastic.co/elasticsearch/elasticsearch:7.16.3
FROM docker.elastic.co/elasticsearch/elasticsearch:7.16.3-arm64
COPY --chown=elasticsearch:elasticsearch config/elasticsearch.yml /usr/share/elasticsearch/config/
4 changes: 4 additions & 0 deletions env/additional/varnish/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@ version: '2'
services:
varnish:
container_name: magento2varnish
# for Varnis 6 there is no official image for arm-v8 (Apple M1) so we need to force different platform and image will work with emulation (WARNING: will be slow)
platform: linux/x86_64
image: varnish:6.5
# for MAgento 2.4.4 and up, comment out the above two lines and uncomment the below one for better performance
# image: varnish:7.0
ports:
- "8080:8080"
networks:
Expand Down

0 comments on commit 89b2c5f

Please sign in to comment.