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

Add rootless runner to the Makefile and improve target platform handling. #2005

Merged
merged 7 commits into from
Nov 26, 2022

Conversation

isarkis
Copy link
Contributor

@isarkis isarkis commented Nov 9, 2022

Related to #1993

@isarkis isarkis marked this pull request as ready for review November 9, 2022 23:22
@@ -44,7 +56,6 @@ docker-build-ubuntu:
${DOCKER} build \
--build-arg TARGETPLATFORM=${TARGETPLATFORM} \
--build-arg RUNNER_VERSION=${RUNNER_VERSION} \
--build-arg RUNNER_CONTAINER_HOOKS_VERSION=${RUNNER_CONTAINER_HOOKS_VERSION} \
Copy link
Collaborator

Choose a reason for hiding this comment

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

@toast-gear I think we can safely remove this arg for the rootless dind runner as the runner container hooks are installed only on the non-dind runner image.

runner/Makefile Outdated Show resolved Hide resolved
@mumoshu
Copy link
Collaborator

mumoshu commented Nov 26, 2022

@isarkis Hey! Thanks for your patience. We've recently updated our dockerfiles to work also on M2 mac. I've all those works from our main branch into your pull request so it ended up containing changes only for the makefile.
The outcome might be the same though. After merging this pull request, you'll be able to build all the runner images using make even on M1/M2 mac.

Copy link
Collaborator

@mumoshu mumoshu left a comment

Choose a reason for hiding this comment

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

I'm going to merge this right now. Thanks a lot for your contribution @isarkis!

@mumoshu mumoshu merged commit 95c324b into actions:master Nov 26, 2022
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