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

fix: Docker-compose specify platform to get around arm vs amd arch mismatches #241

Merged
merged 4 commits into from
Mar 30, 2022

Conversation

edulop91
Copy link
Contributor

Make sure we build/run x86 images everywhere.
See https://github.com/chanzuckerberg/czgenepi/pull/999/files

Reviewers

Functional:

Readability:


Changes

  • add
  • remove
  • modify

@codecov
Copy link

codecov bot commented Mar 30, 2022

Codecov Report

Merging #241 (580fb49) into main (4e7bf79) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             main     #241   +/-   ##
=======================================
  Coverage   76.47%   76.47%           
=======================================
  Files          92       92           
  Lines        6758     6758           
=======================================
  Hits         5168     5168           
  Misses       1590     1590           
Flag Coverage Δ
frontend 76.47% <ø> (ø)
javascript 76.47% <ø> (ø)
smokeTest ?
unitTest 76.47% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.


Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 4e7bf79...580fb49. Read the comment docs.

Copy link
Contributor

@atolopko-czi atolopko-czi left a comment

Choose a reason for hiding this comment

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

a couple minor considerations

docker-compose.yml Outdated Show resolved Hide resolved
docker-compose.yml Show resolved Hide resolved
@@ -3,7 +3,7 @@
"terraform_version": "0.13.5",
"default_env": "rdev",
"app": "hosted-cellxgene",
"default_compose_env": ".env.ecr",
"default_compose_env_file": ".env.ecr",
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this a happy golang related change or was it just broken? If the former, do we also need to update config_version to v2? (per these docs)

Copy link
Contributor Author

@edulop91 edulop91 Mar 30, 2022

Choose a reason for hiding this comment

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

If the former, do we also need to update config_version to v2? (per these docs)

we will do those once we've migrated

docker-compose.yml Outdated Show resolved Hide resolved
@@ -3,7 +3,7 @@
"terraform_version": "0.13.5",
"default_env": "rdev",
"app": "hosted-cellxgene",
"default_compose_env": ".env.ecr",
"default_compose_env_file": ".env.ecr",
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Suggested change
"default_compose_env_file": ".env.ecr",
"default_compose_env_file": ".env.ecr",
"default_compose_env": ".env.ecr",

I will keep both for now so that we don't break python

Copy link
Contributor

Choose a reason for hiding this comment

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

oh woops, maybe I should have been the one to accept this suggestion prior to approval? looks like it merged w/o it.

@edulop91 edulop91 merged commit 5c2a4b3 into main Mar 30, 2022
@edulop91 edulop91 deleted the edu/amd-arm-happy-fix branch March 30, 2022 21:25
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.

3 participants