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

Migrate to new unison images fixes #810 #813

Merged
merged 8 commits into from
Sep 8, 2022
Merged

Conversation

EugenMayer
Copy link
Owner

@EugenMayer EugenMayer commented Sep 8, 2022

Migrate to new unison images which are build for amd64/arm64 using manifests. This will fix #810

  • add ruby 3.0 to test matrix

@EugenMayer
Copy link
Owner Author

Since there are currently no CI engines available to run MacOS on M1, nor any MacOS offering CI that runs docker-for-mac (license issues), i cannot test docker-sync on it's home platform in the CI and thus rely on the community to do that testing - i do no longer own a mac

@yosephsa
Copy link
Contributor

yosephsa commented Sep 8, 2022

@EugenMayer I see the gem version needs to be updated.

@EugenMayer
Copy link
Owner Author

@yoseph1998 you need to compile / run from source, yes

@yosephsa
Copy link
Contributor

yosephsa commented Sep 8, 2022

@EugenMayer Yes, I have this branched cloned locally and I am running ./deploy_locally.sh

I updated the version locally to 0.7.3 so that I can validate the installed docker-sync is the one from this branch.

I was only able to make this work with the changes proposed above (adding ghcr.io/)

@EugenMayer
Copy link
Owner Author

change the value in https://github.com/EugenMayer/docker-sync/blob/main/VERSION to 1.0.0 and run deploy locally again. be sure to run gem uninstall docker-sync before that

@yosephsa
Copy link
Contributor

yosephsa commented Sep 8, 2022

@EugenMayer Yes, that's what I am doing (on task/new-unixon-images, not main) and getting the following error because the image in unison.rb and native_osx.rb do not specify the ghcr.io/.

If I update those files to use ghcr.io/eugenmayer/unison:2.52.1-4.12.0 Everything works correctly.

image

@EugenMayer
Copy link
Owner Author

Really odd i missed that after i actually already worked on those lines .. kind got lost over it.

Fixed it, could you try once again?

Copy link
Contributor

@yosephsa yosephsa left a comment

Choose a reason for hiding this comment

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

@EugenMayer Tested and working locally (M1 MacOS). Thank you!

lib/docker-sync/sync_strategy/unison.rb Outdated Show resolved Hide resolved
lib/docker-sync/sync_strategy/native_osx.rb Outdated Show resolved Hide resolved
@yosephsa
Copy link
Contributor

yosephsa commented Sep 8, 2022

I don't see the version being updated in this PR, is that happening outside of the MR?

@EugenMayer
Copy link
Owner Author

Yes @yoseph1998 version will be planned when the release is planned. Which will happen very soon

@yosephsa
Copy link
Contributor

yosephsa commented Sep 8, 2022

@EugenMayer Great. All LGTM. Again thank you for all this work!

@EugenMayer
Copy link
Owner Author

Your welcome, you did a fair share of this too. Thank you

@EugenMayer EugenMayer merged commit 9b589e7 into main Sep 8, 2022
@EugenMayer EugenMayer deleted the task/new-unixon-images branch September 8, 2022 16:00
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.

Bug: Wrong Unison image is pulled on M1 Mac
2 participants