starred/FlareSolverr
1
0
Fork 0
mirror of https://github.com/FlareSolverr/FlareSolverr.git synced 2026-10-04 22:04:17 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Revert base image & Python (#1715)

Browse Source
This commit is contained in:
ilike2burnthing
2026-05-26 15:25:30 +01:00
committed by GitHub
parent e3c300ee0f
commit 7b3ec724a6
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/release-docker.yml
+1 -1
View File
@@ -15,7 +15,7 @@ concurrency:
jobs: jobs:
build-docker-images: build-docker-images:
if: ${{ !github.event.pull_request.head.repo.fork }} if: ${{ !github.event.pull_request.head.repo.fork }}
runs-on: ubuntu-latest runs-on: ubuntu-22.04
steps: steps:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v6 uses: actions/checkout@v6
.github/workflows/release.yml
+4 -4
View File
@@ -8,7 +8,7 @@ on:
jobs: jobs:
create-release: create-release:
name: Create release name: Create release
runs-on: ubuntu-latest runs-on: ubuntu-22.04
steps: steps:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v6 uses: actions/checkout@v6
@@ -36,7 +36,7 @@ jobs:
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
strategy: strategy:
matrix: matrix:
os: [ubuntu-latest, windows-latest] os: [ubuntu-22.04, windows-latest]
steps: steps:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v6 uses: actions/checkout@v6
@@ -46,12 +46,12 @@ jobs:
- name: Setup Python - name: Setup Python
uses: actions/setup-python@v6 uses: actions/setup-python@v6
with: with:
python-version: "3.13" python-version: "3.11"
- name: Build artifacts - name: Build artifacts
run: | run: |
python -m pip install -r requirements.txt python -m pip install -r requirements.txt
python -m pip install pyinstaller==6.17.0 python -m pip install pyinstaller==6.20.0
cd src cd src
python build_package.py python build_package.py
Dockerfile
+2 -2
View File
@@ -1,4 +1,4 @@
FROM python:3.13-slim-bookworm AS builder FROM python:3.11-slim-bookworm AS builder
# Build dummy packages to skip installing them and their dependencies # Build dummy packages to skip installing them and their dependencies
RUN apt-get update \ RUN apt-get update \
@@ -12,7 +12,7 @@ RUN apt-get update \
&& equivs-build adwaita-icon-theme \ && equivs-build adwaita-icon-theme \
&& mv adwaita-icon-theme_*.deb /adwaita-icon-theme.deb && mv adwaita-icon-theme_*.deb /adwaita-icon-theme.deb
FROM python:3.13-slim-bookworm FROM python:3.11-slim-bookworm
# Copy dummy packages # Copy dummy packages
COPY --from=builder /*.deb / COPY --from=builder /*.deb /
README.md
+4 -4
View File
@@ -89,7 +89,7 @@ This is the recommended way for Windows users.
> **Warning** > **Warning**
> Installing from source code only works for x64 architecture. For other architectures see Docker images. > Installing from source code only works for x64 architecture. For other architectures see Docker images.
- Install [Python 3.13](https://www.python.org/downloads/). - Install [Python 3.11](https://www.python.org/downloads/).
- Install [Chrome](https://www.google.com/intl/en_us/chrome/) (all OS) or [Chromium](https://www.chromium.org/getting-involved/download-chromium/) (just Linux, it doesn't work in Windows) web browser. - Install [Chrome](https://www.google.com/intl/en_us/chrome/) (all OS) or [Chromium](https://www.chromium.org/getting-involved/download-chromium/) (just Linux, it doesn't work in Windows) web browser.
- (Only in Linux) Install [Xvfb](https://en.wikipedia.org/wiki/Xvfb) package. - (Only in Linux) Install [Xvfb](https://en.wikipedia.org/wiki/Xvfb) package.
- (Only in macOS) Install [XQuartz](https://www.xquartz.org/) package. - (Only in macOS) Install [XQuartz](https://www.xquartz.org/) package.
@@ -99,10 +99,10 @@ This is the recommended way for Windows users.
### From source code (FreeBSD/TrueNAS CORE) ### From source code (FreeBSD/TrueNAS CORE)
- Run `pkg install chromium python313 py313-pip xorg-vfbserver` command to install the required dependencies. - Run `pkg install chromium python313 py311-pip xorg-vfbserver` command to install the required dependencies.
- Clone this repository and open a shell in that path. - Clone this repository and open a shell in that path.
- Run `python3.13 -m pip install -r requirements.txt` command to install FlareSolverr dependencies. - Run `python3.11 -m pip install -r requirements.txt` command to install FlareSolverr dependencies.
- Run `python3.13 src/flaresolverr.py` command to start FlareSolverr. - Run `python3.11 src/flaresolverr.py` command to start FlareSolverr.
### Systemd service ### Systemd service