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

Added support for ARM #233

Merged
merged 27 commits into from
Aug 31, 2024
Merged

Conversation

vonProteus
Copy link
Contributor

@vonProteus vonProteus commented Aug 31, 2024

C9Glax and others added 24 commits July 9, 2024 11:17
Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 6.6.1 to 6.7.0.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](docker/build-push-action@v6.6.1...v6.7.0)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Dockerfile Show resolved Hide resolved
Dockerfile Show resolved Hide resolved
Dockerfile-base Outdated
Copy link
Contributor Author

Choose a reason for hiding this comment

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

moved to main Dockerfile

Comment on lines 17 to 44
BrowserFetcher browserFetcher = new BrowserFetcher();
foreach(string rev in browserFetcher.LocalRevisions().Where(rev => rev != ChromiumVersion))
browserFetcher.Remove(rev);
if (!browserFetcher.LocalRevisions().Contains(ChromiumVersion))
{
Log("Downloading headless browser");
DateTime last = DateTime.Now.Subtract(TimeSpan.FromSeconds(5));
browserFetcher.DownloadProgressChanged += (_, args) =>
{
double currentBytes = Convert.ToDouble(args.BytesReceived) / Convert.ToDouble(args.TotalBytesToReceive);
if (args.TotalBytesToReceive == args.BytesReceived)
Log("Browser downloaded.");
else if (DateTime.Now > last.AddSeconds(1))
{
Log($"Browser download progress: {currentBytes:P2}");
last = DateTime.Now;
}

};
if (!browserFetcher.CanDownloadAsync(ChromiumVersion).Result)
{
Log($"Can't download browser version {ChromiumVersion}");
throw new Exception();
}
await browserFetcher.DownloadAsync(ChromiumVersion);
}

Copy link
Contributor Author

@vonProteus vonProteus Aug 31, 2024

Choose a reason for hiding this comment

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

chrome is a part of base image now
because Puppeteer cant download arm version of chrome

Copy link
Owner

Choose a reason for hiding this comment

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

Could you rename method to "StartBrowser" for readabilitys sake?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

renamed

docker-compose.local.yaml Outdated Show resolved Hide resolved
Dockerfile Show resolved Hide resolved
Dockerfile Show resolved Hide resolved
Dockerfile Show resolved Hide resolved
@vonProteus vonProteus marked this pull request as ready for review August 31, 2024 17:28
C9Glax added 2 commits August 31, 2024 20:24
…ocker/build-push-action-6.7.0

Bump docker/build-push-action from 6.6.1 to 6.7.0
@C9Glax C9Glax linked an issue Aug 31, 2024 that may be closed by this pull request
Copy link
Owner

@C9Glax C9Glax left a comment

Choose a reason for hiding this comment

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

alright looks good

@C9Glax C9Glax changed the base branch from master to cuttingedge-merge-ServerV2 August 31, 2024 18:57
@C9Glax
Copy link
Owner

C9Glax commented Aug 31, 2024

Gonna merge to cuttingedge first, see if changes work

@C9Glax C9Glax merged commit e8dbf7a into C9Glax:cuttingedge-merge-ServerV2 Aug 31, 2024
@vonProteus
Copy link
Contributor Author

arm image is build only in master branch

@C9Glax
Copy link
Owner

C9Glax commented Aug 31, 2024

Yeah sorry, worded that wrong, gonna test locally with cuttingedge-branch, then merge into master

@vonProteus
Copy link
Contributor Author

anyway now enabling arm images in other branches is only changing platforms: linux/amd64 to platforms: linux/amd64,linux/arm64

@C9Glax C9Glax mentioned this pull request Sep 9, 2024
C9Glax added a commit that referenced this pull request Sep 9, 2024
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.

ARM64 Support
2 participants