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

Update dockerfile to try and fix running on m1 macs #37

Merged
merged 2 commits into from
May 16, 2023
Merged

Conversation

foot
Copy link
Collaborator

@foot foot commented May 16, 2023

Tilt on m1 is showing:

[event: pod flux-system/cluster-controller-manager-76d949c987-bqjzd] Failed to pull image "docker.io/weaveworks/cluster-controller:2b696bc": rpc error: code = NotFound desc = failed to pull and unpack image "docker.io/weaveworks/cluster-controller:2b696bc": no match for platform in manifest: not found

Which we don't see in other controllers.

Fixes:

  • Upgrade github actions to run tests
  • upgrade github action inline w/ pattern used in gitopssets-controller / templates-controller / others
  • Update dockerfile to match other controllers too

@foot
Copy link
Collaborator Author

foot commented May 16, 2023

Fix seemed to be in upgrading the build-push-action

@foot
Copy link
Collaborator Author

foot commented May 16, 2023

@foot
Copy link
Collaborator Author

foot commented May 16, 2023

diff --git a/151-format.json b/pr37-format.json
index cb7ccab..f7db8e7 100644
--- a/151-format.json
+++ b/pr37-format.json
@@ -1,45 +1,32 @@
 {
   "creator": 7222734,
-  "id": 436822440,
+  "id": 439932800,
   "images": [
     {
       "architecture": "amd64",
       "features": "",
       "variant": null,
-      "digest": "sha256:3b6c98222a5203ad9e21609ec358b8c27d594e95778d201aeb9d3bf834b8c3c8",
+      "digest": "sha256:a68e3ee0a23374c7543d6b168cba7707ef38d9f8a456451f025f0f721e790e8e",
       "os": "linux",
       "os_features": "",
       "os_version": null,
-      "size": 23824827,
+      "size": 23824819,
       "status": "active",
-      "last_pulled": "2023-05-16T09:57:10.096253Z",
-      "last_pushed": "2023-05-10T11:11:38.216091Z"
-    },
-    {
-      "architecture": "unknown",
-      "features": "",
-      "variant": null,
-      "digest": "sha256:4c4ca12486055896fef72b32f5bdac3cbcc597696dcfc7b5860c8ea3586b06a0",
-      "os": "unknown",
-      "os_features": "",
-      "os_version": null,
-      "size": 1470,
-      "status": "active",
-      "last_pulled": "2023-05-10T11:43:58.37219Z",
-      "last_pushed": "2023-05-10T11:43:57.300351Z"
+      "last_pulled": "2023-05-16T10:31:12.479053Z",
+      "last_pushed": "2023-05-16T10:31:12.23958Z"
     }
   ],
-  "last_updated": "2023-05-10T11:43:57.822208Z",
+  "last_updated": "2023-05-16T10:31:12.327819Z",
   "last_updater": 7222734,
   "last_updater_username": "weaveworkswkpci",
-  "name": "v1.5.1",
+  "name": "pr-37",
   "repository": 16941613,
-  "full_size": 23824827,
+  "full_size": 23824819,
   "v2": true,
   "tag_status": "active",
-  "tag_last_pulled": "2023-05-16T09:57:10.096253Z",
-  "tag_last_pushed": "2023-05-10T11:43:57.822208Z",
-  "media_type": "application/vnd.oci.image.index.v1+json",
+  "tag_last_pulled": "2023-05-16T10:31:12.479053Z",
+  "tag_last_pushed": "2023-05-16T10:31:12.327819Z",
+  "media_type": "application/vnd.docker.container.image.v1+json",
   "content_type": "image",
-  "digest": "sha256:3e24435d18a9fbc93fb9a6c4a0f66841582eae331ca5d19d465f9112e729750d"
+  "digest": "sha256:a68e3ee0a23374c7543d6b168cba7707ef38d9f8a456451f025f0f721e790e8e"
 }

@foot foot requested a review from ranatrk May 16, 2023 12:27
@foot
Copy link
Collaborator Author

foot commented May 16, 2023

@ranatrk does the new image still work for you? If you change the tag in the mccp/values.yaml to be pr-37 ?

@ranatrk
Copy link
Contributor

ranatrk commented May 16, 2023

@ranatrk does the new image still work for you? If you change the tag in the mccp/values.yaml to be pr-37 ?

yes, after updating with pr-37, then helm dep update then starting tilt, it starts okay!

@foot foot merged commit 3539df9 into main May 16, 2023
@foot foot deleted the fix-docker-image-m1 branch May 16, 2023 15:10
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.

None yet

2 participants