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

feat: Build amd64 images explicitly to avoid cross-platform issues #224

Closed
wants to merge 37 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
6a9bd21
Initial commit
alexlokshin-czi Apr 7, 2022
e181555
Added visualization of platform data
alexlokshin-czi Apr 7, 2022
2158dd0
Added unit tests
alexlokshin-czi Apr 7, 2022
5afd194
Warning the user of a platform mismatch
alexlokshin-czi Apr 8, 2022
773a051
Appeasing the linter
alexlokshin-czi Apr 8, 2022
88f51c0
Updated coverage
alexlokshin-czi Apr 8, 2022
6116691
Updated dependencies
alexlokshin-czi Apr 8, 2022
cfce81c
Updated coverage
alexlokshin-czi Apr 8, 2022
c9f9346
Improved coverage
alexlokshin-czi Apr 8, 2022
8ed1208
Added clarity to variable names
alexlokshin-czi Apr 8, 2022
0cb7b9d
Fixing the linter
alexlokshin-czi Apr 8, 2022
9c20cc2
Not sharing the env vars
alexlokshin-czi Apr 8, 2022
03cdbf1
Stopping at the platform specified in docker compose if it is not com…
alexlokshin-czi Apr 11, 2022
4bfe2e7
Removed the trailing space
alexlokshin-czi Apr 11, 2022
7f73718
Updated coverage
alexlokshin-czi Apr 11, 2022
736df69
Merge branch 'main' into alokshin/amd64
alexlokshin-czi Apr 11, 2022
f624876
Fixing the merge issues
alexlokshin-czi Apr 11, 2022
701e98f
Merge branch 'main' into alokshin/amd64
alexlokshin-czi Apr 11, 2022
ec95cb8
Dealing with locally set DOCKER_DEFAULT_PLATFORM env variable
alexlokshin-czi Apr 11, 2022
872fe1c
Merge branch 'alokshin/amd64' of https://github.com/chanzuckerberg/ha…
alexlokshin-czi Apr 11, 2022
03f9e40
Upgraded some dependencies
alexlokshin-czi Apr 11, 2022
2b7ad4e
Merge branch 'main' into alokshin/amd64
alexlokshin-czi Apr 11, 2022
9172f04
Responding to code review and coverage improvement
alexlokshin-czi Apr 12, 2022
5e2a03c
Merge branch 'alokshin/amd64' of https://github.com/chanzuckerberg/ha…
alexlokshin-czi Apr 12, 2022
bf47ead
Added a conflict message
alexlokshin-czi Apr 12, 2022
bcf0843
Updated per code review
alexlokshin-czi Apr 12, 2022
c256bc3
Updated coverage
alexlokshin-czi Apr 12, 2022
94322a3
Updated coverage
alexlokshin-czi Apr 12, 2022
f0f423f
Added a target runtime comment per code review
alexlokshin-czi Apr 12, 2022
45cbb6d
Responding to code review.
alexlokshin-czi Apr 12, 2022
37ab80d
Merge branch 'main' into alokshin/amd64
alexlokshin-czi Apr 14, 2022
0e6e817
Merge branch 'main' into alokshin/amd64
alexlokshin-czi Apr 14, 2022
705dd4b
Merge branch 'main' into alokshin/amd64
alexlokshin-czi Apr 14, 2022
f53648e
Merge branch 'main' into alokshin/amd64
alexlokshin-czi Apr 14, 2022
dcba02c
Merge branch 'main' into alokshin/amd64
alexlokshin-czi Apr 18, 2022
6ff6b20
Merge branch 'main' into alokshin/amd64
alexlokshin-czi Apr 20, 2022
1ea7406
Merge branch 'main' into alokshin/amd64
alexlokshin-czi Apr 21, 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
Prev Previous commit
Next Next commit
Merge branch 'main' into alokshin/amd64
alexlokshin-czi authored Apr 11, 2022
commit 736df698943d5791d7f204f8a141c3c641fb4e30
2 changes: 1 addition & 1 deletion COVERAGE
Original file line number Diff line number Diff line change
@@ -1 +1 @@
42.28
41.04
35 changes: 17 additions & 18 deletions cmd/get.go
Original file line number Diff line number Diff line change
@@ -164,22 +164,12 @@ var getCmd = &cobra.Command{
if len(arnSegments) < 3 {
continue
}
taskId := arnSegments[len(arnSegments)-1]
tablePrinter.AddRow(" ARN", taskArn)
tablePrinter.AddRow(" Status", *task.LastStatus)
tablePrinter.AddRow(" Containers")
for _, containerDefinition := range taskDefinition.ContainerDefinitions {
tablePrinter.AddRow(" Name", *containerDefinition.Name)
tablePrinter.AddRow(" Image", *containerDefinition.Image)

logStreamPrefix := containerDefinition.LogConfiguration.Options[backend.AwsLogsStreamPrefix]
logGroup := containerDefinition.LogConfiguration.Options[backend.AwsLogsGroup]
logRegion := containerDefinition.LogConfiguration.Options[backend.AwsLogsRegion]
containerName := *containerDefinition.Name

consoleLink, err := util.Log2ConsoleLink(util.LinkOptions{Region: logRegion}, logGroup, logStreamPrefix, containerName, taskId)
if err != nil {
return errors.Wrapf(err, "unable to construct a cloudwatch link for container '%s'", containerName)

for taskIndex, taskDefinition := range taskDefinitions {
task := tasks[taskIndex]
arnSegments := strings.Split(taskArn, "/")
if len(arnSegments) < 3 {
continue
}
taskId := arnSegments[len(arnSegments)-1]
tablePrinter.AddRow(" ARN", taskArn)
@@ -198,9 +188,18 @@ var getCmd = &cobra.Command{
tablePrinter.AddRow(" Name", *containerDefinition.Name)
tablePrinter.AddRow(" Image", *containerDefinition.Image)

tablePrinter.AddRow(" Logs", consoleLink)
}
logStreamPrefix := containerDefinition.LogConfiguration.Options[backend.AwsLogsStreamPrefix]
logGroup := containerDefinition.LogConfiguration.Options[backend.AwsLogsGroup]
logRegion := containerDefinition.LogConfiguration.Options[backend.AwsLogsRegion]
containerName := *containerDefinition.Name

consoleLink, err := util.Log2ConsoleLink(util.LinkOptions{Region: logRegion}, logGroup, logStreamPrefix, containerName, taskId)
if err != nil {
return errors.Wrapf(err, "unable to construct a cloudwatch link for container '%s'", containerName)
}

tablePrinter.AddRow(" Logs", consoleLink)
}
}
}

2 changes: 1 addition & 1 deletion pkg/config/COVERAGE
Original file line number Diff line number Diff line change
@@ -1 +1 @@
69.0
69.0
You are viewing a condensed version of this merge commit. You can view the full changes here.