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

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

Merged
merged 4 commits into from
Mar 30, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0a186d5
fix: Docker-compose specify platform to get around arm vs amd arch mi…
Mar 30, 2022
183ee7c
chore: default_compose_env -> default_compose_env_file
metakuni Mar 30, 2022
d2d4e15
Update docker-compose.yml
Mar 30, 2022
580fb49
Update .happy/config.json
Mar 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .happy/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"terraform_version": "0.13.5",
"default_env": "rdev",
"app": "hosted-cellxgene",
"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 •
edited
Loading

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

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.

"default_compose_env": ".env.ecr",
"environments": {
"rdev": {
Expand Down
13 changes: 7 additions & 6 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,13 @@ services:
volumes:
- localstack:/tmp/localstack
networks:
corporanet:
aliases:
- localstack.corporanet.local
corporanet:
aliases:
- localstack.corporanet.local

explorer:
image: "${DOCKER_REPO}corpora-explorer"
platform: linux/amd64
edulop91 marked this conversation as resolved.
Show resolved Hide resolved
build:
context: .
dockerfile: hosted/Dockerfile
Expand Down Expand Up @@ -57,9 +58,9 @@ services:
# SecretsManager population relies on oauth json
- ./oauth/users.json:/oauth/users.json
networks:
corporanet:
aliases:
- backend.corporanet.local
corporanet:
aliases:
- backend.corporanet.local
networks:
corporanet:
volumes:
Expand Down