Skip to content

Commit

Permalink
Hotfix for Linux build - some Chrome files no longer exist (#1071)
Browse files Browse the repository at this point in the history
  • Loading branch information
ilike2burnthing committed Feb 17, 2024
1 parent 227bd7a commit 3ca6d08
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 8 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## v3.3.14-hotfix (2024/02/17)

* Hotfix for Linux build - some Chrome files no longer exist

## v3.3.14 (2024/02/17)

* Update Chrome downloads. Thanks @opemvbs
Expand Down
10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -62,17 +62,17 @@ ENTRYPOINT ["/usr/bin/dumb-init", "--"]
CMD ["/usr/local/bin/python", "-u", "/app/flaresolverr.py"]

# Local build
# docker build -t ngosang/flaresolverr:3.3.14 .
# docker run -p 8191:8191 ngosang/flaresolverr:3.3.14
# docker build -t ngosang/flaresolverr:3.3.14-hotfix .
# docker run -p 8191:8191 ngosang/flaresolverr:3.3.14-hotfix

# Multi-arch build
# docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
# docker buildx create --use
# docker buildx build -t ngosang/flaresolverr:3.3.14 --platform linux/386,linux/amd64,linux/arm/v7,linux/arm64/v8 .
# docker buildx build -t ngosang/flaresolverr:3.3.14-hotfix --platform linux/386,linux/amd64,linux/arm/v7,linux/arm64/v8 .
# add --push to publish in DockerHub

# Test multi-arch build
# docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
# docker buildx create --use
# docker buildx build -t ngosang/flaresolverr:3.3.14 --platform linux/arm/v7 --load .
# docker run -p 8191:8191 --platform linux/arm/v7 ngosang/flaresolverr:3.3.14
# docker buildx build -t ngosang/flaresolverr:3.3.14-hotfix --platform linux/arm/v7 --load .
# docker run -p 8191:8191 --platform linux/arm/v7 ngosang/flaresolverr:3.3.14-hotfix
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "flaresolverr",
"version": "3.3.14",
"version": "3.3.14-hotfix",
"description": "Proxy server to bypass Cloudflare protection",
"author": "Diego Heras (ngosang / [email protected])",
"license": "MIT"
Expand Down
3 changes: 1 addition & 2 deletions src/build_package.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,7 @@ def download_chromium():
# Give executable permissions for *nix
# file * | grep executable | cut -d: -f1
print("Giving executable permissions...")
execs = ['chrome', 'chrome_crashpad_handler', 'chrome_sandbox', 'chrome-wrapper', 'nacl_helper',
'nacl_helper_bootstrap', 'nacl_irt_x86_64.nexe', 'xdg-mime', 'xdg-settings']
execs = ['chrome', 'chrome_crashpad_handler', 'chrome_sandbox', 'chrome-wrapper', 'xdg-mime', 'xdg-settings']
for exec_file in execs:
exec_path = os.path.join(chrome_path, exec_file)
os.chmod(exec_path, 0o755)
Expand Down

1 comment on commit 3ca6d08

@ilike2burnthing
Copy link
Contributor Author

@ilike2burnthing ilike2burnthing commented on 3ca6d08 Feb 17, 2024

Choose a reason for hiding this comment

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

@txtsd - ignore this, see new build

Please sign in to comment.