Skip to content

Arm64 and check Compose v2 support#177

Merged
glours merged 11 commits intodocker:masterfrom
glours:arm64-support
Nov 8, 2021
Merged

Arm64 and check Compose v2 support#177
glours merged 11 commits intodocker:masterfrom
glours:arm64-support

Conversation

@glours
Copy link
Collaborator

@glours glours commented Nov 5, 2021

Update samples to work in the same way from an amd64 or an arm64 architecture and with Compose V2

glours added 10 commits November 5, 2021 21:51
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
@glours glours self-assigned this Nov 5, 2021
@glours glours requested a review from aiordache November 5, 2021 21:13
Copy link
Member

@mat007 mat007 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome (pun intended), thanks!

@waja
Copy link

waja commented Nov 7, 2021

Cool. Which of this changes it relevant for docker compose v2 support? At the first look, it seems they are all unrelated to this topic.

@glours
Copy link
Collaborator Author

glours commented Nov 7, 2021

@waja right, there is no specific change for Compose V2, the intent of this PR was to make sure all the samples work for arm64 and that we don't have any specific issue when running them with Compose V2

@glours glours changed the title Arm64 and Compose v2 support Arm64 and check Compose v2 support Nov 7, 2021
Copy link
Contributor

@aiordache aiordache left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@glours Thank you for taking the time to update the samples 😄

db:
image: mysql:8.0.19
# We use a mariadb image which support both amd64 & arm64 architecture
image: mariadb:10.6.4-focal
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we add the DB healthcheck to improve a bit ? A few samples have it already 😁

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I prefer to have a dedicated PR for DB healthcheck, I saw some errors when testing the samples and I think that it'll be better to spend some time completely focus on the healthcheck

- db
db:
image: mysql:8.0.19
# We use a mariadb image which support both amd64 & arm64 architecture
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typo support -> supports (and everywhere else this comment was added).

db:
image: mysql:8.0.19
# We use a mariadb image which support both amd64 & arm64 architecture
image: mariadb:10.6.4-focal
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Healthcheck !? 😅

db:
image: mysql:8.0.19
# We use a mariadb image which support both amd64 & arm64 architecture
image: mariadb:10.6.4-focal
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Healthcheck !? 😅

Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
@glours glours merged commit 4bba832 into docker:master Nov 8, 2021
@glours glours deleted the arm64-support branch November 19, 2021 21:58
@maxdehaas
Copy link

Hi all,
I keep getting a mapping being expected for the restart policy. No reference on docker itself on a mapping needed as of version x.

ERROR: In file './docker-compose.yml', service 'restart' must be a mapping not a string.

I tried:
restart: always
or
restart: on-failure
Nothing seems to work though. Should I drop a couple of versions or is anybody of you aware of this change? Or...?

@glours
Copy link
Collaborator Author

glours commented Jan 16, 2022

Hello @maxdehaas
Can you create a new issue and specify which sample doesn't work? Don't forget also specify if your using Docker Desktop and the version of Docker Compose used.
Thanks

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants